|
|
@@ -246,6 +246,7 @@ class Facility extends Api
|
|
|
->where('Gy0_gxh',$data['工序号'])
|
|
|
->where('Gy0_sbbh','like','%'.$machine.'%')
|
|
|
->find();
|
|
|
+ halt($endTime);
|
|
|
$list = [];
|
|
|
if ($endTime['PD_WG'] === '1900-01-01 00:00:00'){
|
|
|
$list['工单编号'] = $data['工单编号'];
|
|
|
@@ -348,7 +349,7 @@ class Facility extends Api
|
|
|
AND b.PD_WG = '1900-01-01 00:00:00'
|
|
|
AND b.Gy0_sj1 <> '1900-01-01 00:00:00'
|
|
|
AND b.Gy0_sj1 < '2099-01-01 00:00:00'
|
|
|
- GROUP BY a.Gd_gdbh
|
|
|
+ GROUP BY a.Gd_gdbh,b.Gy0_gxh
|
|
|
ORDER BY b.Gy0_sj1";
|
|
|
$orderList = Db::query($sql);
|
|
|
if (empty($orderList)){
|
