cqpCow 2 жил өмнө
parent
commit
6c751e803a

+ 7 - 0
app/Service/DispatchService.php

@@ -9,6 +9,7 @@ use App\Model\Employee;
 use App\Model\EmployeeTeamPermission;
 use App\Model\Equipment;
 use App\Model\FinishedOrderSub;
+use App\Model\Orders;
 use App\Model\OrdersProduct;
 use App\Model\OrdersProductProcess;
 use App\Model\Process;
@@ -437,8 +438,14 @@ class DispatchService extends Service
             ->pluck('title','id')
             ->toArray();
 
+        $order_map = Orders::where('del_time',0)
+            ->whereIn('order_no',array_column($data['data'],'order_no'))
+            ->pluck('out_order_no','order_no')
+            ->toArray();
+
         date_default_timezone_set("PRC");
         foreach ($data['data'] as $key => $value){
+            $data['data'][$key]['out_order_no'] = $order_map[$value['order_no']] ?? '';
             $data['data'][$key]['crt_time'] = $value['crt_time'] ? date('Y-m-d',$value['crt_time']) : '';
 
             $time1 = $value['dispatch_time_start'] ? date('Y-m-d',$value['dispatch_time_start']) : '';