班组产量优化

application/api/controller/Facility.php

@@ -1451,17 +1451,17 @@ class Facility extends Api
             ->where('当班产量','<>',-1)
             ->field('rtrim(时间) as 时间,rtrim(当班产量) as 产量,rtrim(当前状态) as 状态')
             ->select();
-        if (empty($row)){
+        $outputList = db('设备_产量计酬')
+            ->where('sczl_jtbh',$param['machine'])
+            ->where('开工时间',$param['start'])
+            ->field('sys_rq,sczl_cl')
+            ->select();
+        if (empty($outputList)){
             $data['row'] = [];
         }
-        foreach ($row  as $key=>$value){
-            $data['row'][$key]['时间'] = date('Y-m-d H:i',strtotime($value['时间']));
-            $data['row'][$key]['状态'] = $value['状态'];
-            if ($key<2){
-                $data['row'][$key]['产能'] = 0;
-            }else{
-                $data['row'][$key]['产能'] = ($row[$key-1]['产量']-$row[$key-2]['产量'])*60;
-            }
+        foreach ($outputList  as $key=>$value){
+            $data['row'][$key]['时间'] = date('Y-m-d H:i',strtotime($value['sys_rq']));
+            $data['row'][$key]['产能'] = $value['sczl_cl'];
         }
         //机台状态
         $status = end($row);
@@ -1479,7 +1479,7 @@ class Facility extends Api
             ->field('rtrim(类别) as 类别,提交时间')
             ->select();
 
-        $data['首件'] = $data['自检'] = $data['IPQC'] = [];
+        $data['首件'] = $data['自检'] = $data['IPQC'] = $data['现场巡查记录'] = [];
         if (!empty($list)){
             foreach ($list as $key=>$value){
                 if ($value['类别'] == '首件与过程确认'){
@@ -1491,14 +1491,19 @@ class Facility extends Api
                 if ($value['类别'] == 'IPQC检验'){
                     array_push($data['IPQC'],$value['提交时间']);
                 }
+                if ($value['类别'] == '现场巡查记录'){
+                    array_push($data['现场巡查记录'],$value['提交时间']);
+                }
             }
             $data['首件'] = array_values(array_unique($data['首件']));
             $data['自检'] = array_values(array_unique($data['自检']));
             $data['IPQC'] = array_values(array_unique($data['IPQC']));
+            $data['现场巡查记录'] = array_values(array_unique($data['现场巡查记录']));
         }else{
             $data['首件'] = [];
             $data['自检'] = [];
             $data['IPQC'] = [];
+            $data['现场巡查记录'] = [];
         }
         $this->success('成功',$data);
     }