问题追踪件 [orderTrckingService orders为空的判断]

app/Services/OrderService.php

@@ -394,8 +394,6 @@ class OrderService
         /** @var OracleDOCOrderHeaderService $oracleDOCOrderHeaderService */
         $oracleDOCOrderHeaderService = app('oracleDOCOrderHeaderService');
         $orderHeadersResult = $oracleDOCOrderHeaderService->根据时间获取在这段时间内创建的WMS订单($startDate);
-
-//        LogService::log('111','111',json_encode($orderHeadersResult));
         if ($orderHeadersResult->count() == 0) {
             return null;
         }
@@ -404,7 +402,7 @@ class OrderService
         $oracleDOCOrderDetails = [];
         $actAllocationDetails = [];
 
-        foreach ($orderHeadersResult as $orderHeader) {
+        foreach ($orderHeadersResult as $key=>$orderHeader) {
             $orderHeaders_map[$orderHeader['orderno']] = $orderHeader;
             $oracleDOCOrderDetails[$orderHeader['orderno']] = $orderHeader['oracleDOCOrderDetails'];
             $details = $orderHeader['actAllocationDetails'];
@@ -423,9 +421,8 @@ class OrderService
                 }
                 $actAllocationDetails[$picktotraceid][] =$detail;
             }
+            unset($orderHeadersResult[$key]);
         }
-        unset($orderHeadersResult);
-
         return $this->根据WMS订单生成WAS订单($orderHeaders_map, $oracleDOCOrderDetails, $actAllocationDetails);
     }
 

app/Services/OrderTrackingService.php

@@ -141,6 +141,12 @@ class OrderTrackingService
         $orderPackageCommodities = [];
         $ordersList = [];
         $fillables = [];
+        if($orders == null){
+            return;
+        }else if($orderHeaders == null){
+            return ;
+        }
+
         foreach ($orders as $order) {
             $ordersList[$order['id']] = $order;
             foreach ($order['packages'] as $packages) {

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

@@ -84,7 +84,7 @@
                         <td>@{{ trackOrder.orderClientCode }}</td>
                         <td>
                             @can('订单管理-跟踪-仓库编辑')
-                                <button class="btn btn-sm btn-outline-secondary" @click="displayInput($event)">@{{ trackOrder.web_order_number ?  trackOrder.web_order_number : '点击编辑' }}</button>
+                                <button class="btn btn-sm btn-outline-secondary border-50" @click="displayInput($event)">@{{ trackOrder.web_order_number ?  trackOrder.web_order_number : '点击编辑' }}</button>
                                 <input class="form-control d-none"  @keyup.enter="warehouseUpdate($event,'web_order_number')" :value="trackOrder.web_order_number"  :data_value="trackOrder.id" @blur="hideInput($event)">
                             @else
                                 @{{ trackOrder.web_order_number }}
@@ -92,7 +92,7 @@
                         </td>
                         <td>
                             @can('订单管理-跟踪-仓库编辑')
-                                <button class="btn btn-sm btn-outline-secondary" @click="displayInput($event)">@{{ trackOrder.pick_up_at ? trackOrder.pick_up_at :'点击编辑' }}</button>
+                                <button class="btn btn-sm btn-outline-secondary border-50" @click="displayInput($event)">@{{ trackOrder.pick_up_at ? trackOrder.pick_up_at :'点击编辑' }}</button>
                                 <input class="form-control d-none" type="date"  @keyup.enter="warehouseUpdate($event,'pick_up_at')"  :value="trackOrder.pick_up_at" :data_value="trackOrder.id" @blur="hideInput($event)">
                             @else
                                 @{{ trackOrder.pick_up_at }}
@@ -100,7 +100,7 @@
                         </td>
                         <td>
                             @can('订单管理-跟踪-仓库编辑')
-                                <button class="btn btn-sm btn-outline-secondary" @click="displayInput($event)">@{{ trackOrder.sale ? trackOrder.sale:'点击编辑' }}</button>
+                                <button class="btn btn-sm btn-outline-secondary border-50" @click="displayInput($event)">@{{ trackOrder.sale ? trackOrder.sale:'点击编辑' }}</button>
                                 <input class="form-control d-none"  @keyup.enter="warehouseUpdate($event,'sale')"  :value="trackOrder.sale" :data_value="trackOrder.id" @blur="hideInput($event)">
                             @else
                                 @{{ trackOrder.sale }}
@@ -108,7 +108,7 @@
                         </td>
                         <td>
                             @can('订单管理-跟踪-仓库编辑')
-                                <button class="btn btn-sm btn-outline-secondary" @click="displayInput($event)">@{{ trackOrder.client  ? trackOrder.client:'点击编辑'}}</button>
+                                <button class="btn btn-sm btn-outline-secondary border-50" @click="displayInput($event)">@{{ trackOrder.client  ? trackOrder.client:'点击编辑'}}</button>
                                 <input class="form-control d-none"  @keyup.enter="warehouseUpdate($event,'client')"  :value="trackOrder.client" :data_value="trackOrder.id" @blur="hideInput($event)">
                             @else
                                 @{{ trackOrder.client }}
@@ -119,7 +119,7 @@
                         <td>@{{ trackOrder.sku.skuAmount }}</td>
                         <td>
                             @can('订单管理-跟踪-仓库编辑')
-                                <button class="btn btn-sm btn-outline-secondary" @click="displayInput($event)">@{{ trackOrder.order_remark ? trackOrder.order_remark:'点击编辑' }}</button>
+                                <button class="btn btn-sm btn-outline-secondary border-50" @click="displayInput($event)">@{{ trackOrder.order_remark ? trackOrder.order_remark:'点击编辑' }}</button>
                                 <textarea class="form-control d-none"  @keyup.enter="warehouseUpdate($event,'order_remark')"  :value="trackOrder.order_remark" :data_value="trackOrder.id" @blur="hideInput($event)"></textarea>
                             @else
                                 @{{ trackOrder.client }}
@@ -129,7 +129,7 @@
                         <td>@{{ trackOrder.packageBulk }}</td>
                         <td>
                             @can('订单管理-跟踪-仓库编辑')
-                                <button class="btn btn-sm btn-outline-secondary" @click="displayInput($event)">@{{ trackOrder.pallet_total ? trackOrder.pallet_total:'点击编辑' }}</button>
+                                <button class="btn btn-sm btn-outline-secondary border-50" @click="displayInput($event)">@{{ trackOrder.pallet_total ? trackOrder.pallet_total:'点击编辑' }}</button>
                                 <input class="form-control d-none" type="number"  @keyup.enter="warehouseUpdate($event,'pallet_total')" :value="trackOrder.pallet_total" :data_value="trackOrder.id" @blur="hideInput($event)">
                             @else
                                 @{{ trackOrder.pallet_total }}
@@ -141,7 +141,7 @@
 
                         <td>
                             @can('订单管理-跟踪-物流公司编辑')
-                                <button class="btn btn-sm btn-outline-secondary" @click="displayInput($event)">@{{ trackOrder.planning_sent_at ? trackOrder.planning_sent_at:'点击编辑' }}</button>
+                                <button class="btn btn-sm btn-outline-secondary border-50" @click="displayInput($event)">@{{ trackOrder.planning_sent_at ? trackOrder.planning_sent_at:'点击编辑' }}</button>
                                 <input class="form-control d-none" type="date"  @keyup.enter="logisticUpdate($event,'planning_sent_at')"  :value="trackOrder.planning_sent_at" :data_value="trackOrder.id" @blur="hideInput($event)">
                             @else
                                 @{{ trackOrder.planning_sent_at }}
@@ -149,7 +149,7 @@
                         </td>
                         <td>
                             @can('订单管理-跟踪-物流公司编辑')
-                                <button class="btn btn-sm btn-outline-secondary" @click="displayInput($event)">@{{ trackOrder.is_on_duty_shift ? trackOrder.is_on_duty_shift :'点击编辑'}}</button>
+                                <button class="btn btn-sm btn-outline-secondary border-50" @click="displayInput($event)">@{{ trackOrder.is_on_duty_shift ? trackOrder.is_on_duty_shift :'点击编辑'}}</button>
                                 <input class="form-control d-none"  @keyup.enter="logisticUpdate($event,'is_on_duty_shift')"  :value="trackOrder.is_on_duty_shift" :data_value="trackOrder.id" @blur="hideInput($event)">
                             @else
                                 @{{ trackOrder.is_on_duty_shift }}
@@ -157,7 +157,7 @@
                         </td>
                         <td>
                             @can('订单管理-跟踪-物流公司编辑')
-                                <button class="btn btn-sm btn-outline-secondary" @click="displayInput($event)">@{{ trackOrder.is_arrival ? trackOrder.is_arrival : '点击编辑' }}</button>
+                                <button class="btn btn-sm btn-outline-secondary border-50" @click="displayInput($event)">@{{ trackOrder.is_arrival ? trackOrder.is_arrival : '点击编辑' }}</button>
                                 <input class="form-control d-none"  @keyup.enter="logisticUpdate($event,'is_arrival')"  :value="trackOrder.is_arrival" :data_value="trackOrder.id"  @blur="hideInput($event)">
                             @else
                                 @{{ trackOrder.is_arrival }}
@@ -165,7 +165,7 @@
                         </td>
                         <td>
                             @can('订单管理-跟踪-物流公司编辑')
-                                <button class="btn btn-sm btn-outline-secondary" @click="displayInput($event)">@{{ trackOrder.signed_at ? trackOrder.signed_at : '点击编辑' }}</button>
+                                <button class="btn btn-sm btn-outline-secondary border-50" @click="displayInput($event)">@{{ trackOrder.signed_at ? trackOrder.signed_at : '点击编辑' }}</button>
                                 <input class="form-control d-none" type="date"  @keyup.enter="logisticUpdate($event,'signed_at')" :value="trackOrder.signed_at" :data_value="trackOrder.id"  @blur="hideInput($event)">
                             @else
                                 @{{ trackOrder.signed_at }}
@@ -174,7 +174,7 @@
 
                         <td>
                             @can('订单管理-跟踪-仓库编辑')
-                                <button class="btn btn-sm btn-outline-secondary" @click="displayInput($event)">@{{ trackOrder.receive_bill_status ? trackOrder.receive_bill_status:'点击编辑' }}</button>
+                                <button class="btn btn-sm btn-outline-secondary border-50" @click="displayInput($event)">@{{ trackOrder.receive_bill_status ? trackOrder.receive_bill_status:'点击编辑' }}</button>
                                 <input class="form-control d-none"  @keyup.enter="warehouseUpdate($event,'receive_bill_status')" :value="trackOrder.receive_bill_status" :data_value="trackOrder.id" @blur="hideInput($event)">
                             @else
                                 @{{ trackOrder.receive_bill_status }}
@@ -182,7 +182,7 @@
                         </td>
                         <td>
                             @can('订单管理-跟踪-仓库编辑')
-                                <button class="btn btn-sm btn-outline-secondary" @click="displayInput($event)">@{{ trackOrder.remark ? trackOrder.remark:'点击编辑'}}</button>
+                                <button class="btn btn-sm btn-outline-secondary border-50" @click="displayInput($event)">@{{ trackOrder.remark ? trackOrder.remark:'点击编辑'}}</button>
                                 <input class="form-control d-none"  @keyup.enter="warehouseUpdate($event,'remark')"  :value="trackOrder.remark" :data_value="trackOrder.id" @blur="hideInput($event)">
                             @else
                                 @{{ trackOrder.remark }}
@@ -231,7 +231,11 @@
     <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm200914.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
-
+    <style type="text/css">
+/*        .border-50 {
+            border: rgb(98, 104, 123);
+        }*/
+    </style>
     <script>
         let tracking_vue = new Vue({
             el:'#tracking_div',