fyy

app/Http/Controllers/Api/ScreenController.php

@@ -109,8 +109,8 @@ class ScreenController extends BaseController
         return $this->json_return(200,'',$return);
     }
 
-    //产量趋势图
-    public function output_value_efficiency(Request $request){
+    //产量趋势图（包装）
+    public function output_value_efficiency1(Request $request){
         // 获取当前时间戳
         $currentTimestamp = time();
         // 输出过去两周的起止时间（包括当前日期）
@@ -150,6 +150,35 @@ class ScreenController extends BaseController
         return $this->json_return(200,'',$result);
     }
 
+    //产量趋势图（完工）
+    public function output_value_efficiency(Request $request){
+        // 获取当前时间
+        $date = date('Ymd',time());
+        $model = new OrdersProductProcess(['channel' => $date]);//当前季度的数据
+
+        $data = $model->where('del_time',0)
+            ->where('status',2)
+            ->select('finished_time')
+            ->get()->toArray();
+        $result = [];
+        if(! empty($data)){
+            foreach ($data as $value){
+                $time = date('Y-m-d',$value['finished_time']);
+                if(isset($result[$time])){
+                    $result[$time]['output'] += 1;
+                }else{
+                    $result[$time] = [
+                        'time' => $time,
+                        'output' =>  1
+                    ];
+                }
+            }
+            ksort($result);
+        }
+        $result = array_values($result);
+        return $this->json_return(200,'',$result);
+    }
+
     //工序负荷全览
     public function capacity(Request $request){
         $date = date('Ymd',time());