包裹商品信息提交

app/Services/OrderPackageCommoditiesService.php

@@ -542,6 +542,8 @@ class OrderPackageCommoditiesService
         foreach ($orderHeaders as $orderHeader) {
             $order_no = $orderHeader->orderno;
             $actAllocationDetails = $orderHeader->actAllocationDetails ?? [];
+            $logistic_number = null;
+            if (in_array($orderHeader['userdefine1'],['WPSFSY', 'JDKD'])) $logistic_number= $orderHeader['soreference5'];
             if($orderHeader['sostatus'] == '90'){
                 $logistic_number = $orderHeader['soreference5'];
                 if($logistic_number == '' ) $logistic_number= $orderHeader['orderno'];
@@ -562,8 +564,8 @@ class OrderPackageCommoditiesService
                     }
                 });
             }else{
-                $actAllocationDetails->each(function($item)use(&$params,$order_no){
-                    $logistic_number = $item->picktotraceid;
+                $actAllocationDetails->each(function($item)use(&$params,$order_no,$logistic_number){
+                    $logistic_number = $logistic_number ?? $item->picktotraceid;
                     $sku = $item->sku;
                     $key = ' orderno='.$order_no.' logsitic_number='.$logistic_number.' sku='.$sku.' ';
                     if(isset($params[$key])){
@@ -571,7 +573,7 @@ class OrderPackageCommoditiesService
                     }else{
                         $params[$key] = [
                             'orderno'=>$item->orderno,
-                            'logistic_number'=>$item->picktotraceid,
+                            'logistic_number'=>$logistic_number,
                             'sku' => $sku,
                             'amount' => $item->qty_each,
                             'owner_code' => $item->customerid