Merge branch 'zengjun' of ssh://was.baoshi56.com:10022/var/git/bswas

app/Http/Controllers/TestController.php

@@ -67,6 +67,7 @@ use App\Warehouse;
 use App\Waybill;
 use Carbon\Carbon;
 use Exception;
+use Facade\Ignition\QueryRecorder\Query;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
@@ -922,11 +923,35 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
         dd( $chunks->toArray());
     }
 
-    public function changeOrderIssue()
+    public function chageOrder()
     {
-        // $ids = [5419,5404,5402,5401,5400,5398,5397,5395,5388,5387,5383,5382,5379,5373,5370,5353,5329,5327];
+        $carbon =Carbon::now()->subMinutes(30);
+        $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','>=',$carbon)
+//            ->where('orderno','SO201112029795')
+            ->get();
+        var_dump($orderHeader->count());
+        var_dump((string)Carbon::now());
+        /** @var OrderService $orderService */
+        $orderService = app('OrderService');
+        $orderService->syncOrder($orderHeader);
+        var_dump((string)Carbon::now());
+    }
+
+    public function testOrderPackages(){
+    }
 
-        // OrderIssue::query()->whereIn('id',$ids)->update(['is_new_rejecting'=>'无','rejecting_status'=>'未退回']);
+    public function view(){
+        return view('test');
     }
 
 }

app/OracleDOCOrderHeader.php

@@ -41,7 +41,6 @@ class OracleDOCOrderHeader extends Model
     public function actAllocationDetails(){
         return $this->hasMany('App\OracleActAllocationDetails','orderno','orderno');
     }
-
     public function getOracleBASCustomerDescrCAttribute(){
         return $this['oracleBASCustomer']['descr_c']??'';
     }

app/Order.php

@@ -132,7 +132,7 @@ class Order extends Model
         return parent::delete();
     }
 
-    public function isEquals(Order $order)
+    public function isEquals($order)
     {
         return
             $this['code'] == $order['code'] &&
@@ -152,7 +152,7 @@ class Order extends Model
             (string)$this['created_at'] == (string)$order['created_at'];
     }
 
-    public function assignValueByOrder(Order $order)
+    public function assignValueByOrder($order)
     {
         $this['code'] = $order['code'] ;
         $this['warehouse_id'] = $order['warehouse_id'] ;

app/OrderIssue.php

@@ -218,7 +218,8 @@ class OrderIssue extends Model
         return parent::delete();
     }
 
-    public function syncRejectedBill()// 同步退回单
+    // 同步退回单
+    public function syncRejectedBill()
     {
         if(!isset($this['logistic_number_return'])){
             $order = $this->order;
@@ -228,5 +229,4 @@ class OrderIssue extends Model
             }
         }
     }
-
 }

app/Services/OracleDOCOrderHeaderService.php

@@ -19,7 +19,8 @@ Class OracleDOCOrderHeaderService
         'DOC_Order_Header.EditTime','DOC_Order_Header.Notes','DOC_Order_Header.CarrierID',
         'DOC_Order_Header.CarrierName', 'DOC_Order_Header.LastShipmentTime','DOC_Order_Header.EDISendFlag',
         'DOC_Order_Header.SOReference5', 'DOC_Order_Header.C_Tel2','DOC_Order_Header.Transportation',
-        'DOC_Order_Header.WareHouseId','DOC_Order_Header.SOStatus','DOC_Order_Header.C_Tel1'
+        'DOC_Order_Header.WareHouseId','DOC_Order_Header.SOStatus','DOC_Order_Header.C_Tel1','DOC_Order_Header.C_District',
+        'DOC_Order_Header.IssuePartyName'
     ];
 
     function first(array $params){
@@ -72,11 +73,11 @@ Class OracleDOCOrderHeaderService
             },'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');
+                $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('addTime','>=',$startDate)
+            ->where('DOC_Order_Header.addTime','>=',$startDate)
             ->get();
     }
 }

app/Services/OrderIssueService.php

@@ -299,10 +299,16 @@ class OrderIssueService
         $orderService = app('OrderService');
 //        $orderService->updateByWmsOrders($orderHeaders);
 //        $orders = $orderService->getByWmsOrders($orderHeaders);
-        $orders = $orderService->createByWmsOrder($orderHeaders);
+        $orderService->createByWmsOrder($orderHeaders);
+        $orders = Order::query()->whereIn('code',data_get($orderHeaders,'*.orderno'))->whereHas('packages')->get();
+
         $innerParams = [];
-        if(count($orders)>0){
-            foreach ($orders as $order) {
+        if($orders->count()>0){
+            foreach ($orderHeaders as $orderHeader) {
+                $order = $orders->where('code',$orderHeader->orderno)->first();
+                if($order==null){
+                    $order = Order::query()->where('code',$orderHeader->orderno)->first();
+                }
                 $innerParams[] = [
                     'order_id' => $order->id,
                     'order_issue_type_id' => $order_issue_type_id,

app/Services/OrderPackageCommoditiesService.php

@@ -27,7 +27,7 @@ class OrderPackageCommoditiesService
     public function batchUpdate($params){
         return app(BatchUpdateService::class)->batchUpdate('order_package_commodities',$params);
     }
-
+    //-------------------------
     public function basedOnOracleDetailsStore($orderNo, $orderPackage)
     {
         $details = OracleDOCOrderDetail::query()->where('orderNo', $orderNo)->get();
@@ -426,7 +426,6 @@ class OrderPackageCommoditiesService
         return $order_no_map;
     }
 
-
     public function 删选可以保留的OrderPackageCommodities(&$OPCCollect,&$params)
     {
         $retain = collect();
@@ -488,7 +487,6 @@ class OrderPackageCommoditiesService
         return $innerParam;
     }
 
-
     public function 删选需要修改的OrderPackageCommodities(&$OPCCollect,&$params)
     {
         $update = collect();
@@ -591,79 +589,92 @@ class OrderPackageCommoditiesService
         return $commodity_map;
     }
 
+    // TODO
     public function deleteUnnecessaryOrderCommodities($ids)
     {
         if(!$ids)return;
+        if(count($ids)==0)return;
         OrderPackageCommodities::query()->whereHas('package',function($query)use($ids){
             $query->whereIn('id',$ids);
         })->delete();
+        app('LogService')->log(__METHOD__,__FUNCTION__,'删除 OrderPackageCommodities'.json_encode($ids));
     }
     // TODO
-    public function createOrderCommodity($orderHeaders)
-    {
+    public function syncOrderPackageCommodities(&$orderHeaders)
+    {
+        /**
+         * @var DataHandlerService $dataHandService
+         * @var CommodityService $commodityService
+         * @var OrderPackageService $orderPackageService
+         */
+        $dataHandService = app('DataHandlerService');
+        $commodityService = app('CommodityService');
+        $orderPackageService  = app( 'OrderPackageService');
         if(!$orderHeaders)return ;
-        $order_nos = data_get($orderHeaders,'*.orderno');
-        $orderCommodities = OrderPackageCommodities::query()
-            ->with(['package.order','commodity'])
-            ->whereHas('package.order',function($query)use($order_nos){
-            $query->whereIn('code',$order_nos);
-        })->get();
 
+        $commodityService->getByWmsOrders($orderHeaders);   // 预先处理     3s
+        $orderPackages = $orderPackageService->getByWmsOrders($orderHeaders);
+        $orderCommodities = $this->getByWmsOrder($orderHeaders);
+
+        $package_map = $dataHandService->dataHeader(['logistic_number'],$orderPackages);
         $orderCommodities = $this->regroupOrderCommodities($orderCommodities);
+
         $orderAllocationDetails = $this->regroupWmsOrderAllocationDetails($orderHeaders);
-        $this->filterExistParams($orderAllocationDetails,$orderCommodities);
-        $inner_params = $this->filterInnerParams($orderAllocationDetails,$orderCommodities);
-        $update_params =$this->filterUpdateParams($orderAllocationDetails,$orderCommodities);
-        $delete_params = $this->filterDeleteParams($orderAllocationDetails,$orderCommodities);
-        if($inner_params){
-            $package = [];
-            foreach ($orderCommodities as $orderCommodity) {
-                $order_package = $orderCommodity->package;
-                if(!isset($package[$order_package->logistic_number]))
-                    $package[$order_package->logistic_number] = $order_package;
-            }
-            $this->createOrderCommodities($inner_params,$package);
-        }
-        if(!$update_params)
-            $this->updateOrderCommodities($update_params);
+        $del_orderCommodities  =[];
+
+        $update_params =$this->filterUpdateParams($orderAllocationDetails,$orderCommodities,$del_orderCommodities);                  // 修改
+        $inner_params = $this->filterInnerParams($orderAllocationDetails,$orderCommodities);                              // 创建
+        $delete_params = $this->filterDeleteParams($orderAllocationDetails,$orderCommodities);                                           // 删除
 
-        if(!$delete_params)
-            $this->deleteOrderCommodities($delete_params);
+        if(count($inner_params)>0)
+            $this->createOrderCommodities($inner_params,$package_map);  // 创建 3s
+
+        if(count($update_params)>0)
+            $this->updateOrderCommodities($update_params);              // 更新
+
+        if(count($delete_params)>0)
+            $this->deleteOrderCommodities($delete_params);              // 删除
+
+        if(count($del_orderCommodities)>0)
+            $this->deleteOrderCommodities($del_orderCommodities);       // 删除
     }
-    // TODO
-    public function regroupOrderCommodities($orderCommodities)
+    // TODO 重组已有的OrderCommodities
+    public function regroupOrderCommodities(&$orderCommodities)
     {
         $params = [];
         $orderCommodities->each(function($orderCommodity)use(&$params){
-            $order_no = $orderCommodity->pacakge->order->code ?? '';
-            dd($orderCommodity->pacakge->order ?? '');
+            $order_no = $orderCommodity->package->order->code ?? '';
             $logistic_number = $orderCommodity->package->logistic_number ?? '';
             $sku = $orderCommodity->commodity->sku ?? '';
             $key = ' orderno='.$order_no.' logsitic_number='.$logistic_number.' sku='.$sku.' ';
-            $params[$key] = [
+            $params[$key][] = [
                 'id' =>$orderCommodity->id,
                 'orderno'=>$order_no,
                 'logistic_number'=>$logistic_number,
                 'sku' => $sku,
-                'amount' => $orderCommodity->amount
+                'amount' => $orderCommodity->amount,
+                'order_package_id'=>$orderCommodity->package->id ?? '',
+                'commodity_id'=>$orderCommodity->commodity->id ?? '',
             ];
         });
         return $params;
     }
-    // TODO
-    public function regroupWmsOrderAllocationDetails($orderHeaders)
+    // TODO 重组OrderAllocationDetails
+    public function regroupWmsOrderAllocationDetails(&$orderHeaders)
     {
+        /**
+         * @var OracleDOCOrderHeader $orderHeader
+         */
         $params =[];
         foreach ($orderHeaders as $orderHeader) {
             $order_no = $orderHeader->orderno;
             $actAllocationDetails = $orderHeader->actAllocationDetails ?? [];
-            foreach ($actAllocationDetails as $item) {
-                if($item)continue;
+            $actAllocationDetails->each(function($item)use(&$params,$order_no){
                 $logistic_number = $item->picktotraceid;
                 $sku = $item->sku;
                 $key = ' orderno='.$order_no.' logsitic_number='.$logistic_number.' sku='.$sku.' ';
                 if(isset($params[$key])){
-                    $params[$key]->amount += $item->qty_each;
+                    $params[$key]['amount']+= $item->qty_each;
                 }else{
                     $params[$key] = [
                         'orderno'=>$item->orderno,
@@ -673,62 +684,76 @@ class OrderPackageCommoditiesService
                         'owner_code' => $item->customerid
                     ];
                 }
-            }
+            });
         }
         return $params;
     }
-    // TODO
-    public function filterExistParams(&$orderAllocationDetails,&$orderCommodities)
+    // TODO 过滤已有的
+    public function filterUpdateParams(&$orderAllocationDetails,&$orderCommodities,&$del_orderCommodities)
     {
+        $update_params = [];
         foreach ($orderCommodities as $key=>$orderCommodity) {
             if(isset($orderAllocationDetails[$key])){
-                unset($orderCommodity,$orderAllocationDetails[$key]);
+                if(count($orderCommodity) == 1  && $orderAllocationDetails[$key]['amount'] != $orderCommodity[0]['amount']){
+                    $update_params[$key] = $orderCommodity[0];
+                    $update_params['amount'] = $orderAllocationDetails[$key]['amount'];
+                }elseif(count($orderCommodity)>1){
+                    $update_params[$key] = array_shift($orderCommodity);
+                    $update_params[$key]['amount'] = $orderAllocationDetails[$key]['amount'];
+                    collect($orderCommodity)->each(function($item)use(&$del_orderCommodities){
+                        $del_orderCommodities[] = $item;
+                    });
+                }
+                unset($orderCommodities[$key],$orderAllocationDetails[$key]);
             }
         }
+        return $update_params;
     }
-    // TODO
+    // TODO 创建
     public function filterInnerParams(&$orderAllocationDetails,&$orderCommodities)
     {
         $inner_params = [];
         foreach ($orderAllocationDetails as $key=>$orderAllocationDetail) {
-            if($orderCommodities[$key]){
+            if(!($orderCommodities[$key] ?? false)){
                 $inner_params[] = $orderAllocationDetail;
                 unset($orderCommodities[$key],$orderAllocationDetail);
             }
         }
         return $inner_params;
     }
-    // TODO
-    public function filterUpdateParams(&$orderAllocationDetails,&$orderCommodities)
-    {
-        $update_params = [];
-        foreach ($orderCommodities as $key => $orderCommodity) {
-            if(isset($orderAllocationDetails[$key])){
-                if($orderCommodity->amount != $orderAllocationDetails[$key]->amount){
-                    $update_params[$key] = $orderCommodity[$key]->amount = $orderAllocationDetails[$key]->amount;
-                    unset($orderCommodity,$orderAllocationDetails[$key]);
-                }
-            }
-        }
-        return $update_params;
-    }
+    // TODO 更新
+//    public function filterUpdateParams(&$orderAllocationDetails,&$orderCommodities)
+//    {
+//        $update_params = [];
+//        foreach ($orderCommodities as $key => $orderCommodity) {
+//            if(isset($orderAllocationDetails[$key])){
+//                if($orderCommodity->amount != $orderAllocationDetails[$key]->amount){
+//                    $update_params[$key] = $orderCommodity[$key]->amount = $orderAllocationDetails[$key]->amount;
+//                    unset($orderCommodity,$orderAllocationDetails[$key]);
+//                }
+//            }
+//        }
+//        return $update_params;
+//    }
     // TODO
     public function filterDeleteParams(&$orderAllocationDetails,&$orderCommodities)
     {
         $del_params = [];
         foreach ($orderCommodities as $key => $orderCommodity) {
             if(!isset($orderAllocationDetails[$key])){
-                $del_params[] = $orderCommodity;
+                collect($orderCommodity)->each(function ($item)use(&$del_params){
+                    $del_params[] = $item;
+                });
+                unset($orderCommodities[$key]);
             }
         }
         return $del_params;
     }
-    // TODO
-    public function createOrderCommodities($inner_params,$packages)
+    // TODO  根据数据创建
+    public function createOrderCommodities($inner_params,$package_map)
     {
         /** @var DataHandlerService $dataHandlerService */
         $dataHandlerService  = app('DataHandlerService');
-        $package_map = $dataHandlerService->dataHeader(['logistic_number'],$packages);
         $sku = [];$owners = [];
         foreach ($inner_params as $inner_param) {
             $sku_code = $inner_param['sku'];$owner_code = $inner_param['owner_code'];
@@ -748,7 +773,8 @@ class OrderPackageCommoditiesService
         $create_params =[];
         $date = Carbon::now();
         foreach ($inner_params as $inner_param) {
-            $package = $dataHandlerService->getKeyValue(['logistic_number'=>$inner_param],$package_map);
+            if($inner_param['logistic_number'] === '*' || $inner_param['logistic_number'] === ' ')continue;
+            $package = $dataHandlerService->getKeyValue(['logistic_number'=>$inner_param['logistic_number']],$package_map);
             $commodity = $commodity_map[' owner='.$inner_param['owner_code'].' sku='.$inner_param['sku']] ?? null;
             $create_params[] = [
                 'order_package_id'=>$package->id,
@@ -760,7 +786,7 @@ class OrderPackageCommoditiesService
         }
         if(count($create_params)>0){
             try {
-                $bool = OrderPackageCommodities::query()->insert($create_params);
+                $bool = $this->insert($create_params);
                 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));
@@ -775,22 +801,26 @@ class OrderPackageCommoditiesService
         $update_params = [['id','order_package_id','commodity_id','amount','updated_at']];
         foreach ($orderCommodities as $orderCommodity) {
             $update_params[] = [
-                'id' => $orderCommodity->id,
-                'order_package_id'=>$orderCommodity->order_package_id,
-                'commodity_id'=>$orderCommodity->commodity_id,
-                'amount' => $orderCommodity->amount,
+                'id' => $orderCommodity['id'] ?? '',
+                'order_package_id'=>$orderCommodity['order_package_id'] ?? '',
+                'commodity_id'=>$orderCommodity['commodity_id'] ?? '',
+                'amount' => $orderCommodity['amount'],
                 'updated_at' => $updated_at
             ];
         }
-        if(count($update_params)>0)
+        if(count($update_params)>1)
             $this->batchUpdate($update_params);
     }
-    // TODO
+    // TODO 删除
     public function deleteOrderCommodities($orderCommodities){
         if(!$orderCommodities)return;
+        if(count($orderCommodities)==0)return;
         try {
-            $bool = OrderPackageCommodities::query()->whereIn('id', data_get($orderCommodities, '*.id'))->delete();
-            LogService::log(__METHOD__, __FUNCTION__, '批量删除 OrderCommodity -- ' . $bool . '||' . $orderCommodities->count() . ' || ' . json_encode($orderCommodities->toArray()));
+            $ids = data_get($orderCommodities, '*.id');
+            if(count($ids) >0){
+                $bool = OrderPackageCommodities::query()->whereIn('id', data_get($orderCommodities, '*.id'))->delete();
+                LogService::log(__METHOD__, __FUNCTION__, '批量删除 OrderCommodity -- ' . $bool . '||' .count($orderCommodities)  . ' || ' . json_encode($orderCommodities));
+            }
         } catch (\Exception $e) {
             LogService::log(__METHOD__, __FUNCTION__.' error', '批量删除 OrderCommodity Error-- ' . $e->getMessage() . '||' . $e->getTraceAsString() );
         }

app/Services/OrderPackageService.php

@@ -13,6 +13,8 @@ use App\Services\common\BatchUpdateService;
 use App\Services\common\DataHandlerService;
 use Carbon\Carbon;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
 
 class OrderPackageService
 {
@@ -382,18 +384,19 @@ class OrderPackageService
         $orderPackage = OrderPackage::query()->create(['order_id'=>$order->id,'logistic_number'=>$logisticNumber]);
         return  compact('orderPackage','order');
     }
+
     // TODO
-    public function createPackageInfo($orderHeaders)
+    public function syncOrderPackage(&$orderHeaders)
     {
         /**
          * @var OrderPackageCommoditiesService $OrderPackageCommoditiesService
          */
         $OrderPackageCommoditiesService = app('OrderPackageCommoditiesService');
-        $this->createPackageByOrderHeader($orderHeaders);
-        $OrderPackageCommoditiesService->createOrderCommodity($orderHeaders);
+        $this->syncPackageByOrderHeaders($orderHeaders);
+        $OrderPackageCommoditiesService->syncOrderPackageCommodities($orderHeaders);
     }
     // TODO
-    public function createPackageByOrderHeader($orderHeaders)
+    public function syncPackageByOrderHeaders(&$orderHeaders)
     {
         /**
          * @var OrderService $orderService
@@ -405,12 +408,12 @@ class OrderPackageService
         $orderTrackingService = app('OrderTrackingService');
         if(!$orderHeaders)return;
         $orders = $orderService->getByWmsOrders($orderHeaders);
-        $packages = $this->getByOrderNos(data_get($orderHeaders,'*.orderno'));
-
+        $packages = $this->getByOrderNos(data_get($orderHeaders,'*.orderno'));          // 已有
         $this->createOrderPackage($orderHeaders,$orders,$packages);                     // 创建package
-        $del_ids = $this->deleteUnnecessaryPackage($orderHeaders,$packages);            // 删除package
 
-        $orderPackageCommodityService->deleteUnnecessaryOrderCommodities($del_ids);     // orderCommodity
+        $del_ids = $this->deleteUnnecessaryPackage($orderHeaders,$packages);     // 删除package
+        $orderPackageCommodityService->deleteUnnecessaryOrderCommodities($del_ids);     // 删除 orderCommodity
+
         $orderTracking = OrderTracking::query()->whereHas('commodities.package',function($query)use($del_ids){
             $query->whereIn('id',$del_ids);
         })->get();
@@ -436,8 +439,12 @@ class OrderPackageService
         }
 
         if(count($inner_params)>0){
-            $this->insert($inner_params);
-            LogService::log(__METHOD__,__FUNCTION__,'批量添加 OrderPackage '.count($inner_params).' || '.json_encode($inner_params));
+            try {
+                $bool = $this->insert($inner_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()));
+            }
         }
     }
     // TODO
@@ -458,6 +465,7 @@ class OrderPackageService
                 'logistic_number' => $logistic_number,
                 'created_at' => $date,
                 'updated_at' => $date,
+                'status' =>'无'
             ];
         }
         return $inner_params;
@@ -469,7 +477,7 @@ class OrderPackageService
          * @var DataHandlerService $dataHandlerService
          */
         $dataHandlerService = app(DataHandlerService::class);
-        $logistic_numbers = data_get($orderHeaders,'*.actAllocationDetails.picktotraceid');     // 获取picktotraceid (运单的快递单号)
+        $logistic_numbers = data_get($orderHeaders,'*.actAllocationDetails.*.picktotraceid');     // 获取picktotraceid (运单的快递单号)
         $logistic_numbers = array_unique($logistic_numbers);
         $logistic_numbers = array_diff($logistic_numbers,['',' ','*']);
 
@@ -479,15 +487,63 @@ class OrderPackageService
         $diff_number = array_diff($exits_number,$logistic_numbers);
         foreach ($diff_number as $number) {
             $package = $dataHandlerService->getKeyValue(['logistic_number'=>$number],$packages_maps);
-            if($package)$packages->push($package->id);
+            if($package ?? false)$packages->push($package->id);
         }
-        if(!$packages)return $packages;
+        if($packages->isEmpty())return $packages;
         try {
-            return OrderPackage::query()->whereIn('id', $packages)->delete() ? $packages : collect();
+            $bool = OrderPackage::query()->whereIn('id', $packages)->delete();
+            $bool ? LogService::log(__METHOD__,__FUNCTION__,'删除多余包裹 ids:'.json_encode($packages)) : null;
+            return $bool ? $packages : collect();
         } catch (\Exception $e) {
             LogService::log(__METHOD__,__FUNCTION__,'删除多余包裹 ids:'.json_encode($packages).$e->getMessage());
             return collect();
         }
     }
-
+    // TODO
+    public function createPackagesFromBatchCode($batchCode,$weight)
+    {
+        /**
+         * @var OrderService $orderService
+         */
+        $now = Carbon::now();
+        $orderService = app('OrderService');
+        $orderHeaders = 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.WaveNo',$batchCode)
+            ->get();
+        $orderService->syncOrder($orderHeaders);
+        $orders = Order::query()->with('packages')->whereIn('code',data_get($orderHeaders,'*.orderno'))->get();
+        $update_params = [[
+            'id','weight','weighed_at','status','batch_number'
+        ]];
+        foreach ($orderHeaders as $orderHeader) {
+            $order = $orders->where('code',$orderHeader->orderno)->first();
+            if(!$order){
+                app('LogService')->log(__METHOD__,"此包裹在WMS未找到order",json_encode($orderHeader),Auth::user()['id']);
+                continue;
+            }
+            $order->packages->each(function($package)use(&$update_params,$weight,$batchCode,$now){
+                $update_params[] = [
+                    'id' => $package->id,
+                    'weight' =>$weight,
+                    'weighed_at'=>$now,
+                    'status' =>"已上传",
+                    'batch_number' => $batchCode
+                ];
+            });
+        }
+        if(count($update_params)==1)return;
+        DB::transaction(function ()use($update_params){
+                $this->batchUpdate($update_params);
+        });
+        app('LogService')->log(__METHOD__,"批量录入包裹成功",json_encode($update_params),Auth::user()['id']);
+    }
 }

app/Services/OrderService.php

@@ -25,9 +25,17 @@ class OrderService
         return app(BatchUpdateService::class)->batchUpdate('orders',$params);
     }
 
-    public function insert($params){
-        app('LogService')->log(__METHOD__,__FUNCTION__,'批量创建 Order'.json_encode($params));
-        return Order::query()->insert($params);
+    public function insert(array $params){
+        if(!$params)return true;
+        if(count($params)==0) return true;
+        try {
+            $bool= Order::query()->insert($params);
+            app('LogService')->log(__METHOD__, __FUNCTION__, '批量创建 Order' . 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()));
+            return false;
+        }
     }
 
     private function preciseQuery(array $params,$sql){
@@ -754,15 +762,16 @@ class OrderService
     }
 
     // TODO
-    public function createOrderInfo(&$orderHeaders)
+    public function syncOrder(&$orderHeaders)
     {
         /** @var OrderPackageService $packageService */
         $packageService = app("OrderPackageService");
-        $this->createOrderByWMSOrderHeaders($orderHeaders);
-        $packageService->createPackageInfo($orderHeaders);
+        var_dump('syncOrderByWMSOrderHeaders',new Carbon());
+        $this->syncOrderByWMSOrderHeaders($orderHeaders);
+        $packageService->syncOrderPackage($orderHeaders);
     }
     // TODO
-    public function createOrderByWMSOrderHeaders(&$orderHeaders)
+    public function syncOrderByWMSOrderHeaders(&$orderHeaders)
     {
         if($orderHeaders->isEmpty())return [];
         /**
@@ -781,7 +790,6 @@ class OrderService
         $shops = $shopService->getByWmsOrders($orderHeaders);
         $warehouses = $warehouseService->getByWmsOrders($orderHeaders);
         $orders = $this->getByWmsOrders($orderHeaders);
-
         $created_params = $this->getCreateOrderModelsByWMSOrderHeaders($orderHeaders,$orders,$warehouses,$owners,$logistics,$shops); //3s
         $update_order = $this->getUpdateOrderModelByWMSOrderHeaders($orderHeaders,$orders,$warehouses,$owners,$logistics,$shops);
         // 转换插入 3s
@@ -800,7 +808,6 @@ class OrderService
         $update_params = [
             ['id','code','warehouse_id','owner_id','shop_id','logistic_id','consignee_name','consignee_phone','province','city','district','address','client_code','wms_status','created_at','updated_at','wms_edittime']
         ];
-
         $update_order->map(function ($item){
             return $item->toArray();
         })->each(function($item)use(&$update_params){
@@ -868,7 +875,6 @@ class OrderService
         $owner = $dataHandlerService->getKeyValue(['code'=>$orderHeader->customerid],$owner_map);
         $logistic = $dataHandlerService->getKeyValue(['code'=>$orderHeader->userdefine1],$logistic_map);
         $shop = $dataHandlerService->getKeyValue(['name'=>$orderHeader->issuepartyname,'owner_id'=>$owner->id??null],$shop_map);
-//        $date = (string)Carbon::now();
         return [
             'code'=>$orderHeader['orderno'],
             'warehouse_id' => $warehouse['id'] ?? null,
@@ -887,7 +893,6 @@ class OrderService
             'updated_at' => $date,
             'created_at' => $orderHeader['addtime']
         ];
-        // return  new Order(
     }
 
     /**
@@ -939,4 +944,80 @@ class OrderService
         }
     }
 
+    public function batchDeleteUnnecessaryOrder(){
+        $start_id = 0;
+        $step = 1000;
+        while(true){
+            $order_map = [];
+
+            $package_del = [];      $orderCommodities = [];         $bin = [];          $batch = [];            $order = [];
+            $package_update= [];    $orderCommodities_update= [];   $bin_update= [];    $batch_update= [];      $order_update = [];
+            $orders = Order::query()->with('packages.commodities','orderCommodities','bin','batch')->where('id','>',$start_id)->where('id','<',$start_id+$step)->get();
+            $this->getOrderMap($orders,$order_map);
+
+            if(count($order_map) == 0)continue;
+
+
+        }
+    }
+    // OrderPackages
+    public function batchDeleteUnnecessaryOrderPackages($order_map)
+    {
+        $packages = collect();
+        $del_packages= collect();
+        $update_packages = collect();
+        foreach ($order_map as $key =>$items) {
+            $orderPackage = null;
+            $items->packages->each(function($packages){
+
+            });
+        }
+    }
+    //  Batch
+    public function batchDeleteUnnecessaryBatch($order_map,&$batch_order_no_map)
+    {
+        foreach ($order_map as $items) {
+            collect($items)->each(function($order)use(&$batch_order_no_map){
+                $bin = $order->batch;
+                if($bin ?? false){
+                    $batch_order_no_map[$order->code][] = $bin;
+                }
+            });
+        }
+    }
+    // OrderCommodities
+    public function batchDeleteUnnecessaryOrderCommodities($order_map,&$orderCommodities_map)
+    {
+        foreach ($order_map as $items) {
+            collect($items)->each(function($order)use(&$orderCommodities_map){
+                $orderCommodities = $order->orderCommodities;
+                if($bin ?? false){
+                    $orderCommodities_map[$order->code][] = $orderCommodities;
+                }
+            });
+        }
+    }
+    // Bin
+    public function batchDeleteUnnecessaryBin($order_map,&$bin_order_no_map)
+    {
+        foreach ($order_map as $items) {
+            collect($items)->each(function($order)use(&$bin_order_no_map){
+                $bin = $order->bin;
+                if($bin ?? false){
+                    $bin_order_no_map[$order->code][] = $bin;
+                }
+            });
+        }
+    }
+
+    public function getOrderMap($orders,&$orderMap)
+    {
+        $orders->each(function($items,$key)use(&$orderMap){
+            // $items $order集合
+            if($items->count()>1){
+                $order_map[$key] = $items;  // 保留超过2个orders
+            }
+        });
+    }
+
 }

app/Services/common/DataHandlerService.php

@@ -75,7 +75,7 @@ class DataHandlerService
         return $mapKey;
     }
 
-    public function getKeyValue($keyValues,$data){
+    public function getKeyValue($keyValues,&$data){
          $mapkeys =  $data['mapkey'];
          $key = '';
          if(!$data){return null;}

resources/views/test.blade.php

@@ -3,10 +3,11 @@
 </head>
 
 <body>
-<form method="get" action="{{url('test/test1')}}">
-    <input name="test">
-    <button type="submit">提交</button>
-</form>
+{{phpinfo()}}
+{{--<form method="get" action="{{url('test/test1')}}">--}}
+{{--    <input name="test">--}}
+{{--    <button type="submit">提交</button>--}}
+{{--</form>--}}
 <script>
 </script>
 </body>

tests/Services/OrderPackageCommoditiesService/RegroupOrderCommoditiesTest/RegroupOrderCommoditiesTest.php → tests/Services/OrderPackageCommoditiesService/RegroupOrderCommoditiesTest.php

@@ -34,25 +34,27 @@ class RegroupOrderCommoditiesTest extends TestCase
         * createOrderPackage($orderHeaders,$orders,$packages)
         * */
         $carbon =Carbon::now()->subHours(10);
-        $date = '2020-09-18 18:13:50';
-        $orderHeaders = $this->orderHeaderService->getWMSOrderOnStartDate($carbon);
+        $date = '2020-06-18 18:13:50';
+        $orderHeaders = $this->orderHeaderService->getWMSOrderOnStartDate($date);
         if($orderHeaders->count()==0){
             var_dump('查询数据为空');
             return;
         }
+        $order_nos = Order::all()->map(function($order){
+            return $order->code;
+        });
+        dd(Order::all()->map(function($order){
+            return $order->created_at;
+        }));
+
         $order_nos = data_get($orderHeaders,'*.orderno');
         $order_commodities = OrderPackageCommodities::query()->with(['commodity','package.order'])->whereHas('package',function($query)use($order_nos){
             $query->whereHas('order',function ($query)use($order_nos){
                 $query->whereIn('code',$order_nos);
             });
-        })->sql();
-        $order_commodities = OrderPackageCommodities::query()->with(['commodity','package.order'])->whereHas('package.order',function($query)use($order_nos){
-            $query->whereIn('code',$order_nos);
         })->get();
+        $orders = Order::query()->whereIn('code',$order_nos)->get();
 
-        $package = OrderPackage::query()->with('order')->where('order',function($query)use($order_nos){
-            $query->whereIn('code',$order_nos);
-        })->sql();
 
         $order = Order::query()->whereIn('code',$order_nos)->sql();
         $params = $this->service->regroupOrderCommodities($order_commodities);

tests/Services/OrderPackageCommoditiesService/SyncOrderPackageCommoditiesTest.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Tests\Services\OrderPackageService\SyncOrderPackageCommoditiesTest;
+
+use App\Services\OracleDOCOrderHeaderService;
+use App\Services\OrderPackageCommoditiesService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Foundation\Testing\WithFaker;
+use Tests\TestCase;
+
+class SyncOrderPackageCommoditiesTest extends TestCase
+{
+    /**
+     * @var OrderPackageCommoditiesService $service
+     * @var OracleDOCOrderHeaderService $orderHeaderService
+     */
+    public $service;
+    public $orderHeaderService;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+        $this->service = app('OrderPackageCommoditiesService');
+        $this->orderHeaderService = app('OracleDocOrderHeaderService');
+    }
+
+    public function testExample()
+    {
+        $response = $this->get('/');
+
+        $response->assertStatus(200);
+    }
+}

tests/Services/OrderPackageService/CreatePackageInfoTest/CreatePackageInfoTest.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace Tests\Services\OrderPackageService\CreatePackageInfoTest;
-
-use App\Services\OracleDOCOrderHeaderService;
-use App\Services\OrderPackageService;
-use App\Services\OrderService;
-use Carbon\Carbon;
-use Illuminate\Foundation\Testing\RefreshDatabase;
-use Illuminate\Foundation\Testing\WithFaker;
-use Tests\TestCase;
-
-class CreatePackageInfoTest extends TestCase
-{
-    /**
-     * @var OrderPackageService $service
-     * @var OracleDOCOrderHeaderService $orderHeaderService
-     * @var OrderService $orderService
-     */
-    public $service;
-    public $orderService;
-    public $orderHeaderService;
-
-    public function setUp(): void
-    {
-        parent::setUp();
-        $this->service = app('OrderPackageService');
-        $this->orderService = app('OrderService');
-        $this->orderHeaderService = app('OracleDOCOrderHeaderService');
-    }
-
-    public function testCreatePackageInfo()
-    {
-        /**
-         * createPackageByOrderHeader($orderHeaders)
-         */
-
-        $carbon =Carbon::now()->subHours(10);
-        $date = '2020-09-18 18:13:50';
-        $orderHeaders = $this->orderHeaderService->getWMSOrderOnStartDate($carbon);
-        if ($orderHeaders->count() == 0) {
-            var_dump('查询数据为空');
-        }
-        $this->service->createPackageInfo($orderHeaders);
-    }
-}

tests/Services/OrderPackageService/CreateOrderPackageTest/CreateOrderPackageTest.php → tests/Services/OrderPackageService/SyncOrderPackageTest.php

@@ -1,8 +1,7 @@
 <?php
 
-namespace Tests\Services\OrderPackageService\CreateOrderPackageTest;
+namespace Tests\Services\OrderPackageService\SyncOrderPackageTest;
 
-use App\OracleDOCOrderHeader;
 use App\Services\OracleDOCOrderHeaderService;
 use App\Services\OrderPackageService;
 use App\Services\OrderService;
@@ -11,7 +10,7 @@ use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Foundation\Testing\WithFaker;
 use Tests\TestCase;
 
-class CreateOrderPackageTest extends TestCase
+class SyncOrderPackageTest extends TestCase
 {
     /**
      * @var OrderPackageService $service
@@ -29,12 +28,11 @@ class CreateOrderPackageTest extends TestCase
         $this->orderService = app('OrderService');
         $this->orderHeaderService = app('OracleDOCOrderHeaderService');
     }
-
-    public function testCreateOrderPackage()
+    public function testSyncOrderPackage()
     {
         /*
-         * createOrderPackage($orderHeaders,$orders,$packages)
-         * */
+       * createOrderPackage($orderHeaders,$orders,$packages)
+       * */
 
         $carbon =Carbon::now()->subHours(10);
         $date = '2020-09-18 18:13:50';
@@ -45,7 +43,7 @@ class CreateOrderPackageTest extends TestCase
         }
         $orders = $this->orderService->getByWmsOrders($orderHeaders);
         $packages = $this->service->getByWmsOrders($orderHeaders);
-        $this->service->createOrderPackage($orderHeaders,$orders,$packages);
+        $this->service->syncOrderPackage($orderHeaders,$orders,$packages);
         $exits_packages  = $this->service->getByWmsOrders($orderHeaders);
         $exits_count = $exits_packages->count();
         $logistic_numbers = data_get($orderHeaders,'*.actAllocationDetails.*.picktotraceid');
@@ -57,6 +55,4 @@ class CreateOrderPackageTest extends TestCase
             $this->assertEquals($exits_package->count(),1);
         }
     }
-
-
 }

tests/Services/OrderPackageService/CreatePackageByOrderHeaderTest/CreatePackageByOrderHeaderTest.php → tests/Services/OrderPackageService/SyncPackageByOrderHeadersTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Services\OrderPackageService\CreatePackageByOrderHeaderTest;
+namespace Tests\Services\OrderPackageService\SyncPackageByOrderHeadersTest;
 
 use App\Services\OracleDOCOrderHeaderService;
 use App\Services\OrderPackageService;
@@ -10,7 +10,7 @@ use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Foundation\Testing\WithFaker;
 use Tests\TestCase;
 
-class CreatePackageByOrderHeaderTest extends TestCase
+class SyncPackageByOrderHeadersTest extends TestCase
 {
     /**
      * @var OrderPackageService $service
@@ -28,23 +28,24 @@ class CreatePackageByOrderHeaderTest extends TestCase
         $this->orderService = app('OrderService');
         $this->orderHeaderService = app('OracleDOCOrderHeaderService');
     }
-    public function testCreatePackageByOrderHeader()
+    public function testSyncPackageByOrderHeaders()
     {
         /**
-         * createPackageByOrderHeader($orderHeaders)
+         * createOrDeletePackageByOrderHeader($orderHeaders)
          */
-        $carbon =Carbon::now()->subHours(10);
+        $carbon = Carbon::now()->subHours(10);
         $date = '2020-09-18 18:13:50';
         $orderHeaders = $this->orderHeaderService->getWMSOrderOnStartDate($carbon);
         if ($orderHeaders->count() == 0) {
             var_dump('查询数据为空');
             return;
         }
-        $this->service->createPackageByOrderHeader($orderHeaders);
+        $this->service->syncPackageByOrderHeaders($orderHeaders);
         $packages = $this->service->getByWmsOrders($orderHeaders);
-        $order_nos =  array_unique(data_get($orderHeaders,'*.actAllocationDetails.*.picktotraceid'));
+        $order_nos = array_unique(data_get($orderHeaders, '*.actAllocationDetails.*.picktotraceid'));
         foreach ($order_nos as $order_no) {
-            $this->assertNotEmpty($packages->where('logistic_number',$order_no));
+            $this->assertNotEmpty($packages->where('logistic_number', $order_no));
+
         }
     }
 }

tests/Services/OrderService/CreateOrderInfoTest/CreateOrderInfoTest.php

@@ -1,40 +0,0 @@
-<?php
-
-namespace Tests\Services\OrderService\CreateOrderInfoTest;
-
-use App\Services\OracleDOCOrderHeaderService;
-use App\Services\OrderService;
-use Carbon\Carbon;
-use Illuminate\Foundation\Testing\RefreshDatabase;
-use Illuminate\Foundation\Testing\WithFaker;
-use Tests\TestCase;
-
-class CreateOrderInfoTest extends TestCase
-{
-    /**
-     * @var OrderService $service
-     * @var OracleDOCOrderHeaderService $orderHeaderService
-     */
-    public $service;
-    public $orderHeaderService;
-    public function setUp(): void
-    {
-        parent::setUp();
-        $this->service=app('OrderService');
-        $this->orderHeaderService=app('OracleDOCOrderHeaderService');
-    }
-
-    public function testCreateOrderInfo()
-    {
-        $carbon =Carbon::now()->subHours(10);
-        $date = '2020-09-18 18:13:50';
-        $orderHeader = $this->orderHeaderService->getWMSOrderOnStartDate($carbon);
-        $order_models = $this->service->createOrderInfo($orderHeader);
-        $this->assertNotNull($order_models);
-//        var_dump($orderHeader->count());
-//        var_dump($order_models);
-        $order = $this->service->getByWmsOrders($orderHeader);
-        $this->assertNotNull($order);
-        $this->assertNotNull($orderHeader);
-    }
-}

tests/Services/OrderService/CreateOrderByWMSOrderHeadersTest/CreateOrderByWMSOrderHeadersTest.php → tests/Services/OrderService/SyncOrderByWMSOrderHeaderTest.php

@@ -1,9 +1,8 @@
 <?php
 
-namespace Tests\Services\OrderService\CreateOrderByWMSOrderHeadersTest;
+namespace Tests\Services\OrderService\SyncOrderByWMSOrderHeaderTest;
 
 use App\Logistic;
-use App\Order;
 use App\Owner;
 use App\Services\common\DataHandlerService;
 use App\Services\LogisticService;
@@ -19,7 +18,7 @@ use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Foundation\Testing\WithFaker;
 use Tests\TestCase;
 
-class CreateOrderByWMSOrderHeadersTest extends TestCase
+class SyncOrderByWMSOrderHeaderTest extends TestCase
 {
     /**
      * @var OrderService $service
@@ -43,24 +42,15 @@ class CreateOrderByWMSOrderHeadersTest extends TestCase
         $this->service=app(OrderService::class);
         $this->orderHeaderService=app(OracleDOCOrderHeaderService::class);
     }
-
-    public function testCreateOrderByWMSOrderHeaders()
+    public function testCreateOrUpdateOrderByWMSOrderHeaders()
     {
         $carbon =Carbon::now()->subHours(10);
         $date = '2020-09-18 18:13:50';
         $orderHeaders = $this->orderHeaderService->getWMSOrderOnStartDate($carbon);
-        $orders = $this->service->createOrderByWMSOrderHeaders($orderHeaders);
+        $this->service->syncOrderByWMSOrderHeaders($orderHeaders);
         $existOrders = $this->service->getByWmsOrders($orderHeaders);
         $collect =null;
-        if($existOrders->count()!==$orders->count()){
-            $collect = $existOrders->map(function($order)use($orders){
-                $_order = $orders->where($order->code)->first();
-                return $_order ?? $order;
-            });
-            $this->assertEquals($collect->count(),$orderHeaders->count());
-        }else{
-            $this->assertEquals($orderHeaders->counts(),$orders->count());
-        }
+
         foreach ($orderHeaders as $orderHeader) {
             $code = $orderHeader->orderno;
             $order = $collect->where('code',$code)->first();
@@ -95,24 +85,4 @@ class CreateOrderByWMSOrderHeadersTest extends TestCase
             $this->assertEquals((string)$order->created_at ,(string)$orderHeader->addtime);
         }
     }
-
-    /*
-            'code'                      => $orderHeader->orderno,
-            'warehouse_id'              => $warehouse->id ?? null,
-            'owner_id'                  => $owner->id ?? null,
-            'shop_id'                   => $shop->id ?? null,
-            'logistic_id'               => $logistic->id ?? null,
-            'consignee_name'            => $orderHeader->c_contact,
-            'consignee_phone'           => empty($orderHeader->c_tel2)?$orderHeader->c_tel1:$orderHeader->c_tel2,
-            'province'                  => $orderHeader->c_province,
-            'city'                      => $orderHeader->c_city,
-            'district'                  => $orderHeader->c_district,
-            'address'                   => $orderHeader->c_address1,
-            'client_code'               => $orderHeader->soreference1,
-            'wms_edittime'              => $orderHeader->edittime,
-            'wms_status'                => $orderHeader->oracleBASCode_codename_c ?? '',
-            'updated_at'                => (string)$date,
-            'created_at'                => $orderHeader->addtime,
-        ]);*/
-
 }

tests/Services/OrderService/SyncOrderTest.php

@@ -0,0 +1,77 @@
+<?php
+
+namespace Tests\Services\OrderService\SyncOrderTest;
+
+use App\Logistic;
+use App\Owner;
+use App\Services\common\DataHandlerService;
+use App\Services\LogisticService;
+use App\OracleDOCOrderHeader;
+use App\Services\OracleDOCOrderHeaderService;
+use App\Services\OrderService;
+use App\Services\OwnerService;
+use App\Services\ShopService;
+use App\Services\WarehouseService;
+use App\Shop;
+use App\Warehouse;
+use Carbon\Carbon;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Foundation\Testing\WithFaker;
+use Tests\TestCase;
+
+class SyncOrderTest extends TestCase
+{
+    /**
+     * @var OrderService $service
+     * @var OracleDOCOrderHeaderService $orderHeaderService
+     * @var DataHandlerService $dataHandlerService
+     * @var OwnerService $ownerService
+     * @var LogisticService $logisticService
+     * @var ShopService $shopService
+     * @var WarehouseService $warehouseService
+     */
+    public $service;
+    public $orderHeaderService;
+    public $dataHandlerService;
+    public $ownerService;
+    public $logisticService;
+    public $shopService;
+    public $warehouseService;
+    public function setUp(): void
+    {
+        parent::setUp();
+        $this->service=app(OrderService::class);
+        $this->orderHeaderService=app(OracleDOCOrderHeaderService::class);
+    }
+    public function testCreateOrUpdateOrderInfo()
+    {
+        $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');
+            },'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_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);
+    }
+}