设备排程设备编号

application/api/controller/Manufacture.php

@@ -728,7 +728,8 @@ class Manufacture extends Api
                 '工序备注' => $value['remark'],
                 'Gy0_最早开工时间' => $value['start'] === ''?'1900-01-01 00:00:00':date('Y-m-d H:i:s',strtotime($value['start'])),
                 'Gy0_sj1' => date('Y-m-d H:i:s',strtotime($value['projectTime'])),
-                'Gy0_sj2' => date('Y-m-d H:i:s',strtotime($value['projectTime'])+(ceil($value['ProductionHours'])+ceil($value['AuxiliaryHours']))*3600),
+//                'Gy0_sj2' => date('Y-m-d H:i:s',strtotime($value['projectTime'])+(ceil($value['ProductionHours'])+ceil($value['AuxiliaryHours']))*3600),
+                'Gy0_sj2' => date('Y-m-d H:i:s',strtotime($value['endTime'])),
             ];
             $sql = \db('工单_工艺资料')
                 ->where('UniqId',$value['UniqId'])
@@ -801,6 +802,7 @@ class Manufacture extends Api
                 'RTRIM( b.Gy0_sbbh )' => '设备编号',
                 'RTRIM( b.Gy0_SITE )' => '车间名称',
                 'RTRIM( b.UniqId )' => 'GYUID',
+                'RTRIM( a.Uniqid )' => 'UNIQID',
                 'SUM( d.sczl_cl )' => '已完成产量'
             ])
             ->join('工单_工艺资料 b','a.Gd_gdbh = b.Gy0_gdbh')
@@ -810,7 +812,7 @@ class Manufacture extends Api
                 'a.gd_statu' => '2-生产中',
                 'a.行号'=> '1',
                 'b.Gy0_sbbh' => ['LIKE','%'.$param['machine'].'%'],
-                'b.PD_WG' => '1900-01-01 00:00:00'
+                'b.PD_WG' => '1900-01-01 00:00:00',
             ])
             ->where($where)
             ->group('a.Gd_gdbh,b.Gy0_gxh')
@@ -821,6 +823,7 @@ class Manufacture extends Api
         }
         $data['制程'] = $data['排程'] = [];
         foreach ($list as $key=>$value){
+            $list[$key]['设备编号'] = $param['machine'];
             if ((int)$value['yjno'] <10){
                 $value['yjno'] = '0'.rtrim($value['yjno']);
             }
@@ -832,7 +835,7 @@ class Manufacture extends Api
             }else{
                 $list[$key]['印件工序及名称'] = $value['yjno'].'-'.$value['gxh'].'-->'.rtrim($value['gxmc']).'【'.rtrim($value['Add_gxmc']).'】';
             }
-            unset($list[$key]['gxmc'],$list[$key]['Add_gxmc']);
+            unset($list[$key]['Add_gxmc']);
             if ($value['产品名称'] == ''){
                 $list[$key]['产品名称'] = $value['成品名称'];
             }
@@ -846,6 +849,7 @@ class Manufacture extends Api
                 array_push($data['排程'],$list[$key]);
             }
         }
+
         $this->success('成功',$data);
     }