|
|
@@ -254,12 +254,14 @@ class Facility extends Api
|
|
|
if (empty($data['工单编号'])){
|
|
|
$this->success('未找到生产订单');
|
|
|
}
|
|
|
+ halt($data);
|
|
|
$endTime = \db('工单_工艺资料')
|
|
|
->where('Gy0_gdbh',$data['工单编号'])
|
|
|
->where('Gy0_yjno',$data['印件号'])
|
|
|
->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['工单编号'];
|
|
|
@@ -361,6 +363,8 @@ class Facility extends Api
|
|
|
}
|
|
|
foreach ($orderList as $key=>$value){
|
|
|
$orderList[$key]['工单编号|质量信息'] = $value['gdbh'].'|'.$value['质量信息'];
|
|
|
+ $orderList[$key]['印件号'] = $value['yjno'];
|
|
|
+ $orderList[$key]['工序号'] = $value['gxh'];
|
|
|
if ($value['yjno']<10){
|
|
|
$orderList[$key]['yjno'] = '0'.$value['yjno'];
|
|
|
}
|
|
|
@@ -371,7 +375,7 @@ class Facility extends Api
|
|
|
$orderList[$key]['工序名称'] = $orderList[$key]['gxh'].'-'.$value['gxmc'].'【'.$value['add_gxmc'].'】';
|
|
|
$orderList[$key]['计划产量/已完成'] = (int)$value['计划接货数'].'/'.$value['已完成']=null?'':(int)$value['已完成'];
|
|
|
$orderList[$key]['计划生产时段'] =substr($value['sj1'],5,5).' '.substr($value['sj1'],11,5).'<-->'.substr($value['sj2'],5,5).' '.substr($value['sj2'],11,5);
|
|
|
- unset($orderList[$key]['gdbh'],$orderList[$key]['质量信息'],$orderList[$key]['yjno'],$orderList[$key]['gxh'],$orderList[$key]['gxmc'],$orderList[$key]['add_gxmc'],$orderList[$key]['计划接货数'],$orderList[$key]['已完成'],$orderList[$key]['印件名称'],$orderList[$key]['ls']);
|
|
|
+ unset($orderList[$key]['gdbh'],$orderList[$key]['质量信息'],$orderList[$key]['gxh'],$orderList[$key]['yjno'],$orderList[$key]['gxmc'],$orderList[$key]['add_gxmc'],$orderList[$key]['计划接货数'],$orderList[$key]['已完成'],$orderList[$key]['印件名称'],$orderList[$key]['ls']);
|
|
|
}
|
|
|
$this->success('成功',$orderList);
|
|
|
}
|
