|
|
@@ -626,7 +626,7 @@ class MachineProductionReport extends Api
|
|
|
->find();
|
|
|
$gxmc = db('工单_工艺资料')
|
|
|
->field('Gy0_gxh as sczl_gxh, rtrim(Gy0_gxmc) as sczl_type, rtrim(Add_gxmc) as Add_gxmc, Gy0_ms as sczl_ms')
|
|
|
- ->where(['Gy0_gdbh'=>$gdbh,'Gy0_yjno'=>$yjno, 'Gy0_gxmc'=>'拆片'])
|
|
|
+ ->where(['Gy0_gdbh'=>$gdbh,'Gy0_yjno'=>$yjno])
|
|
|
->find();
|
|
|
if($gxmc['Add_gxmc'] != ''){
|
|
|
$gxmc['sczl_gxmc'] = sprintf("%02d", $gxmc['sczl_gxh']).'-'.$gxmc['Add_gxmc'];
|