临时提交

app/Services/OrderService.php

@@ -804,7 +804,7 @@ SQL;
         $dataHandlerService = app('DataHandlerService');
         $warehouse_map = $dataHandlerService->dataHeader(['code'], $warehouses);
         $owner_map = $dataHandlerService->dataHeader(['code'], $owners);
-        $logistic_map = $dataHandlerService->dataHeader(['code'], $logistics);
+        $logistic_map = $dataHandlerService->dataHeader(['code'], $logistics->filter());
         $shop_map = $dataHandlerService->dataHeader(['name', 'owner_id'], $shops);
         $order_map = $dataHandlerService->dataHeader(['code'], $orders);
         $batch_map = $dataHandlerService->dataHeader(['code'], $batches);
@@ -827,12 +827,12 @@ SQL;
          * @var Order $order
          */
         $dataHandlerService = app('DataHandlerService');
-        $orderHeader_map = $dataHandlerService->dataHeader(['orderno'], $orderHeaders);
-        $warehouse_map = $dataHandlerService->dataHeader(['code'], $warehouses);
-        $owner_map = $dataHandlerService->dataHeader(['code'], $owners);
-        $logistic_map = $dataHandlerService->dataHeader(['code'], $logistics);
-        $shop_map = $dataHandlerService->dataHeader(['name', 'owner_id'], $shops);
-        $batch_map = $dataHandlerService->dataHeader(['code'], $batches);
+        $orderHeader_map = $dataHandlerService->dataHeader(['orderno'], $orderHeaders->filter());
+        $warehouse_map = $dataHandlerService->dataHeader(['code'], $warehouses->filter());
+        $owner_map = $dataHandlerService->dataHeader(['code'], $owners->filter());
+        $logistic_map = $dataHandlerService->dataHeader(['code'],$logistics->filter());
+        $shop_map = $dataHandlerService->dataHeader(['name', 'owner_id'], $shops->filter());
+        $batch_map = $dataHandlerService->dataHeader(['code'], $batches->filter());
         $collect = collect();
         $date = (string)Carbon::now();
         foreach ($orders as $order) {