cqp 1 年之前
父节点
当前提交
2060e78d29
共有 1 个文件被更改,包括 11 次插入35 次删除
  1. 11 35
      app/Http/Controllers/Api/ScreenController.php

+ 11 - 35
app/Http/Controllers/Api/ScreenController.php

@@ -297,6 +297,7 @@ class ScreenController extends BaseController
     public function capacity(Request $request){
     public function capacity(Request $request){
         $date = date('Ymd',time());
         $date = date('Ymd',time());
 
 
+        $process = Process::where('del_time',0)->get()->toArray();
         //工序-----------------------------
         //工序-----------------------------
         $model = new OrdersProductProcess(['channel' => $date]);//当前季度的数据
         $model = new OrdersProductProcess(['channel' => $date]);//当前季度的数据
         $data = $model->where('del_time',0)
         $data = $model->where('del_time',0)
@@ -319,43 +320,18 @@ class ScreenController extends BaseController
         $maxValue = empty($return) ? 0 : max($return);
         $maxValue = empty($return) ? 0 : max($return);
         $today = $return[$date] ?? 0;
         $today = $return[$date] ?? 0;
         $rate = $maxValue ? intval($today/$maxValue * 100) : 0;
         $rate = $maxValue ? intval($today/$maxValue * 100) : 0;
-        //工序-----------------------------
-
-        //包装-----------------------------
-        $model = new BoxDetail(['channel' => $date]);//当前季度的数据
-        $data = $model->where('del_time',0)
-            ->select('crt_time','num')
-            ->get()->toArray();
-
-        $return = [];
-        if(! empty($data)){
-            foreach ($data as $value){
-                $crt_time = date('Ymd',$value['crt_time']);
-                if(isset($return[$crt_time])){
-                    $return[$crt_time] += $value['num'];
-                }else{
-                    $return[$crt_time] = $value['num'];
-                }
-            }
+        $array = [];
+        foreach ($process as $value){
+            $array[] = [
+                [
+                    'title' => $value['title'],
+                    'rate' => $rate
+                ]
+            ];
         }
         }
-        $maxValue = empty($return) ? 0 : max($return);
-        $today = $return[$date] ?? 0;
-        $rate2 = $maxValue ? intval($today/$maxValue*100) : 0;
-        //包装-----------------------------
+        //工序-----------------------------
 
 
-        $arr = [
-            [
-                [
-                    "title"=> "压贴",
-                    "rate"=> $rate
-                ],
-//                [
-//                    "title"=> "包装",
-//                    "rate"=> $rate2
-//                ]
-            ],
-        ];
-        return $this->json_return(200,'',['data' => $arr]);
+        return $this->json_return(200,'',['data' => $array]);
 
 
     }
     }