合并

app/Console/Commands/WASSyncWMSOrderInformation.php

@@ -47,24 +47,24 @@ class WASSyncWMSOrderInformation extends Command
 
     public function WasSyncWmsOrder(){
 
-//        /** @var OrderTrackingService $orderTrackingService */
-//        $orderTrackingService  = app('orderTrackingService');
-//
-//        $dataInterval = intval(data_get(config('sync'), 'order_tracking_import.interval')) * 60 + 5;
-//
-//        $startDate = Carbon::now()->subSeconds($dataInterval);
-//
-//        $syncStartDate = data_get(config('sync'), 'order_tracking_import.start_at');
-//
-//        if($syncStartDate ?? false){
-//            $syncStartDate = Carbon::parse($syncStartDate);
-//            if ($startDate->lt($syncStartDate)) {
-//                $startDate = $syncStartDate;
-//            }
-//        }
-//
-////        $startDate = Carbon::parse('2020-05-06 13:16:51')->toDateTimeString();
-////        $orderTrackingService->根据设置从WMS同步追踪货主的订单($startDate);
-//        $orderTrackingService->trackingWmsOrder($startDate);
+        /** @var OrderTrackingService $orderTrackingService */
+        $orderTrackingService  = app('orderTrackingService');
+
+        $dataInterval = intval(data_get(config('sync'), 'order_tracking_import.interval')) * 60 + 5;
+
+        $startDate = Carbon::now()->subSeconds($dataInterval);
+
+        $syncStartDate = data_get(config('sync'), 'order_tracking_import.start_at');
+
+        if($syncStartDate ?? false){
+            $syncStartDate = Carbon::parse($syncStartDate);
+            if ($startDate->lt($syncStartDate)) {
+                $startDate = $syncStartDate;
+            }
+        }
+
+//        $startDate = Carbon::parse('2020-05-06 13:16:51')->toDateTimeString();
+//        $orderTrackingService->根据设置从WMS同步追踪货主的订单($startDate);
+        $orderTrackingService->trackingWmsOrder($startDate);
     }
 }

app/Http/Controllers/TestController.php

@@ -516,12 +516,12 @@ class TestController extends Controller
 //        $startDate = \Illuminate\Support\Carbon::parse('2020-05-06 13:16:51')->toDateTimeString();
         //$orderTrackingService->trackingWmsOrder($startDate);
         $owners = app(OrderTrackingOwnerService::class)->getTrackingOrderOwner();
-        $startDate = \Illuminate\Support\Carbon::parse('2020-09-15 00:00:00')->toDateTimeString();
+        $startDate = \Illuminate\Support\Carbon::parse('2020-09-25 00:00:00')->toDateTimeString();
         $endData = \Illuminate\Support\Carbon::parse('2020-09-26 00:00:00')->toDateTimeString();
         $orderHeaders = OracleDOCOrderHeader::query()
             ->with(['oracleDOCOrderDetails', 'actAllocationDetails','oracleBASCode'])
             ->where('addTime','>=',$startDate)
-            ->where('addTime','<=',$endData)
+//            ->where('addTime','<=',$endData)
             ->whereIn('customerID',data_get($owners,'*.code'))
             ->get();
 
@@ -532,6 +532,20 @@ class TestController extends Controller
         $orderTrackingService->updateByWmsOrderHeaders($orderHeaders);
 
     }
+    public function test4()
+    {
+
+        $owners = app(OrderTrackingOwnerService::class)->getTrackingOrderOwner();
+        $startDate = \Illuminate\Support\Carbon::parse('2020-09-25 00:00:00')->toDateTimeString();
+        $orderHeaders = OracleDOCOrderHeader::query()
+            ->with(['oracleDOCOrderDetails', 'actAllocationDetails','oracleBASCode'])
+            ->where('addTime','>=',$startDate)
+//            ->where('addTime','<=',$endData)
+            ->whereIn('customerID',data_get($owners,'*.code'))
+            ->get();
+        dd($orderHeaders);
+
+    }
 
 //    public function syncWmsOrder(){
 //        $startDate = \Illuminate\Support\Carbon::parse('2020-09-19 00:00:00')->toDateTimeString();

app/Services/OrderPackageService.php

@@ -265,8 +265,10 @@ class OrderPackageService
                     if($commodity['weight'] == 0  || !$commodity['bulk'] == 0 ){
                         array_push($noAttributeCommodity,$commodity);
                     }
-                    $updateArr['weight'] += bcmul($commodity['weight'], $packageCommodity['amount'],5);
-                    $updateArr['bulk'] += bcmul($commodity['bulk'], $packageCommodity['amount'],5);
+//                    $updateArr['weight'] += bcmul($commodity['weight'], $packageCommodity['amount'],5);
+//                    $updateArr['bulk'] += bcmul($commodity['bulk'], $packageCommodity['amount'],5);
+//                    $updateArr['weight'] += round($commodity['weight']*$packageCommodity['amount'],5);
+                    $updateArr['bulk'] += round($commodity['bulk']*$packageCommodity['amount'],5);
                     //$updateArr['weight'] +=(intval($commodity['weight'] ?? 0) )  * ( intval($packageCommodity['amount'] ?? 0) );
                     //$updateArr['bulk'] += (intval($commodity['bulk']  ?? 0)) * (intval($packageCommodity['amount'] ?? 0) );
                 }
@@ -449,9 +451,12 @@ class OrderPackageService
                 if(!$commodity['length'] || !$commodity['width'] || !$commodity['height']){
                     continue;
                 }
-                $bulk = bcmul($commodity['length'],$commodity['width'],5);
-                $bulk = bcmul($commodity['height'],$bulk,5);
-                $bulk = bcmul($bulk,$orderPackageCommodity->amount,5);
+//                $bulk = bcmul($commodity['length'],$commodity['width'],5);
+//                $bulk = bcmul($commodity['height'],$bulk,5);
+//                $bulk = bcmul($bulk,$orderPackageCommodity->amount,5);
+                $bulk = round($commodity['length']*$commodity['width'],5);
+                $bulk = round($commodity['height']*$bulk,5);
+                $bulk = round($bulk*$orderPackageCommodity->amount,5);
                 if($bulk>=1000000)bcdiv($bulk,1000000000,3);
                 $params['bulk'] +=  $bulk;
             }