|
@@ -270,19 +270,19 @@ class Facility extends Api
|
|
|
$code = \db('工单_基本资料')->where('Gd_Gdbh',$data['工单编号'])->value('成品代号');
|
|
$code = \db('工单_基本资料')->where('Gd_Gdbh',$data['工单编号'])->value('成品代号');
|
|
|
$list['产品名称'] = rtrim($name);
|
|
$list['产品名称'] = rtrim($name);
|
|
|
$list['产品代号'] = rtrim($code);
|
|
$list['产品代号'] = rtrim($code);
|
|
|
- $where['Gy0_gdbh'] = $data['工单编号'];
|
|
|
|
|
- $where['Gy0_yjno'] = $data['印件号'];
|
|
|
|
|
- $where['Gy0_gxh'] = $data['工序号'];
|
|
|
|
|
- $gxmc = \db('工单_工艺资料')->where($where)->find();
|
|
|
|
|
- if ((int)$gxmc['Gy0_gxh']<10){
|
|
|
|
|
- $gxmc['Gy0_gxh'] = '0'.rtrim($gxmc['Gy0_gxh']);
|
|
|
|
|
- }
|
|
|
|
|
- if ($gxmc['Add_gxmc'] !== ''){
|
|
|
|
|
- $printName = rtrim($gxmc['Gy0_gxh']).'-'.rtrim($gxmc['Gy0_gxmc']).'【'.rtrim($gxmc['Add_gxmc']).'】';
|
|
|
|
|
- }else{
|
|
|
|
|
- $printName = rtrim($gxmc['Gy0_gxh']).'-'.rtrim($gxmc['Gy0_gxmc']);
|
|
|
|
|
- }
|
|
|
|
|
- $list['工序名称'] = $printName;
|
|
|
|
|
|
|
+// $where['Gy0_gdbh'] = $data['工单编号'];
|
|
|
|
|
+// $where['Gy0_yjno'] = $data['印件号'];
|
|
|
|
|
+// $where['Gy0_gxh'] = $data['工序号'];
|
|
|
|
|
+// $gxmc = \db('工单_工艺资料')->where($where)->find();
|
|
|
|
|
+// if ((int)$gxmc['Gy0_gxh']<10){
|
|
|
|
|
+// $gxmc['Gy0_gxh'] = '0'.rtrim($gxmc['Gy0_gxh']);
|
|
|
|
|
+// }
|
|
|
|
|
+// if ($gxmc['Add_gxmc'] !== ''){
|
|
|
|
|
+// $printName = rtrim($gxmc['Gy0_gxh']).'-'.rtrim($gxmc['Gy0_gxmc']).'【'.rtrim($gxmc['Add_gxmc']).'】';
|
|
|
|
|
+// }else{
|
|
|
|
|
+// $printName = rtrim($gxmc['Gy0_gxh']).'-'.rtrim($gxmc['Gy0_gxmc']);
|
|
|
|
|
+// }
|
|
|
|
|
+ $list['工序名称'] = $data['工序名称'];
|
|
|
}else{
|
|
}else{
|
|
|
$list['工单编号'] = '';
|
|
$list['工单编号'] = '';
|
|
|
$list['印件号'] = 0;
|
|
$list['印件号'] = 0;
|