|
|
@@ -230,12 +230,6 @@ class WorkOrder extends Api
|
|
|
->select();
|
|
|
if (!empty($processList)){
|
|
|
foreach ($processList as $key=>$value){
|
|
|
- if ($value['Gy0_yjno']<10){
|
|
|
- $value['Gy0_yjno'] = '0'.$value['Gy0_yjno'];
|
|
|
- }
|
|
|
- if ($value['Gy0_gxh']<10){
|
|
|
- $value['Gy0_gxh'] = '0'.$value['Gy0_gxh'];
|
|
|
- }
|
|
|
if (rtrim($value['Gy0_sbbh']) == '' || $value['Gy0_计划接货数'] == 0){
|
|
|
$number = 0;
|
|
|
}else{
|
|
|
@@ -248,9 +242,11 @@ class WorkOrder extends Api
|
|
|
}
|
|
|
$data['processList'][$key] = [
|
|
|
'重点工序' => rtrim($value['重点工序']),
|
|
|
- '印件-工序' => rtrim($value['Gy0_yjno']).'-'.rtrim($value['Gy0_gxh']),
|
|
|
+ '印件号' => rtrim($value['Gy0_yjno']),
|
|
|
+ '工序号' => rtrim($value['Gy0_gxh']),
|
|
|
'备选工序' => rtrim($value['备选工序']),
|
|
|
- '工序名称' => rtrim($value['Gy0_gxmc']).'【'.rtrim($value['Add_gxmc']).'】',
|
|
|
+ '工艺名称' => rtrim($value['Gy0_gxmc']),
|
|
|
+ '工序名称' => rtrim($value['Add_gxmc']),
|
|
|
'计划产量' => $value['Gy0_计划接货数'],
|
|
|
'基础损耗' => rtrim($value['Gy0_Rate0']),
|
|
|
'损耗率' => rtrim($value['Gy0_Rate1']),
|
