设备工作清单已完成数据优化

application/api/controller/Facility.php

@@ -344,13 +344,13 @@ class Facility extends Api
         }
         $orderList = \db('工单_工艺资料')
             ->alias('a')
-            ->join('设备_产量计酬 b','a.Gy0_gdbh = b.sczl_gdbh AND a.Gy0_yjno = b.sczl_yjno AND a.Gy0_gxh = b.sczl_gxh','LEFT')
+//            ->join('设备_产量计酬 b','a.Gy0_gdbh = b.sczl_gdbh AND a.Gy0_yjno = b.sczl_yjno AND a.Gy0_gxh = b.sczl_gxh','LEFT')
             ->join('工单_基本资料 c','a.Gy0_gdbh = c.Gd_gdbh')
             ->join('工单_印件资料 d','a.Gy0_gdbh = d.Yj_Gdbh AND a.Gy0_yjno = d.yj_Yjno')
-            ->field('a.Gy0_gdbh as gdbh,a.质量要求 as 质量信息,a.Gy0_yjno as yjno,a.Gy0_gxh as gxh,SUM(b.sczl_cl) as 已完成,
+            ->field('a.Gy0_gdbh as gdbh,a.质量要求 as 质量信息,a.Gy0_yjno as yjno,a.Gy0_gxh as gxh,
     a.Gy0_gxmc as gxmc,a.Add_gxmc as add_gxmc,a.Gy0_辅助工时 as 装版工时,a.Gy0_小时产能 as 工序产能,a.Gy0_生产工时 as 计划工时,
     a.Gy0_sj1 as sj1,a.Gy0_sj2 as sj2,a.工序备注 as 排产备注,d.yj_yjmc as 印件名称,c.成品名称 as 产品名称,c.成品代号 as 产品代号,
-    a.Gy0_计划接货数 as 计划接货数,a.Gy0_ls as ls,a.Gy0_班次安排 as 班组,a.UniqId as UniqId,a.Gy0_最早开工时间 as 最早开工时间,SUM(b.sczl_zcfp) as 制程废品')
+    a.Gy0_计划接货数 as 计划接货数,a.Gy0_ls as ls,a.Gy0_班次安排 as 班组,a.UniqId as UniqId,a.Gy0_最早开工时间 as 最早开工时间')
             ->where('a.Gy0_sbbh','like','%'.$machine.'%')
             ->where('a.PD_WG','1900-01-01 00:00:00')
             ->where('a.Gy0_sj1','<>','1900-01-01 00:00:00')
@@ -358,9 +358,16 @@ class Facility extends Api
             ->group('a.Gy0_gdbh,a.Gy0_yjno,a.Gy0_gxh')
             ->order('a.Gy0_sj1')
             ->select();
+//        halt($orderList);
         if (!empty($orderList)){
             $data = \db('设备_产量采集')->where('设备编号',$machine)->order('UniqId desc')->find();
             foreach ($orderList as $key=>$value){
+                $cl_data = \db('设备_产量计酬')
+                    ->field('SUM(sczl_cl) as 已完成,SUM(sczl_zcfp) as 制程废品')
+                    ->where('sczl_gdbh',$value['gdbh'])
+                    ->where('sczl_yjno',$value['yjno'])
+                    ->where('sczl_gxh',$value['gxh'])
+                    ->select();
                 $orderList[$key]['status'] = 0;
                 if (!empty($data)){
                     if ($value['gdbh'] === $data['工单编号'] && $value['yjno'] === $data['印件号'] && $value['gxh'] === $data['工序号']) {
@@ -379,10 +386,10 @@ class Facility extends Api
                 }
                 $orderList[$key]['印件资料'] = $orderList[$key]['yjno'].'-'.$value['印件名称'];
                 $orderList[$key]['工序名称'] = $orderList[$key]['gxh'].'-'.$value['gxmc'].'【'.$value['add_gxmc'].'】';
-                if ((int)$value['制程废品'] === 0){
-                    $orderList[$key]['计划产量/已完成'] = (int)$value['计划接货数'].'/'.$value['已完成']=null?'':(int)$value['已完成'];
+                if ((int)$cl_data[0]['制程废品'] === 0){
+                    $orderList[$key]['计划产量/已完成'] = (int)$value['计划接货数'].'/'.$cl_data[0]['已完成']=null?'':(int)$cl_data[0]['已完成'];
                 }else{
-                    $orderList[$key]['计划产量/已完成'] = (int)$value['计划接货数'].'/'.$value['已完成']=null?'':(int)$value['已完成'].'('.$value['制程废品'].')';
+                    $orderList[$key]['计划产量/已完成'] = (int)$value['计划接货数'].'/'.$cl_data[0]['已完成']=null?'':(int)$cl_data[0]['已完成'].'('.$cl_data[0]['制程废品'].')';
                 }
 
                 $orderList[$key]['计划生产时段'] =substr($value['sj1'],5,5).' '.substr($value['sj1'],11,5).'<-->'.substr($value['sj2'],5,5).' '.substr($value['sj2'],11,5);