OrderTrackingController 修改查询导出的使用

app/Http/Controllers/OrderTrackingController.php

@@ -4,7 +4,6 @@ namespace App\Http\Controllers;
 
 use App\Filters\OrderTrackFilters;
 use App\Logistic;
-use App\Order;
 use App\OrderTracking;
 use App\Services\common\ExportService;
 use App\Services\OrderTrackingService;
@@ -21,18 +20,14 @@ class OrderTrackingController extends Controller
 
     public function index(Request $request,OrderTrackFilters $filters)
     {
-        /**
-         * @var OrderTrackingService $service
-         */
         if (!Gate::allows('订单管理-跟踪'))
             return redirect(url('/'));
         $owners =  app(OwnerService::class)->getAuthorizedOwners();
 
         $trackOrders = OrderTracking::query()->filter($filters)->defaultQuery()->defaultWith()->paginate($request['paginate'] ?? 50);
-
-        $service = app('OrderTrackingService');
+        /** @var OrderTrackingService $service */
+        $service = app(OrderTrackingService::class);
         $service->fillInOrderTracking();
-        $trackOrders = $service->paginate($request->input());
         $trackOrders->map(function($trackOrder){
             if($trackOrder->uploadFile){
                 if(!str_starts_with($trackOrder->uploadFile->url,'http')){
@@ -144,20 +139,18 @@ class OrderTrackingController extends Controller
         return ['success'=>false,'error'=>'图片上传失败'];
     }
 
-    public function export(Request $request)
+    public function export(Request $request,OrderTrackFilters  $filters)
     {
         if (!Gate::allows('订单管理-跟踪'))
             return redirect(url('/'));
         /** @var OrderTrackingService $service */
         $service = app(OrderTrackingService::class);
-        $orderTrackings = $service->getOrderTrackings($request->input());
-//        $column = ['owners_name','order_client_code','web_order_number','pick_up_at','sale','client','sku','sku_name','amount','order_remark',
-//            'gross_weight','bulk','pallet_total','logistic_name','logistic_number','city','planning_sent_at','is_on_duty_shift','is_arrival','signed_at','receive_bill_status','remark'];
+        $orderTrackings = OrderTracking::query()->filter($filters)->defaultQuery()->defaultWith()->get();
+
         $rule = ["pick_up_at"=> "mysqlDate",'planning_sent_at'=>"mysqlDate"];
 
         $row = ['公司','订单号','WEB+订单号','提货日期','销售','客户','SKU','物料描述','数量','订单备注','重量','体积',
-            '托盘合计','运输方式','运输单号','到达城市','应送达时间','是否赶上卡班','到货情况','签收日期','签收单情况','备注'];
-        $mergeColumn = ['A','B','C','D','E','F','J','N','P','P','Q','R','S','T','U','V','M'];
+            '托盘合计','运输方式','运输单号','到达城市','序列号','应送达时间','是否赶上卡班','到货情况','签收日期','签收单情况','备注'];
         $mergeRow = [];
         $list=[];
         $start_row = 0;
@@ -187,6 +180,12 @@ class OrderTrackingController extends Controller
                 $row_count=1;
                 $order_client_code_temp = $orderTracking->order_client_code;
             }
+            $serialNumberStr = '';
+            if($orderTracking['commodities']['serialNumbers']){
+                foreach ($orderTracking['commodities']['serialNumbers'] as $serialNumber){
+                    $serialNumberStr.=$serialNumber['serial_number'].",\r\n";;
+                }
+            }
 
             $order_client_code = $orderTracking->web_order_number?'':$orderTracking->order_client_code;
             $web_order_number = $orderTracking->web_order_number??'';
@@ -217,6 +216,7 @@ class OrderTrackingController extends Controller
                 $logistic,
                 $logistic_number,
                 $orderTracking->commodities->package->order->city ?? '',
+                rtrim($serialNumberStr,",\r\n"),              //原始运单号
                 $planning_sent_at=='0000-00-00'?'':$planning_sent_at,
                 $orderTracking->is_on_duty_shift,
                 $orderTracking->is_arrival,
@@ -225,7 +225,7 @@ class OrderTrackingController extends Controller
                 $orderTracking->remark,
             ];
         }
-        return app(ExportService::class)->json($row,$list,'订单跟踪件','merge',$mergeColumn,$mergeRow);
+        return app(ExportService::class)->json($row,$list,'订单跟踪件');
     }
 
     public function destroyImg(Request $request)