|
@@ -449,10 +449,12 @@ class Decision extends Api
|
|
|
// 8 => ['name' => '单凹', 'keys' => ['单凹']],
|
|
// 8 => ['name' => '单凹', 'keys' => ['单凹']],
|
|
|
// 9 => ['name' => '覆膜', 'keys' => ['覆膜']]
|
|
// 9 => ['name' => '覆膜', 'keys' => ['覆膜']]
|
|
|
// ];
|
|
// ];
|
|
|
|
|
+ $sist = ['胶印车间','凹丝印车间','印后车间','检验车间'];
|
|
|
$processOrder= \db('设备_基本资料')
|
|
$processOrder= \db('设备_基本资料')
|
|
|
- ->whereNotNull('设备编组')
|
|
|
|
|
- ->group('设备编组')
|
|
|
|
|
- ->column('rtrim(设备编组) as 设备编组');
|
|
|
|
|
|
|
+ ->whereNotNull('设备编组')
|
|
|
|
|
+ ->whereIn('使用部门',$sist)
|
|
|
|
|
+ ->group('设备编组')
|
|
|
|
|
+ ->column('rtrim(设备编组) as 设备编组');
|
|
|
|
|
|
|
|
|
|
|
|
|
// 获取存在数据的月份
|
|
// 获取存在数据的月份
|
|
@@ -700,7 +702,6 @@ class Decision extends Api
|
|
|
'a.sczl_jtbh'
|
|
'a.sczl_jtbh'
|
|
|
])
|
|
])
|
|
|
->where($where)
|
|
->where($where)
|
|
|
- // ->group('a.sczl_gdbh, a.sczl_yjno, a.sczl_gxh')
|
|
|
|
|
->group('a.sczl_gdbh, a.sczl_yjno, a.sczl_gxh, a.sczl_rq, a.sczl_jtbh, a.sczl_bzdh')
|
|
->group('a.sczl_gdbh, a.sczl_yjno, a.sczl_gxh, a.sczl_rq, a.sczl_jtbh, a.sczl_bzdh')
|
|
|
->select();
|
|
->select();
|
|
|
$data = [];
|
|
$data = [];
|
