修改

app/Http/Controllers/Api/ScreenController.php

@@ -66,11 +66,12 @@ class ScreenController extends BaseController
      * @return array
      */
     public function order_process1(Request $request) {
+        $firstDayOfMonth = strtotime(date('Y-m-01 00:00:00'));
         $result = SaleOrdersProduct::where('del_time',0)
+            ->where('out_order_no_time', '>=',$firstDayOfMonth)
             ->select(DB::raw('sum(order_quantity) as total'), DB::raw('sum(finished_num) as finished_num'),'out_order_no as Code','customer_name as CustomerName','pre_shipment_time')
             ->groupBy('out_order_no')
             ->orderBy('id', 'desc') // 添加这一行以按创建时间降序排序
-            ->take(200)                    // 添加这一行以限制结果集大小为100
             ->get()->toArray();
 
         if(! empty($result)){
@@ -288,8 +289,7 @@ class ScreenController extends BaseController
 
     //产量趋势图
     public function output_value_efficiency(Request $request){
-        $time = strtotime(date("2024-06-01 00:00:00"));
-
+        $time = strtotime(date('Y-m-01 00:00:00'));
         $return = [];
         $data = ApplyOrderDetail::where('del_time',0)
             ->where('type',ApplyOrder::type_two)
@@ -544,8 +544,11 @@ class ScreenController extends BaseController
             ->where('crt_time',">=", $startOfDay)
             ->where('crt_time',"<=", $endOfDay)
             ->whereColumn('dispatch_quantity','>','finished_num')
-            ->select('dispatch_no as order_no','process_id','product_title','technology_name','dispatch_quantity as product_num','finished_num as finish_num')
+            ->select('dispatch_no','process_id','product_title','technology_name','dispatch_quantity as product_num','finished_num as finish_num','sale_orders_product_id')
             ->get()->toArray();
+        $map = SaleOrdersProduct::whereIn('id',array_column(array_column($result, 'sale_orders_product_id')))
+            ->pluck('order_no','id')
+            ->toArray();
         if(! empty($result)){
             $process_id = array_unique(array_column($result,'process_id'));
             $processMap = Process::whereIn('id',$process_id)
@@ -554,6 +557,7 @@ class ScreenController extends BaseController
             foreach ($result as $key => $value){
                 $result[$key]['procedure'] = $processMap[$value['process_id']] ?? '';
                 $result[$key]['product_title'] = $value['product_title'] . "(". $value['technology_name'] .")";
+                $result[$key]['order_no'] = $map[$value['sale_orders_product_id']] ?? "";
             }
         }
 
@@ -571,11 +575,14 @@ class ScreenController extends BaseController
         $result = DispatchSub::where('del_time',0)
 //            ->where('dispatch_time_start',">=", $startOfDay)
             ->where('finished_num',0)
-            ->select('dispatch_no as order_no','product_title','technology_name','dispatch_quantity as product_num','process_id')
+            ->select('dispatch_no','product_title','technology_name','dispatch_quantity as product_num','process_id','sale_orders_product_id')
             ->orderBy('id','desc')
             ->limit(20)
             ->get()->toArray();
 
+        $map = SaleOrdersProduct::whereIn('id',array_column(array_column($result, 'sale_orders_product_id')))
+            ->pluck('order_no','id')
+            ->toArray();
         if(! empty($result)){
             $process_id = array_unique(array_column($result,'process_id'));
             $processMap = Process::whereIn('id',$process_id)
@@ -584,6 +591,7 @@ class ScreenController extends BaseController
             foreach ($result as $key => $value){
                 $result[$key]['procedure'] = $processMap[$value['process_id']] ?? '';
                 $result[$key]['product_title'] = $value['product_title'] . "(". $value['technology_name'] .")";
+                $result[$key]['order_no'] = $map[$value['sale_orders_product_id']] ?? "";
             }
         }