体积修改

app/Http/Controllers/TestController.php

@@ -488,86 +488,86 @@ class TestController extends Controller
         $trackings->each(function ($tracking){
             $package = $tracking->commodities->package;
             $bulk = $package->bulk;
-            if($bulk>=1000){
+            if($bulk>=1000000){
                 $bulk = bcdiv($bulk,1000000000,3);
-                $package->update(['bulk'=>$bulk]);
+                OrderPackage::query()->where('id',$package->id)->update(['bulk'=>$bulk]);
             }
         });
     }
 
-    public function test3()
-    {
-//        dd(bcmul(0.3,0.3,5));
-        $logistic = Logistic::query()->where('code','XJWL')->first();
-        if(!$logistic){
-            Logistic::query()->create(['code'=>'XJWL','name'=>'新杰物流']);
-        }
-
-        /** @var DataHandlerService $dataHandlerService */
-        $dataHandlerService = app(DataHandlerService::class);
-        /** @var OrderTrackingService $orderTrackingService */
-        $orderTrackingService  = app('orderTrackingService');
-        /** @var OrderService $orderSerivce */
-        $orderService = app(OrderService::class);
-        /** @var OracleDOCOrderHeaderService $orderHeaderService */
-        $orderHeaderService = app(OracleDOCOrderHeaderService::class);
-        /** @var OracleDOCOrderHeader $orderHeaders */
-//        $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-08-26 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)
-            ->whereIn('customerID',data_get($owners,'*.code'))
-            ->get();
-
-//        $orderHeaders = app(OracleDOCOrderHeaderService::class)->getWmsOrderOnStartDateCreate($startData);
-        $orderService->createByWmsOrder($orderHeaders);
-        $orderTrackingService->createByWmsOrderHeader($orderHeaders);
-        $orderService->updateByWmsOrders($orderHeaders);
-        $orderTrackingService->updateByWmsOrderHeaders($orderHeaders);
-
-    }
+//    public function test3()
+//    {
+////        dd(bcmul(0.3,0.3,5));
+//        $logistic = Logistic::query()->where('code','XJWL')->first();
+//        if(!$logistic){
+//            Logistic::query()->create(['code'=>'XJWL','name'=>'新杰物流']);
+//        }
+//
+//        /** @var DataHandlerService $dataHandlerService */
+//        $dataHandlerService = app(DataHandlerService::class);
+//        /** @var OrderTrackingService $orderTrackingService */
+//        $orderTrackingService  = app('orderTrackingService');
+//        /** @var OrderService $orderSerivce */
+//        $orderService = app(OrderService::class);
+//        /** @var OracleDOCOrderHeaderService $orderHeaderService */
+//        $orderHeaderService = app(OracleDOCOrderHeaderService::class);
+//        /** @var OracleDOCOrderHeader $orderHeaders */
+////        $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-08-26 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)
+//            ->whereIn('customerID',data_get($owners,'*.code'))
+//            ->get();
+//
+////        $orderHeaders = app(OracleDOCOrderHeaderService::class)->getWmsOrderOnStartDateCreate($startData);
+//        $orderService->createByWmsOrder($orderHeaders);
+//        $orderTrackingService->createByWmsOrderHeader($orderHeaders);
+//        $orderService->updateByWmsOrders($orderHeaders);
+//        $orderTrackingService->updateByWmsOrderHeaders($orderHeaders);
+//
+//    }
 
-    public function syncWmsOrder(){
-        $startDate = \Illuminate\Support\Carbon::parse('2020-09-19 00:00:00')->toDateTimeString();
-        /** @var OrderTrackingService $orderTrackingService */
-        $orderTrackingService  = app('orderTrackingService');
-        $orderTrackingService->trackingWmsOrder($startDate);
-    }
+//    public function syncWmsOrder(){
+//        $startDate = \Illuminate\Support\Carbon::parse('2020-09-19 00:00:00')->toDateTimeString();
+//        /** @var OrderTrackingService $orderTrackingService */
+//        $orderTrackingService  = app('orderTrackingService');
+//        $orderTrackingService->trackingWmsOrder($startDate);
+//    }
 
-    public function updateOrderPackingCommodity(){
-        /** @var OrderTrackingService  $orderTrackingService */
-        $orderTrackingService =  app(OrderTrackingService::class);
-        /** @var OrderPackageCommoditiesService  $orderPackageCommoditiesService */
-        $orderPackageCommoditiesService =  app(OrderPackageCommoditiesService::class);
-
-        $orderTrackings = OrderTracking::query()->with('commodities.package.order')->get();
-        $orderNo = data_get($orderTrackings,'*.commodities.package.order.code');
-        $order_packages = OrderPackage::query()->with('order')->whereHas('order',function($query) use($orderNo){
-            $query->whereIn('code',$orderNo);
-        })->get();
-
-        $id = data_get($order_packages,'*.id');
-        $list =  OrderPackageCommodities::query()->whereIn('order_package_id',$id)->get();
-//        dd(data_get($list,'*.id'),data_get($orderTrackings,'*.id'));
-        $count1 = OrderPackageCommodities::destroy(data_get($list,'*.id'));
-        $count2 = OrderTracking::destroy(data_get($orderTrackings,'*.id'));
-        $orderHeaders = OracleDOCOrderHeader::query()->whereIn('orderno',$orderNo)->get();
-        $order_packages =  app(OrderPackageService::class)->getByWmsOrders($orderHeaders);
-        $owners =  app(OwnerService::class)->getByWmsOrders($orderHeaders);
-        $commodities =  app(CommodityService::class)->getByWmsOrders($orderHeaders);
-        $owner_code_map=[];
-        foreach ($owners as $owner) {
-            $owner_code_map[$owner->code] = $owner;
-        }
-//        $orderService->createByWmsOrder($orderHeaders);
-        $orderPackageCommoditiesService->createByWmsOrder($orderHeaders,$order_packages,$owner_code_map,$commodities);
-        $orderTrackingService->createByWmsOrderHeader($orderHeaders);
-    }
+//    public function updateOrderPackingCommodity(){
+//        /** @var OrderTrackingService  $orderTrackingService */
+//        $orderTrackingService =  app(OrderTrackingService::class);
+//        /** @var OrderPackageCommoditiesService  $orderPackageCommoditiesService */
+//        $orderPackageCommoditiesService =  app(OrderPackageCommoditiesService::class);
+//
+//        $orderTrackings = OrderTracking::query()->with('commodities.package.order')->get();
+//        $orderNo = data_get($orderTrackings,'*.commodities.package.order.code');
+//        $order_packages = OrderPackage::query()->with('order')->whereHas('order',function($query) use($orderNo){
+//            $query->whereIn('code',$orderNo);
+//        })->get();
+//
+//        $id = data_get($order_packages,'*.id');
+//        $list =  OrderPackageCommodities::query()->whereIn('order_package_id',$id)->get();
+////        dd(data_get($list,'*.id'),data_get($orderTrackings,'*.id'));
+//        $count1 = OrderPackageCommodities::destroy(data_get($list,'*.id'));
+//        $count2 = OrderTracking::destroy(data_get($orderTrackings,'*.id'));
+//        $orderHeaders = OracleDOCOrderHeader::query()->whereIn('orderno',$orderNo)->get();
+//        $order_packages =  app(OrderPackageService::class)->getByWmsOrders($orderHeaders);
+//        $owners =  app(OwnerService::class)->getByWmsOrders($orderHeaders);
+//        $commodities =  app(CommodityService::class)->getByWmsOrders($orderHeaders);
+//        $owner_code_map=[];
+//        foreach ($owners as $owner) {
+//            $owner_code_map[$owner->code] = $owner;
+//        }
+////        $orderService->createByWmsOrder($orderHeaders);
+//        $orderPackageCommoditiesService->createByWmsOrder($orderHeaders,$order_packages,$owner_code_map,$commodities);
+//        $orderTrackingService->createByWmsOrderHeader($orderHeaders);
+//    }
 
 //    public function orderTrckingOwnerAll(){
 //        $owners = Owner::all();

app/Services/OrderPackageService.php

@@ -452,7 +452,7 @@ class OrderPackageService
                 $bulk = bcmul($commodity['length'],$commodity['width'],5);
                 $bulk = bcmul($commodity['height'],$bulk,5);
                 $bulk = bcmul($bulk,$orderPackageCommodity->amount,5);
-                if($bulk>=1000)bcdiv($bulk,1000000000,3);
+                if($bulk>=1000000)bcdiv($bulk,1000000000,3);
                 $params['bulk'] +=  $bulk;
             }
             if($params['bulk'] == $orderPackage->bulk && $orderPackage->bulk!= 0){continue;}