合并

app/Http/Controllers/TestController.php

@@ -506,10 +506,9 @@ class TestController extends Controller
 
     }
 
-    public function doctype(){
-
-        $a=\Doctrine\DBAL\Types\Type::getTypesMap();
-        dd($a);
+    public function usage(){
+        dd(Request::all());
+        $users=User::query();
     }
     public function orderTrckingOwnerAll(){
         $owners = Owner::all();

app/Services/OrderTrackingService.php

@@ -7,6 +7,7 @@ use App\OracleDOCOrderHeader;
 use App\OrderPackageCommodities;
 use App\OrderTracking;
 use App\Services\common\BatchUpdateService;
+use App\Services\common\DataHandlerService;
 use App\Services\common\QueryService;
 use Illuminate\Support\Facades\Auth;
 use Maatwebsite\Excel\Facades\Excel;
@@ -447,6 +448,8 @@ class OrderTrackingService
     public function updateByWmsOrderHeaders($orderHeaders)
     {
         if(!$orderHeaders){return ;}
+        /** @var DataHandlerService $dataService */
+        $dataService = app(DataHandlerService::class);
         $order_nos = data_get($orderHeaders,'*.orderno');
         $order_package_commodities = OrderPackageCommodities::query()
             ->with('package.order')

app/Services/common/DataHandlerService.php

@@ -8,11 +8,13 @@ class DataHandlerService
 {
     public function dataHeader(array $mapKeys= [], $resultData =[]){
         $handlerData = [];
+        $handlerData['mapkey'] = $mapKeys;
+        if(!$resultData){return $handlerData;}
         foreach ($resultData as $data) {
             $key =  $this->getKey($mapKeys,$data);
             $handlerData[$key] = $data;
         }
-        $handlerData['mapkey'] = $mapKeys;
+
         return $handlerData;
     }