|
@@ -405,7 +405,7 @@ class Decision extends Api
|
|
|
->alias('a')
|
|
->alias('a')
|
|
|
->join('设备_产量计酬 b', 'a.设备编号 = b.sczl_jtbh')
|
|
->join('设备_产量计酬 b', 'a.设备编号 = b.sczl_jtbh')
|
|
|
->join('工单_印件资料 c', 'b.sczl_gdbh = c.Yj_Gdbh AND b.sczl_yjno = c.yj_Yjno')
|
|
->join('工单_印件资料 c', 'b.sczl_gdbh = c.Yj_Gdbh AND b.sczl_yjno = c.yj_Yjno')
|
|
|
- ->join('工单_工艺资料 d', 'b.sczl_gdbh = d.Gy0_gdbh AND b.sczl_yjno = d.Yj_Yjno AND b.sczl_gxh = d.Gy0_gxh')
|
|
|
|
|
|
|
+ ->join('工单_工艺资料 d', 'b.sczl_gdbh = d.Gy0_gdbh AND b.sczl_yjno = d.GY0_yjno AND b.sczl_gxh = d.Gy0_gxh')
|
|
|
->field([
|
|
->field([
|
|
|
'a.设备编号' => '设备编号',
|
|
'a.设备编号' => '设备编号',
|
|
|
'rtrim(a.设备名称)' => '设备名称',
|
|
'rtrim(a.设备名称)' => '设备名称',
|
|
@@ -415,7 +415,7 @@ class Decision extends Api
|
|
|
'SUM(b.sczl_打样总工时)' => '打样总工时',
|
|
'SUM(b.sczl_打样总工时)' => '打样总工时',
|
|
|
'SUM(b.sczl_打样工时)' => '打样补产工时',
|
|
'SUM(b.sczl_打样工时)' => '打样补产工时',
|
|
|
'SUM(b.sczl_装版总工时)' => '装版总工时',
|
|
'SUM(b.sczl_装版总工时)' => '装版总工时',
|
|
|
- 'SUM(b.sczl_装版工时)' => '装板补产工时',
|
|
|
|
|
|
|
+ 'SUM(b.sczl_装版工时)' => '装版补产工时',
|
|
|
'SUM(b.sczl_异常停机工时)' => '异常停机工时',
|
|
'SUM(b.sczl_异常停机工时)' => '异常停机工时',
|
|
|
'rtrim(d.印刷方式)' => '印刷方式',
|
|
'rtrim(d.印刷方式)' => '印刷方式',
|
|
|
'rtrim(d.版距)' => '版距'
|
|
'rtrim(d.版距)' => '版距'
|
|
@@ -425,7 +425,6 @@ class Decision extends Api
|
|
|
->group('a.设备编号')
|
|
->group('a.设备编号')
|
|
|
->order('a.设备编号')
|
|
->order('a.设备编号')
|
|
|
->select();
|
|
->select();
|
|
|
-
|
|
|
|
|
// 处理总工时的计算
|
|
// 处理总工时的计算
|
|
|
$total = [
|
|
$total = [
|
|
|
'设备运行工时' => 0,
|
|
'设备运行工时' => 0,
|
