|
|
@@ -537,7 +537,16 @@ class MachineProductionReport extends Api
|
|
|
->field('rtrim(yj_yjmc) as yj_yjmc')
|
|
|
->where(['Yj_Gdbh'=>$gdbh,'yj_Yjno'=>$yjno])
|
|
|
->find();
|
|
|
-
|
|
|
+ $gxmc = db('工单_工艺资料')
|
|
|
+ ->field('Gy0_gxh as sczl_gxh, rtrim(Gy0_gxmc) as sczl_type, rtrim(Add_gxmc) as Add_gxmc,Gy0_ls as sczl_ls, Gy0_ms as sczl_ms')
|
|
|
+ ->where(['Gy0_gdbh'=>$gdbh,'Gy0_yjno'=>$yjno, 'Gy0_gxmc'=>'拆片'])
|
|
|
+ ->find();
|
|
|
+ if($gxmc['Add_gxmc'] != ''){
|
|
|
+ $gxmc['sczl_gxmc'] = sprintf("%02d", $gxmc['sczl_gxh']).'-'.$gxmc['Add_gxmc'];
|
|
|
+ }else{
|
|
|
+ $gxmc['sczl_gxmc'] = sprintf("%02d", $gxmc['sczl_gxh']).'-'.$gxmc['sczl_type'];
|
|
|
+ }
|
|
|
+ $row['gxmc'] = $gxmc['sczl_gxmc'];
|
|
|
if (!$row) $this->error('印件编号不存在, 将恢复默认值, 请仔细确认数据准确性！');
|
|
|
$this->success('成功',$row);
|
|
|
}
|
