|
|
@@ -688,7 +688,7 @@ class Manufacture extends Api
|
|
|
'SUM(c.sczl_cl)' => '已完成'
|
|
|
])
|
|
|
->join('工单_工艺资料 b','a.Gd_gdbh = b.Gy0_gdbh')
|
|
|
- ->join('设备_产量计酬 c','a.Gd_gdbh = c.sczl_gdbh AND b.Gy0_gxh = c.sczl_gxh','LEFT')
|
|
|
+ ->join('设备_产量计酬 c','a.Gd_gdbh = c.sczl_gdbh AND b.Gy0_yjno = c.sczl_yjno AND b.Gy0_gxh = c.sczl_gxh','LEFT')
|
|
|
->where([
|
|
|
'b.Gy0_sbbh' => $machine,
|
|
|
'b.Gy0_sj1' => ['>','1900-01-01 00:00:00'],
|
|
|
@@ -818,7 +818,7 @@ class Manufacture extends Api
|
|
|
])
|
|
|
->join('工单_印件资料 c','c.Yj_Gdbh = a.Gy0_gdbh AND c.yj_Yjno = a.Gy0_yjno')
|
|
|
->join('工单_基本资料 b','b.Gd_gdbh = a.Gy0_gdbh AND b.Gd_cpdh = c.yj_Yjdh')
|
|
|
- ->join('设备_产量计酬 d','a.Gy0_gdbh = d.sczl_gdbh AND a.Gy0_sbbh = d.sczl_jtbh','LEFT')
|
|
|
+ ->join('设备_产量计酬 d','a.Gy0_gdbh = d.sczl_gdbh AND a.Gy0_yjno = d.sczl_yjno AND a.Gy0_gxh = d.sczl_gxh AND a.Gy0_sbbh = d.sczl_jtbh','LEFT')
|
|
|
->where([
|
|
|
'b.gd_statu' => '2-生产中',
|
|
|
'a.Gy0_sbbh' => ['LIKE','%'.$param['machine'].'%'],
|
