Revert "修改订单同步策略 取消订单也能同步上来"

This reverts commit 42406d72

app/Http/Controllers/OrderIssueController.php

@@ -171,7 +171,7 @@ class OrderIssueController extends Controller
         $orderIssueService = app(OrderIssueService::class);
         $exits_orderNos = $orderIssueService->校验问题件是否存在_WMS订单号_返回存在的订单号($request->input('orderNos'));
         $count = OracleDOCOrderHeader::query()->with('oracleBASCode')->whereIn('OrderNo',$request['orderNos'])->whereHas('oracleBASCode',function($query){
-            $query->whereNotIn('codename_c',['完全装箱','订单完成','完全发运','分配完成','订单取消']);
+            $query->whereNotIn('codename_c',['完全装箱','订单完成','完全发运','分配完成']);
         })->count();
         if($count>0)return ['success'=>false,'fail_info'=>'勾选的订单中有没有完成的订单，请取消勾选'];
         if(count($exits_orderNos)>0){

app/Services/OrderPackageCommoditiesService.php

@@ -509,42 +509,22 @@ class OrderPackageCommoditiesService
         foreach ($orderHeaders as $orderHeader) {
             $order_no = $orderHeader->orderno;
             $actAllocationDetails = $orderHeader->actAllocationDetails ?? [];
-            if(count($actAllocationDetails) > 0){
-                $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;
-                    }else{
-                        $params[$key] = [
-                            'orderno'=>$item->orderno,
-                            'logistic_number'=>$item->picktotraceid,
-                            'sku' => $sku,
-                            'amount' => $item->qty_each,
-                            'owner_code' => $item->customerid
-                        ];
-                    }
-                });
-            }else{
-                $orderHeader->oracleDOCOrderDetails->each(function($item)use(&$params,$order_no,$orderHeader){
-                    $logistic_number = $orderHeader->soreference5 ?? $orderHeader->orderno;
-                    $sku = $item->sku;
-                    $key = ' orderno='.$order_no.' logsitic_number='.$logistic_number.' sku='.$sku.' ';
-                    if(isset($params[$key])){
-                        $params[$key]['amount']+= $item->qty_each;
-                    }else{
-                        $params[$key] = [
-                            'orderno'=>$item->orderno,
-                            'logistic_number'=>$logistic_number,
-                            'sku' => $sku,
-                            'amount' => $item->QtyOrdered,
-                            'owner_code' => $item->customerid
-                        ];
-                    }
-                });
-            }
-
+            $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;
+                }else{
+                    $params[$key] = [
+                        'orderno'=>$item->orderno,
+                        'logistic_number'=>$item->picktotraceid,
+                        'sku' => $sku,
+                        'amount' => $item->qty_each,
+                        'owner_code' => $item->customerid
+                    ];
+                }
+            });
         }
         return $params;
     }

app/Services/OrderPackageService.php

@@ -172,15 +172,6 @@ class OrderPackageService
                 'status' =>'无'
             ];
         }
-        if(count($logistic_numbers) == 0){
-            $inner_params[] = [
-                'order_id' => $order->id,
-                'logistic_number' => $orderHeader->soreference5 ?? $orderHeader->orderno,
-                'created_at' => $date,
-                'updated_at' => $date,
-                'status' =>'无'
-            ];
-        }
         return $inner_params;
     }
 
@@ -193,17 +184,7 @@ class OrderPackageService
          */
         $dataHandlerService = app(DataHandlerService::class);
         $orderPackageCommoditiesService = app('OrderPackageCommoditiesService');
-        $logistic_numbers = [];
-        foreach ($orderHeaders as $orderHeader) {
-            if(!$orderHeader->actAllocationDetails){
-                $logistic_numbers[] = $orderHeader->soreference5;
-            }else{
-                foreach ($orderHeader->actAllocationDetails as $actAllocationDetail) {
-                    $logistic_numbers[] = $actAllocationDetail->picktotraceid;
-               }
-            }
-        }
-        //$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,['',' ','*']);
         $packages_maps = $dataHandlerService->dataHeader(['logistic_number'],$packages);

resources/views/order/index/delivering.blade.php

@@ -653,7 +653,7 @@
                     let _this = this;
                     this.orders.forEach(function(item){
                         if(!_this.checkData.includes(item.orderno))return;
-                        if(!['完全装箱','订单完成','完全发运','分配完成','订单取消'].includes(item.ordercodename)){console.log(item.ordercodename);
+                        if(!['完全装箱','订单完成','完全发运','分配完成'].includes(item.ordercodename)){console.log(item.ordercodename);
                             tempTip.setDuration(2000);
                             tempTip.show('勾选的订单中有没有完成的订单，请取消勾选');
                             bool = true;