Merge branch 'SyncOrder_Tack' into zengjun

app/Commodity.php

@@ -36,8 +36,6 @@ class Commodity extends Model
         return $this->owner['code']??'';
     }
 
-
-
     public function newBarcode($barcode){
         $barcodeModel = $this->barcodes()->where('code', $barcode)->first();
         if(!$barcodeModel){

app/Http/Controllers/TestController.php

@@ -957,10 +957,14 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
         app(StoreService::class)->syncWmsAsnData($startDate);
     }
 
-    public function chageOrder()
+    public function changeOrder()
     {
+        /**
+         * @var OrderService $orderService
+         */
         $carbon =Carbon::now()->subMinutes(30);
-        $orderHeader = OracleDOCOrderHeader::query()->selectRaw(implode(',',OracleDOCOrderHeaderService::$columns))
+        var_dump('$orderHeader',new Carbon());
+        $orderHeader_start = OracleDOCOrderHeader::query()->selectRaw(implode(',',OracleDOCOrderHeaderService::$columns))
             ->with(['oracleBASCustomer'=>function($query){
                 $query->selectRaw('BAS_CUSTOMER.CustomerID,BAS_CUSTOMER.Customer_Type,BAS_CUSTOMER.Descr_C,BAS_CUSTOMER.Active_Flag');
             },'oracleDOCOrderDetails'=>function($query){
@@ -971,14 +975,15 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
                 $query->selectRaw('BAS_Codes.CodeID,BAS_Codes.CodeName_C,BAS_Codes.Code');
             }])
             ->where('DOC_Order_Header.addTime','>=',$carbon)
-//            ->where('orderno','SO201112029795')
+//            ->where('DOC_Order_Header.editTime','>=',$carbon)
             ->get();
-        var_dump($orderHeader->count());
         var_dump((string)Carbon::now());
-        /** @var OrderService $orderService */
+
         $orderService = app('OrderService');
-        $orderService->syncOrder($orderHeader);
+        $orderService->syncOrder($orderHeader_start);
+//      $orderService->syncOrder($orderHeader_edit);
         var_dump((string)Carbon::now());
+//      orderService  getCreateOrderModelsByWMSOrderHeaders
     }
 
     public function testOrderPackages(){
@@ -1122,4 +1127,27 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
 //        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode(['$orderIds'=>$orderIds,'$orderPackages'=>$orderPackages,'$orderPackageIds'=>$orderPackageIds,'$orderTrackingIds'=>$orderTrackingIds,]));
 //
 //    }
+
+    public function testSyncOrder()
+     {
+        $carbon =Carbon::now()->subHours(1);
+        $date = '2020-05-18 18:13:50';
+        $orderHeader = OracleDOCOrderHeader::query()->selectRaw(implode(',',OracleDOCOrderHeaderService::$columns))
+            ->with(['oracleBASCustomer'=>function($query){
+                $query->selectRaw('BAS_CUSTOMER.CustomerID,BAS_CUSTOMER.Customer_Type,BAS_CUSTOMER.Descr_C,BAS_CUSTOMER.Active_Flag');
+            },'oracleDOCOrderDetails'=>function($query){
+                $query->selectRaw('doc_order_details.orderNo,doc_order_details.customerid,doc_order_details.sku,doc_order_details.QtyOrdered');
+            }, 'actAllocationDetails'=>function($query){
+                $query->selectRaw('ACT_Allocation_Details.AllocationDetailsID,ACT_Allocation_Details.OrderNo,ACT_Allocation_Details.Qty_Each,ACT_Allocation_Details.PickToTraceID,ACT_Allocation_Details.CustomerID,ACT_Allocation_Details.Sku');
+            },'oracleBASCode'=>function($query){
+                $query->selectRaw('BAS_Codes.CodeID,BAS_Codes.CodeName_C,BAS_Codes.Code');
+            }])
+//            ->where('DOC_Order_Header.addTime','>=',$startDate)
+//            ->where('orderno','SO201112029795')
+            ->where('DOC_Order_Header.addTime','>=',$carbon)
+            ->get();
+        /** @var OrderService $service */
+        $service = app('OrderService');
+        $service->syncOrder($orderHeader);
+    }
 }

app/Http/Controllers/api/thirdPart/flux/SortingController.php

@@ -187,7 +187,6 @@ class SortingController extends Controller
         return true;
     }
 
-
     public function informBatchFinished(Batch $batch){
         $sendingData=['request'=>[]];
         $batch->orders()->each(function (Order $order)use($batch,&$sendingData){

app/Services/CommodityService.php

@@ -177,15 +177,17 @@ Class CommodityService
     {
         if(!$params) return [];
         $bas_sku_arr = OracleBasSKU::query()
+            ->selectRaw('customerid,sku,descr_c,skulength,skuwidth,skuhigh,cube')
             ->whereIn('CustomerID',data_get($params,'*.owner_code'))
             ->whereIn('Sku',data_get($params,'*.sku'))
             ->get();
         $insert_params = [];
-
+        $created_at = Carbon::now()->format('Y-m-d H:i:s');
         foreach ($bas_sku_arr as $bas_sku) {
             $owner = $owners_code_map[$bas_sku->customerid] ?? '';
             if(!$owner)continue;
-            $created_at = Carbon::now()->format('Y-m-d H:i:s');
+            if($bas_sku->sku==null)continue;
+            if($bas_sku->descr_c=='')continue;
             $insert_params[] = [
                 'owner_id' => $owner->id,
                 'sku' => $bas_sku->sku,
@@ -197,7 +199,6 @@ Class CommodityService
                 'volumn' => $bas_sku->cube
             ];
         }
-
         if(count($insert_params) > 0){
             try {
                 $this->insert($insert_params);

app/Services/LogisticService.php

@@ -46,6 +46,7 @@ Class LogisticService
     public function createLogisticByCarrierIds($codes){
         if(!$codes){return [];}
         $baseCustomers = OracleBasCustomer::query()
+            ->selectRaw('Customer_Type,CustomerID,Descr_C')
             ->where('Customer_Type','CA')
             ->whereIn('CustomerID',$codes)
             ->get();

app/Services/OracleBasCustomerService.php

@@ -14,9 +14,13 @@ Class OracleBasCustomerService
     public function getWareHouse($customerIDs = null)
     {
         if(!$customerIDs){
-            return OracleBasCustomer::query()->where('Customer_Type','WH')->get();
+            return OracleBasCustomer::query()->selectRaw('Customer_Type,CustomerId,Descr_C')->where('Customer_Type','WH')->get();
         }
-        return  OracleBasCustomer::query()->where('Customer_Type','WH')->get();
+        return  OracleBasCustomer::query()
+            ->selectRaw('Customer_Type,CustomerId,Descr_C')
+            ->where('Customer_Type','WH')
+            ->whereIn('CustomerId',$customerIDs)
+            ->get();
     }
     public function getCustomers($codes)
     {

app/Services/OrderPackageCommoditiesService.php

@@ -775,6 +775,7 @@ class OrderPackageCommoditiesService
         foreach ($inner_params as $inner_param) {
             if($inner_param['logistic_number'] === '*' || $inner_param['logistic_number'] === ' ')continue;
             $package = $dataHandlerService->getKeyValue(['logistic_number'=>$inner_param['logistic_number']],$package_map);
+            if(!$package)continue;
             $commodity = $commodity_map[' owner='.$inner_param['owner_code'].' sku='.$inner_param['sku']] ?? null;
             $create_params[] = [
                 'order_package_id'=>$package->id,
@@ -786,8 +787,11 @@ class OrderPackageCommoditiesService
         }
         if(count($create_params)>0){
             try {
-                $bool = $this->insert($create_params);
-                LogService::log(__METHOD__,__FUNCTION__,'批量添加 orderCommodity --'. $bool ." || ".count($create_params).' || '.json_encode($create_params));
+                $inner_array = array_chunk($create_params,1000);
+                foreach ($inner_array as $item) {
+                    $bool = $this->insert($item);
+                    LogService::log(__METHOD__,__FUNCTION__,'批量添加 orderCommodity --'. $bool ." || ".count($create_params).' || '.json_encode($create_params));
+                }
             } catch (\Exception $e) {
                 LogService::log(__METHOD__,__FUNCTION__.'error','批量添加 orderCommodity error'." || ".count($create_params).' || '.json_encode($create_params));
             }

app/Services/OrderPackageService.php

@@ -439,8 +439,11 @@ class OrderPackageService
         }
         if(count($inner_params)>0){
             try {
-                $bool = $this->insert($inner_params);
-                $bool ? LogService::log(__METHOD__, __FUNCTION__, '批量添加 OrderPackage ' . count($inner_params) . ' || ' . json_encode($inner_params)) : null;
+                $inner_array = array_chunk($inner_params,1000);
+                foreach ($inner_array as $params) {
+                    $bool = $this->insert($params);
+                    $bool ? LogService::log(__METHOD__, __FUNCTION__, '批量添加 OrderPackage ' . count($inner_params) . ' || ' . json_encode($inner_params)) : null;
+                }
             } catch (\Exception $e) {
                 LogService::log(__METHOD__, __FUNCTION__, '批量添加 OrderPackage error ' . count($inner_params) . ' || ' .json_encode($e->getMessage()). json_encode($inner_params).json_encode($e->getTraceAsString()));
             }

app/Services/OrderService.php

@@ -30,10 +30,11 @@ class OrderService
         if(count($params)==0) return true;
         try {
             $bool= Order::query()->insert($params);
-            app('LogService')->log(__METHOD__, __FUNCTION__, '批量创建 Order' . json_encode($params));
+            if($bool)app('LogService')->log(__METHOD__, __FUNCTION__, '批量创建 Order' . json_encode($params));
+            else app('LogService')->log(__METHOD__,'ERROR'. __FUNCTION__, '批量创建 Order ERROR' . json_encode($params));
             return $bool;
         } catch (\Exception $e) {
-            app('LogService')->log(__METHOD__, __FUNCTION__, '批量创建 Order error' . json_encode($params).json_encode($e->getMessage()).json_encode($e->getTraceAsString()));
+            app('LogService')->log(__METHOD__, 'ERROR'.__FUNCTION__, '批量创建 Order ERROR' . json_encode($params).json_encode($e->getMessage()).json_encode($e->getTraceAsString()));
             return false;
         }
     }
@@ -977,17 +978,14 @@ class OrderService
          */
         $orderPackageService = app('OrderPackageService');
         $orderPackageCommoditiesService = app('OrderPackageCommoditiesService');
-        $order = Order::query()->with('packages.commodities')->where('code',$orderHeader->orderno)->first();
-        if($order) return $order;
-        $create_param = $this->getParamByOrderHeader($orderHeader);
+        $orderHeaders = [$orderHeader];
         try {
-            $orderHeaders = [$orderHeader];
-            $order = Order::query()->create($create_param);
+            $this->syncOrderByWMSOrderHeaders($orderHeaders);
             $orderPackageService->syncOrderPackage($orderHeaders);
             $orderPackageCommoditiesService->syncOrderPackageCommodities($orderHeaders);
             return  Order::query()->with('packages.commodities')->where('code',$orderHeader->orderno)->first();
         } catch (\Exception $e) {
-            app('LogService')->log(__METHOD__, 'Error'.__FUNCTION__, '创建 Order Error' .' || '. json_encode($order).' || '.json_encode($e->getMessage()).' || '.json_encode($e->getTraceAsString()));
+            app('LogService')->log(__METHOD__, 'Error'.__FUNCTION__, '创建 Order Error' .' || '. json_encode($orderHeader).' || '.json_encode($e->getMessage()).' || '.json_encode($e->getTraceAsString()));
             return null;
         }
     }

app/Services/ShopService.php

@@ -31,8 +31,8 @@ class ShopService
     }
 
     public function getByWmsOrders($orderHeaders)
-    {    //issuepartyname
-        $maps = [];
+    {
+        $maps = []; //issuepartyname
         foreach ($orderHeaders as $orderHeader) {
             $value = ['owner_code'=>$orderHeader->customerid,'issuepartyname'=>$orderHeader->issuepartyname];
             if(!in_array($value,$maps))
@@ -46,10 +46,10 @@ class ShopService
             })->whereIn('name',$issuepartynames)->get();
         if($shops->count() < count($issuepartynames)){
             $shops_code = data_get($shops,'*.name');
-            $issuepartynames = array_diff($issuepartynames,$shops_code);
+            $names = array_diff($issuepartynames,$shops_code);
             $params = [];
             foreach ($maps as $item){
-               if(in_array($item['issuepartyname'],$issuepartynames))
+               if(in_array($item['issuepartyname'],$names))
                    $params[] = $item;
             }
             $shops_list = $this->createByNameAndOwnerCode($params);
@@ -59,9 +59,7 @@ class ShopService
     }
 
     public function createByNameAndOwnerCode(array $params){
-        $owners = Owner::query()
-            ->whereIn('code',data_get($params,'*.owner_code'))
-            ->get();
+        $owners = Owner::query()->whereIn('code',data_get($params,'*.owner_code'))->get();
         $owners_map = [];
         foreach ($owners as $owner) {
             $owners_map[$owner->code] = $owner;
@@ -82,11 +80,9 @@ class ShopService
                 app('LogService')->log(__METHOD__, __FUNCTION__, '批量创建 shop ' . count($insert_params) . json_encode($insert_params));
             }
         } catch (\Exception $e) {
-            app('LogService')->log(__METHOD__, __FUNCTION__, '批量创建 shop ' . json_encode($insert_params) .'||'.$e->getMessage().'||'.$e->getTraceAsString());
+            app('LogService')->log(__METHOD__, 'Error '.__FUNCTION__, '批量创建 shop Error' . json_encode($insert_params) .'||'.$e->getMessage().'||'.$e->getTraceAsString());
         } finally {
-            return Shop::query()
-                ->whereIn('name',data_get($params,'*.issuepartyname'))
-                ->get();
+            return Shop::query()->whereIn('name',data_get($params,'*.issuepartyname'))->get();
         }
     }
 

app/Services/WarehouseService.php

@@ -42,7 +42,7 @@ Class WarehouseService
         $oracleBasCustomers=app(OracleBasCustomerService::class)->getWareHouse($warehouse_ids);
         $warehouses=Warehouse::query()->where('code',data_get($oracleBasCustomers,'*.CustomerID'))->get();
         $oracleBasCustomers=$oracleBasCustomers->filter(function($oracleBasCustomer)use($warehouses){
-            return $warehouses->where('code',$oracleBasCustomer->warehouseid)->count()>0;
+            return $warehouses->where('code',$oracleBasCustomer->warehouseid)->count()==0;
         });
         foreach ($oracleBasCustomers as $oracleBasCustomer){
             $wereHouse=Warehouse::query()->create([
@@ -78,7 +78,6 @@ Class WarehouseService
                 'created_at' => $created_at,
             ];
         }
-
         try {
             if (count($insert_params) > 0) {
                 $this->insert($insert_params);

public/js/app.js

@@ -2330,7 +2330,7 @@ function fromByteArray (uint8) {
 var BlobBuilder = typeof BlobBuilder !== 'undefined' ? BlobBuilder :
   typeof WebKitBlobBuilder !== 'undefined' ? WebKitBlobBuilder :
   typeof MSBlobBuilder !== 'undefined' ? MSBlobBuilder :
-  typeof MozBlobBuilder !== 'undefined' ? MozBlobBuilder :
+  typeof MozBlobBuilder !== 'undefined' ? MozBlobBuilder : 
   false;
 
 /**
@@ -86472,8 +86472,8 @@ module.exports = tempTip;
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-__webpack_require__(/*! D:\Demo\bswas\resources\js\app.js */"./resources/js/app.js");
-module.exports = __webpack_require__(/*! D:\Demo\bswas\resources\sass\app.scss */"./resources/sass/app.scss");
+__webpack_require__(/*! D:\phpstudy_pro\WWW\bswas\resources\js\app.js */"./resources/js/app.js");
+module.exports = __webpack_require__(/*! D:\phpstudy_pro\WWW\bswas\resources\sass\app.scss */"./resources/sass/app.scss");
 
 
 /***/ }),
@@ -86489,4 +86489,4 @@ module.exports = __webpack_require__(/*! D:\Demo\bswas\resources\sass\app.scss *
 
 /***/ })
 
-/******/ });
+/******/ });

tests/Services/OracleDOCOrderHeaderService/GetWMSOrderOnStartDateTest.php

@@ -21,13 +21,10 @@ class GetWMSOrderOnStartDateTest extends TestCase
 
     public function testGetWMSOrderOnStartDate()
     {
-        $carbon =Carbon::now()->subSeconds(10);
-        var_dump(Carbon::now());
+        $carbon =Carbon::now()->subMinutes(5);
         $orderHeaders = $this->service->getWMSOrderOnStartDate($carbon);
-        var_dump(Carbon::now());
         $this->assertNotNull($orderHeaders);
         $orderHeader = $orderHeaders->first();
-        var_dump($orderHeader->toArray());
         $this->assertNotNull($orderHeader->oracleDOCOrderDetails);
         $this->assertNotNull($orderHeader->actAllocationDetails);
         $this->assertNotNull($orderHeader->oracleBASCustomer);

tests/Services/OracleDOCOrderHeaderService/GetWmsOrderOnStartDateEditTest.php

@@ -15,16 +15,14 @@ class GetWmsOrderOnStartDateEditTest extends TestCase
 
     public function setUp(): void
     {
-        $this->service = app(OracleDOCOrderHeaderService::class);
         parent::setUp();
+        $this->service = app(OracleDOCOrderHeaderService::class);
     }
 
     public function testGetWmsOrderOnStartDateEdit()
     {
-        $carbon =Carbon::now()->subHours(10);
-        var_dump(Carbon::now());
+        $carbon =Carbon::now()->subMinutes(5);
         $orderHeaders = $this->service->getWmsOrderOnStartDateEdit($carbon);
-        var_dump(Carbon::now());
         $this->assertNotNull($orderHeaders);
         $orderHeader = $orderHeaders->first();
         if($orderHeaders->count() == 0){

tests/Services/OrderService/CreateOrFindOrderInfoTest.php

@@ -17,6 +17,7 @@ class CreateOrFindOrderInfoTest extends TestCase
 
     /**
      * @var OrderService $orderService
+     * @var Order $order
      */
     public $orderService;
     public $data = [];
@@ -37,4 +38,14 @@ class CreateOrFindOrderInfoTest extends TestCase
         $this->order->delete();
     }
 
+    public function testCreateOrFindOrderInfo1()
+    {
+        $orderHeader = $this->data['orderHeader'];
+        $orderHeader->customerid = null;
+        $orderHeader->warehouseid = null;
+        $orderHeader->userdefine1 = null;
+        $this->orderService->createOrFindOrderInfo($this->data['orderHeader']);
+
+    }
+
 }

tests/Services/OrderService/FindOrCreateByClientCodeTest.php

@@ -23,7 +23,6 @@ class FindOrCreateByClientCodeTest extends TestCase
     {
         $clientCode = OracleDOCOrderHeader::query()->first()->soreference1;
         $order =  $this->service->findOrCreateByClientCode($clientCode);
-        var_dump($clientCode,$order);
         $this->assertNotEmpty($clientCode);
         $this->assertNotEmpty($order);
         $this->assertNotEmpty($order->client_code);

tests/Services/OrderService/GetOrderByLogisticNumberTest.php

@@ -28,19 +28,15 @@ class GetOrderByLogisticNumberTest extends TestCase
     {
         $order_package = OrderPackage::query()->orderByDesc('id')->first();
         $logistic_number = $order_package->logistic_number;
-//        var_dump($logistic_number);
         $orderHeader = OracleDOCOrderHeader::query()->whereHas('actAllocationDetails',function($query)use($order_package){
             $query->where('PickToTraceID',$order_package->logistic_number);
         })->first();
-//        var_dump($orderHeader?$orderHeader->orderno:'');
 
         if(!$orderHeader){
             $orderHeader = OracleDOCOrderHeader::query()->with('actAllocationDetails')->orderBy('AddTime')->first();
-//            var_dump($orderHeader?$orderHeader->orderno:'查询为空');
             $logistic_number = data_get($orderHeader,'actAllocationDetails.*.picktotraceid')[0];
         }
         $order = $this->service->getOrderByLogisticNumber($logistic_number);
-//        var_dump($order,$logistic_number,$orderHeader,$order_package);
         $this->assertEquals((string)$orderHeader->addtime,(string)$order->created_at);
         $this->assertEquals($orderHeader->orderno,$order->code);
 

tests/Services/OrderService/LogisticNumberFirstOrCreateOrderTest.php

@@ -23,7 +23,6 @@ class LogisticNumberFirstOrCreateOrderTest extends TestCase
     {
         $logistic_number = OracleActAllocationDetails::query()->first()->picktotraceid;
         $order = $this->service->logisticNumberFirstOrCreateOrder($logistic_number);
-//        var_dump($order,$logistic_number);
         $this->assertNotEmpty($order);
     }
 }

tests/Services/OrderService/SyncOrderByWMSOrderHeaderTest.php

@@ -48,9 +48,7 @@ class SyncOrderByWMSOrderHeaderTest extends TestCase
         $date = '2020-09-18 18:13:50';
         $orderHeaders = $this->orderHeaderService->getWMSOrderOnStartDate($carbon);
         $this->service->syncOrderByWMSOrderHeaders($orderHeaders);
-        $existOrders = $this->service->getByWmsOrders($orderHeaders);
         $collect =null;
-
         foreach ($orderHeaders as $orderHeader) {
             $code = $orderHeader->orderno;
             $order = $collect->where('code',$code)->first();
@@ -77,11 +75,9 @@ class SyncOrderByWMSOrderHeaderTest extends TestCase
             $this->assertEquals($order->province ,$orderHeader->c_province);
             $this->assertEquals($order->city ,$orderHeader->c_city);
             $this->assertEquals($order->district ,$orderHeader->c_district);
-
             $this->assertEquals($order->client_code ,$orderHeader->soreference1);
             $this->assertEquals($order->wms_edittime ,(string)$orderHeader->edittime);
             $this->assertEquals($order->wms_status ,$orderHeader->oracleBASCode_codename_c);
-
             $this->assertEquals((string)$order->created_at ,(string)$orderHeader->addtime);
         }
     }

tests/Services/OrderService/SyncOrderTest.php

@@ -47,9 +47,6 @@ class SyncOrderTest extends TestCase
     {
         $carbon =Carbon::now()->subHours(1);
         $date = '2020-05-18 18:13:50';
-        var_dump(((string)Carbon::now()));
-        //   SO201112029795
-//        $orderHeader = $this->orderHeaderService->getWMSOrderOnStartDate($carbon);
         $orderHeader = OracleDOCOrderHeader::query()->selectRaw(implode(',',OracleDOCOrderHeaderService::$columns))
             ->with(['oracleBASCustomer'=>function($query){
                 $query->selectRaw('BAS_CUSTOMER.CustomerID,BAS_CUSTOMER.Customer_Type,BAS_CUSTOMER.Descr_C,BAS_CUSTOMER.Active_Flag');
@@ -64,12 +61,7 @@ class SyncOrderTest extends TestCase
 //            ->where('orderno','SO201112029795')
             ->where('DOC_Order_Header.addTime','>=',$carbon)
             ->get();
-        var_dump($orderHeader->count());
-        var_dump((string)Carbon::now());
-
         $this->service->syncOrder($orderHeader);
-        var_dump((string)Carbon::now());
-
         $order = $this->service->getByWmsOrders($orderHeader);
         $this->assertNotNull($order);
         $this->assertNotNull($orderHeader);

tests/Services/WarehouseService/GetByWmsOrderTest.php

@@ -2,6 +2,7 @@
 
 namespace Tests\Services\WarehouseService\GetByWmsOrdersTest;
 
+use App\OracleBasCustomer;
 use App\OracleDOCOrderHeader;
 use App\Services\WarehouseService;
 use App\Warehouse;
@@ -13,26 +14,23 @@ class GetByWmsOrderTest extends TestCase
 
     /** @var WarehouseService $service */
     public $service;
-
+    public $data = [];
 
     public function setUp(): void
     {
-        $this->service = app(WarehouseService::class);
         parent::setUp();
+        $this->service = app(WarehouseService::class);
+        $basCustomers = OracleBasCustomer::query()->selectRaw('Customer_Type,CustomerId,Descr_C')->where('Customer_Type','WH')->get();
+        foreach ($basCustomers as $basCustomer) {
+            $this->data['data'][]['warehouseid'] =  $basCustomer->customerid;
+        }
     }
 
     public function testGetByWmsOrder()
     {
-        $carbon = Carbon::now()->subMinutes(10);
-        $orders = OracleDOCOrderHeader::query()->where('addtime',">=",$carbon)->get();
-        $warehouse_ids = data_get($orders,'*.warehouseid');
-        $warehouses =  $this->service->getByWmsOrders($orders);
+        $warehouses =  $this->service->getByWmsOrders($this->data['data']);
+        $warehouse_ids = data_get($this->data['data'],'*.warehouseid');
         $warehouse_s = Warehouse::query()->whereIn('code',$warehouse_ids)->get();
-//        var_dump($warehouses->map(function($item){
-//            return [$item->id,$item->name,$item->code];
-//        }),$warehouse_s->map(function($item){
-//            return [$item->id,$item->name,$item->code];
-//        }));
         $this->assertEquals($warehouses->count(),$warehouse_s->count());
     }
 }