|
|
@@ -229,6 +229,11 @@ class WorkOrder extends Api
|
|
|
}else{
|
|
|
$number = 0;
|
|
|
}
|
|
|
+ if ($value['PD_WG'] !== '1900-01-01 00:00:00'){
|
|
|
+ $status = '已完工';
|
|
|
+ }else{
|
|
|
+ $status = '未完工';
|
|
|
+ }
|
|
|
$data['processList'][$key] = [
|
|
|
'重点工序' => rtrim($value['重点工序']),
|
|
|
'印件-工序' => rtrim($value['Gy0_yjno']).'-'.rtrim($value['Gy0_gxh']),
|
|
|
@@ -261,7 +266,8 @@ class WorkOrder extends Api
|
|
|
'UniqId' => rtrim($value['UniqId']),
|
|
|
'shdh' => rtrim($value['Gy0_shdh']),
|
|
|
'辅助工时' => rtrim($value['Gy0_辅助工时']),
|
|
|
- '小时产能' => rtrim($value['Gy0_小时产能'])
|
|
|
+ '小时产能' => rtrim($value['Gy0_小时产能']),
|
|
|
+ 'status' => $status
|
|
|
];
|
|
|
}
|
|
|
}else{
|