|
|
@@ -1163,7 +1163,7 @@ class OrderSuperLoss extends Api
|
|
|
'bh' => $item['sczl_bh'.$i],
|
|
|
'xm' => $item['Xm'.$i],
|
|
|
'je' => $item['CjsJe']*$item['sczl_rate'.$i],
|
|
|
- 'cj' => $item['车间名称']
|
|
|
+ 'cj' => rtrim($item['车间名称'])
|
|
|
];
|
|
|
array_push($data,$res);
|
|
|
}
|
|
|
@@ -1364,7 +1364,7 @@ class OrderSuperLoss extends Api
|
|
|
'rtrim(c.sczl_gxmc) as gxmc', 'SUM(c.sczl_cl) as cl', 'SUM(c.sczl_fp) as fp', 'c.sczl_bh1 as sczl_bh',
|
|
|
'd.使用部门 as 使用部门', 'c.sczl_bzdh as bzdh', 'b.sczl_jtbh', 'a.损耗系数', 'a.Gy0_ms', 'a.Gy0_Rate0',
|
|
|
'a.Gy0_Rate1', 'a.无形损承担比例', 'a.Gy0_计划接货数*a.Gy0_ls*a.Gy0_ks as 计划产量', 'e.Gd_客户代号', 'e.Gd_客户名称',
|
|
|
- 'e.Gd_cpdh', 'e.Gd_cpmc', 'e.销售订单号', 'e.投料大箱', 'e.订单数量', 'e.计量单位', 'a.Gy0_SITE'
|
|
|
+ 'e.Gd_cpdh', 'e.Gd_cpmc', 'e.销售订单号', 'e.投料大箱', 'e.订单数量', 'e.计量单位', 'rtrim(a.Gy0_SITE)'
|
|
|
])
|
|
|
->join('设备_产量计酬 b', 'a.Gy0_gdbh = b.sczl_gdbh AND a.Gy0_yjno = b.sczl_yjno AND a.Gy0_gxh = b.sczl_gxh', 'left')
|
|
|
->join('db_sczl c', 'a.Gy0_gdbh = c.sczl_gdbh AND a.Gy0_yjno = c.sczl_yjno AND a.Gy0_gxh = c.sczl_gxh', 'left')
|
