修改

app/Service/LargeScreenService.php

@@ -4,6 +4,8 @@ namespace App\Service;
 
 use App\Model\ApplyOrder;
 use App\Model\ApplyOrderDetail;
+use App\Model\Box;
+use App\Model\BoxDetail;
 use App\Model\DeviceOrder;
 use App\Model\DeviceOrderInfo;
 use App\Model\DispatchSub;
@@ -33,19 +35,24 @@ class LargeScreenService extends Service
         //总产值 ------------------------------------------------
 
         //当日产量 当月产量 ---------------------------------------------
-        $data_one = SaleOrdersProduct::where('del_time', 0)
+        $order_total = SaleOrdersProduct::where('del_time', 0)
             ->where('crt_time', ">=", strtotime(date("Y-m-01 00:00:00")))
             ->where('crt_time', "<=", strtotime(date("Y-m-t 23:59:59")))
-            ->select('finished_num', 'order_quantity', 'crt_time')
+            ->select(DB::raw('sum(order_quantity) as order_quantity'))
+            ->value('order_quantity');
+        $box = new BoxDetail(['channel'=>date("Ymd")]);
+        $data_one = $box->where('del_time', 0)
+            ->where('crt_time', ">=", strtotime(date("Y-m-01 00:00:00")))
+            ->where('crt_time', "<=", strtotime(date("Y-m-t 23:59:59")))
+            ->select('num as quantity', 'crt_time')
             ->get()->toArray();
         //当日产量 当月产量
-        $today_total = $month_total = $order_total = 0;
+        $today_total = $month_total = 0;
         $timeStamp = strtotime(date("Y-m-d 00:00:00"));
         $timeStampE = strtotime(date("Y-m-d 23:59:59"));
         foreach ($data_one as $value) {
-            $order_total = bcadd($order_total, $value['order_quantity'], 3);
-            $month_total = bcadd($month_total, $value['finished_num'], 3);
-            if ($timeStamp <= $value['crt_time'] && $timeStampE >= $value['crt_time']) $today_total = bcadd($today_total, $value['finished_num'], 3);
+            $month_total = bcadd($month_total, $value['quantity'], 3);
+            if ($timeStamp <= $value['crt_time'] && $timeStampE >= $value['crt_time']) $today_total = bcadd($today_total, $value['quantity'], 3);
         }
         //当日产量 当月产量 ---------------------------------------------
 
@@ -940,11 +947,13 @@ class LargeScreenService extends Service
                 $seven_days[] = [
                     'name' => $value,
                     'rate' => bcmul(bcdiv($waste[$key], $sum,4),100,2),
+                    'num' => $waste[$key]
                 ];
             }else{
                 $seven_days[] = [
                     'name' => $value,
                     'rate' => 0,
+                    'num' => 0
                 ];
             }
         }