|
|
@@ -267,7 +267,7 @@ class ReportingWork extends Api
|
|
|
$product = \db('工单_基本资料')->alias('a')
|
|
|
->join('工单_工艺资料 b','a.Gd_Gdbh = b.Gy0_gdbh','left')
|
|
|
->join('工单_印件资料 c','a.Gd_Gdbh = c.Yj_gdbh','left')
|
|
|
- ->field('a.成品名称,b.Gy0_gxmc,c.yj_yjmc')
|
|
|
+ ->field('a.成品名称,b.Gy0_gxmc,b.Gy0_ms,b.Gy0_ls,c.yj_yjmc')
|
|
|
->where('a.Gd_Gdbh',$produce['工单编号'])
|
|
|
->where('b.Gy0_yjno',$produce['印件号'])
|
|
|
->where('b.Gy0_gxh',$produce['工序号'])
|
|
|
@@ -280,6 +280,8 @@ class ReportingWork extends Api
|
|
|
$data['order_info']['product_name'] = rtrim($product[0]['成品名称']);
|
|
|
$data['order_info']['yj_name'] = rtrim($product[0]['yj_yjmc']);
|
|
|
$data['order_info']['gy_name'] = rtrim($product[0]['Gy0_gxmc']);
|
|
|
+ $data['order_info']['Gy0_ms'] = rtrim($product[0]['Gy0_ms']);
|
|
|
+ $data['order_info']['Gy0_ls'] = rtrim($product[0]['Gy0_ls']);
|
|
|
}
|
|
|
$class = \db('设备_班组资料')->where('UniqId',$produce['班组ID'])->find();
|
|
|
for ($i=1;$i<11;$i++){
|
