排产工序卷对卷已完成产量

application/api/controller/Manufacture.php

@@ -687,6 +687,9 @@ class Manufacture extends Api
             $this->error('参数错误');
         }
         $machine = $param['machine'];
+        $process = \db('dic_lzde')
+            ->where('适用机型',$machine)
+            ->column('rtrim(适用工序)');
         $list = \db('工单_基本资料')
             ->alias('a')
             ->field([
@@ -708,8 +711,8 @@ class Manufacture extends Api
                 'rtrim(b.UniqId)' => 'UniqId',
                 'SUM(c.sczl_cl)' => '已完成'
             ])
-            ->join('工单_工艺资料 b','a.Gd_gdbh = b.Gy0_gdbh')
-            ->join('设备_产量计酬 c','a.Gd_gdbh = c.sczl_gdbh AND b.Gy0_yjno = c.sczl_yjno AND b.Gy0_gxh = c.sczl_gxh','LEFT')
+            ->join('工单_工艺资料 b','a.Gd_gdbh = b.Gy0_gdbh AND a.行号 = b.Gy0_yjno')
+            ->join('设备_产量计酬 c','a.Gd_gdbh = c.sczl_gdbh AND a.行号 = 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'],
@@ -717,7 +720,7 @@ class Manufacture extends Api
                 'a.gd_statu' => '2-生产中'
             ])
             ->where('b.Gy0_sj1','<','2099-01-01 00:00:00')
-            ->group('a.Gd_gdbh')
+            ->group('a.Gd_gdbh,c.sczl_gxh')
             ->select();
         foreach ($list as $key=>$value){
             $list[$key]['计划接货数'] = (int)round($value['计划接货数']);
@@ -836,6 +839,8 @@ class Manufacture extends Api
                 'SUM( d.sczl_cl )' => '已完成产量',
                 'RTRIM( b.Gd_gdbh )' => '工单编号',
                 'RTRIM( b.`销售订单号` )' => '销售订单号',
+                'RTRIM( a.`版距` )' => '版距',
+                'RTRIM( a.`印刷方式` )' => '印刷方式'
             ])
             ->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.行号 = a.Gy0_yjno')
@@ -875,6 +880,9 @@ class Manufacture extends Api
                 if ($value['产品代号'] == ''){
                     $list[$key]['产品代号'] = $value['成品代号'];
                 }
+                if ($value['已完成产量'] !== 0 && $value['印刷方式'] === '卷对卷'){
+                    $list[$key]['已完成产量'] = round($value['已完成产量']/$value['版距'] * 1000);
+                }
                 unset($list[$key]['成品代号'],$list[$key]['成品名称']);
                 if ($list[$key]['计划开工时间'] !== '1900-01-01 00:00:00'){
                     array_push($data['制程'],$list[$key]);