|
|
@@ -1610,6 +1610,7 @@ class WorkOrder extends Api
|
|
|
if (empty($param)){
|
|
|
$this->error('参数错误');
|
|
|
}
|
|
|
+ halt($param);
|
|
|
$lastId = \db('工单_工艺资料')->order('UniqId desc')->value('UniqId');
|
|
|
if (empty($lastId)){
|
|
|
$lastId = 0;
|
|
|
@@ -2077,19 +2078,22 @@ class WorkOrder extends Api
|
|
|
->where('Gd_gdbh',$param['workorder'])
|
|
|
->where('成品代号',$param['productCode'])
|
|
|
->value('rtrim(计划投料)');
|
|
|
+ $arr = [];
|
|
|
foreach ($PrintList as $key => $value){
|
|
|
foreach ($list as $k=>$v){
|
|
|
-// if ($value['yj_Yjno'] === )
|
|
|
- $PrintList[$key]['Yj_Gdbh'] = $param['workorder'];
|
|
|
- $PrintList[$key]['yj_Yjno'] = $value['yj_yjno'];
|
|
|
- $PrintList[$key]['yj_Yjdh'] = $value['yj_yjdh'];
|
|
|
- $PrintList[$key]['yj_ks'] = $value['yj_ks'];
|
|
|
- $PrintList[$key]['yj_ls'] = $value['yj_ls'];
|
|
|
- $PrintList[$key]['yj_平张投料'] = $number;
|
|
|
- $PrintList[$key]['Sys_id'] = $value['sys_id'];
|
|
|
- $PrintList[$key]['Uniqid'] = $PrintLastId + $key + 1;
|
|
|
- $PrintList[$key]['Sys_rq'] = date('Y-m-d H:i:s',time());
|
|
|
- $PrintList[$key]['Mod_rq'] = date('Y-m-d H:i:s',time());
|
|
|
+ if ($value['yj_yjdh'] === $v['Gd_cpdh']){
|
|
|
+ $PrintList[$key]['Yj_Gdbh'] = $param['workorder'];
|
|
|
+ $PrintList[$key]['yj_Yjno'] = $v['行号'];
|
|
|
+ $PrintList[$key]['yj_Yjdh'] = $value['yj_yjdh'];
|
|
|
+ $PrintList[$key]['yj_ks'] = $value['yj_ks'];
|
|
|
+ $PrintList[$key]['yj_ls'] = $value['yj_ls'];
|
|
|
+ $PrintList[$key]['yj_平张投料'] = $number;
|
|
|
+ $PrintList[$key]['Sys_id'] = $value['sys_id'];
|
|
|
+ $PrintList[$key]['Uniqid'] = $PrintLastId + $key + 1;
|
|
|
+ $PrintList[$key]['Sys_rq'] = date('Y-m-d H:i:s',time());
|
|
|
+ $PrintList[$key]['Mod_rq'] = date('Y-m-d H:i:s',time());
|
|
|
+ array_push($arr,[$value['yj_yjno'],$v['行号']]);
|
|
|
+ }
|
|
|
}
|
|
|
unset($PrintList[$key]['mod_rq'],$PrintList[$key]['sys_rq'],$PrintList[$key]['sys_id'],$PrintList[$key]['KgToPages'],$PrintList[$key]['yj_tll'],$PrintList[$key]['yj_yjdh'],$PrintList[$key]['yj_yjno'],$PrintList[$key]['UniqId']);
|
|
|
}
|
|
|
@@ -2106,23 +2110,28 @@ class WorkOrder extends Api
|
|
|
}
|
|
|
$ProcesslastId = \db('工单_工艺资料')->order('UniqId desc')->value('rtrim(UniqId)');
|
|
|
foreach ($ProcessList as $key=>$value){
|
|
|
- $ProcessList[$key]['Gy0_gdbh'] = $param['workorder'];
|
|
|
- $ProcessList[$key]['Gy0_gxmc'] = $value['gy0_gxmc'];
|
|
|
- $ProcessList[$key]['Gy0_SITE'] = $value['Gy0_site'];
|
|
|
- $ProcessList[$key]['Gy0_ks'] = $value['Gy0_Ks'];
|
|
|
- $ProcessList[$key]['Gy0_ms'] = $value['Gy0_Ms'];
|
|
|
- $ProcessList[$key]['Gy0_oil'] = $value['Gy0_Oil'];
|
|
|
- $ProcessList[$key]['Gy0_计划接货数'] = 0;
|
|
|
- $ProcessList[$key]['Gy0_计划损耗'] = 0;
|
|
|
- $ProcessList[$key]['无形损承担比例'] = 0;
|
|
|
- $ProcessList[$key]['超节损承担比例'] = 0;
|
|
|
- $ProcessList[$key]['超节损核算单价'] = 0;
|
|
|
- $ProcessList[$key]['Gy0_sj1'] = '1900-01-01 00:00:00';
|
|
|
- $ProcessList[$key]['Gy0_sj2'] = '1900-01-01 00:00:00';
|
|
|
- $ProcessList[$key]['UniqId'] = $ProcesslastId + $key + 1;
|
|
|
- $ProcessList[$key]['PD_WG'] = '1900-01-01 00:00:00';
|
|
|
- $ProcessList[$key]['Sys_rq'] = date('Y-m-d H:i:s',time());
|
|
|
- $ProcessList[$key]['Mod_rq'] = date('Y-m-d H:i:s',time());
|
|
|
+ foreach ($arr as $k=>$v){
|
|
|
+ if ($value['Gy0_yjno'] === $v[0]) {
|
|
|
+ $ProcessList[$key]['Gy0_yjno'] = $v[1];
|
|
|
+ $ProcessList[$key]['Gy0_gdbh'] = $param['workorder'];
|
|
|
+ $ProcessList[$key]['Gy0_gxmc'] = $value['gy0_gxmc'];
|
|
|
+ $ProcessList[$key]['Gy0_SITE'] = $value['Gy0_site'];
|
|
|
+ $ProcessList[$key]['Gy0_ks'] = $value['Gy0_Ks'];
|
|
|
+ $ProcessList[$key]['Gy0_ms'] = $value['Gy0_Ms'];
|
|
|
+ $ProcessList[$key]['Gy0_oil'] = $value['Gy0_Oil'];
|
|
|
+ $ProcessList[$key]['Gy0_计划接货数'] = 0;
|
|
|
+ $ProcessList[$key]['Gy0_计划损耗'] = 0;
|
|
|
+ $ProcessList[$key]['无形损承担比例'] = 0;
|
|
|
+ $ProcessList[$key]['超节损承担比例'] = 0;
|
|
|
+ $ProcessList[$key]['超节损核算单价'] = 0;
|
|
|
+ $ProcessList[$key]['Gy0_sj1'] = '1900-01-01 00:00:00';
|
|
|
+ $ProcessList[$key]['Gy0_sj2'] = '1900-01-01 00:00:00';
|
|
|
+ $ProcessList[$key]['UniqId'] = $ProcesslastId + $key + 1;
|
|
|
+ $ProcessList[$key]['PD_WG'] = '1900-01-01 00:00:00';
|
|
|
+ $ProcessList[$key]['Sys_rq'] = date('Y-m-d H:i:s', time());
|
|
|
+ $ProcessList[$key]['Mod_rq'] = date('Y-m-d H:i:s', time());
|
|
|
+ }
|
|
|
+ }
|
|
|
unset($ProcessList[$key]['Gy0_Oil'],$ProcessList[$key]['Gy0_Ms'],$ProcessList[$key]['Gy0_Ks'],$ProcessList[$key]['UniqID'],$ProcessList[$key]['Gy0_cpdh'],$ProcessList[$key]['gy0_gxmc'],$ProcessList[$key]['Gy0_site']);
|
|
|
}
|
|
|
|