追踪件订单号 逻辑修改

app/Services/OracleDOCOrderHeaderService.php

@@ -34,7 +34,7 @@ Class OracleDOCOrderHeaderService
             },'oracleDOCOrderDetails'=>function($query){
                 $query->selectRaw('doc_order_details.orderNo,doc_order_details.customerid,doc_order_details.sku,doc_order_details.QtyOrdered,doc_order_details.Location,doc_order_details.OrderLineNo,doc_order_details.d_edi_03');
             }, '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,ACT_Allocation_Details.Location,ACT_Allocation_Details.SkuLineNo');
+                $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,ACT_Allocation_Details.Location,ACT_Allocation_Details.SkuLineNo,ACT_Allocation_Details.OrderLineno');
             },'oracleBASCode'=>function($query){
                 $query->selectRaw('BAS_Codes.CodeID,BAS_Codes.CodeName_C,BAS_Codes.Code');
             },'orderType'=>function($query){

app/Services/OrderTrackingService.php

@@ -259,17 +259,17 @@ class OrderTrackingService
     }
 
     public function get_d_edit_03($orderHeader,$orderPackageCommodity){
-        $sku_line_no = null;
+        $orderLineno = null;
         foreach ($orderHeader->actAllocationDetails as $actAllocationDetail) {
             if($actAllocationDetail->picktotraceid == $orderPackageCommodity->package->logistic_number
                 && $orderPackageCommodity->commodity->sku ==  $actAllocationDetail->sku){
-                $sku_line_no = $actAllocationDetail->skulineno;
+                $orderLineno = $actAllocationDetail->orderlineno;
                 break;
             }
         }
-        if($sku_line_no==null)return null;
+        if($orderLineno==null)return null;
         foreach ($orderHeader->oracleDOCOrderDetails as $oracleDOCOrderDetail) {
-            if($oracleDOCOrderDetail->orderlineno == $sku_line_no) {
+            if($oracleDOCOrderDetail->orderlineno == $orderLineno) {
                 return $oracleDOCOrderDetail['d_edi_03'];
             }
         }