问题追踪件 [部分优化]

app/Http/Controllers/TestController.php

@@ -20,6 +20,7 @@ use App\OracleDOCWaveDetails;
 use App\Order;
 use App\OrderIssue;
 use App\OrderPackage;
+use App\OrderTrackingOwner;
 use App\Owner;
 use App\Package;
 use App\Process;
@@ -34,6 +35,7 @@ use App\Services\OrderIssueService;
 use App\Services\OrderPackageService;
 use App\Services\OrderService;
 use App\Services\OrderTrackingService;
+use App\Services\OwnerService;
 use App\Unit;
 use App\User;
 use App\Waybill;
@@ -474,14 +476,47 @@ class TestController extends Controller
     public function test3(){
         /** @var DataHandlerService $dataHandlerService */
         $dataHandlerService = app('dataHandlerService');
-
         $startDate = \Illuminate\Support\Carbon::parse('2020-05-06 13:16:51')->toDateTimeString();
         /** @var OrderTrackingService $orderTrackingService */
         $orderTrackingService  = app('orderTrackingService');
+
+//        /** @var OwnerService $ownerService */
+//        $ownerService = app('ownerService');
+//        $owners = $ownerService->获取订单跟踪的货主();
+//        $ownerIds = data_get($owners, '*.code');
+//        var_dump('query - start',Carbon::now());
+//        OracleDOCOrderHeader::query()
+//            ->with(['oracleDOCOrderDetails', 'actAllocationDetails','oracleBASCode'])
+//            ->where('addtime', '>=', $startDate)
+//            ->whereIn('customerID', $ownerIds)
+//            ->get();
+//
+//        OracleDOCOrderHeader::query()
+//            ->with(['oracleDOCOrderDetails', 'actAllocationDetails','oracleBASCode'])
+//            ->where('EditTime','>=',$startDate)
+//            ->whereColumn('EditTime','<>','addtime')
+//            ->whereIn('customerID', $ownerIds)
+//            ->get();
+//        var_dump('query - end',Carbon::now());
+
         $orderTrackingService->根据设置从WMS同步追踪货主的订单($startDate);
-//        $orderHeaders = OracleDOCOrderHeader::query()->where("addTime",'>=',$startDate)->groupBy('orderno')->get();
-//        dd($orderHeaders);
 
     }
 
+    public function orderTrckingOwnerAll(){
+        $owners = Owner::all();
+        foreach ($owners as $owner) {
+            $orderTrackingOwner =  OrderTrackingOwner::query()->where('owner_id',$owner->id)->first();
+            if($orderTrackingOwner == null){
+                OrderTrackingOwner::query()->create(['owner_id'=>$owner->id,'status'=>'启用']);
+            }else{
+                if($orderTrackingOwner->status == '禁用'){
+                    $orderTrackingOwner->status = '启用';
+                }
+            }
+        }
+    }
+
+
+
 }

app/Services/OracleDOCOrderHeaderService.php

@@ -20,10 +20,9 @@ Class OracleDOCOrderHeaderService
         $owners = $ownerService->获取订单跟踪的货主();
         $ownerIds = data_get($owners, '*.code');
         return OracleDOCOrderHeader::query()
-            ->with(['oracleDOCOrderDetails', 'actAllocationDetails','oracleBASCustomer'])
+            ->with(['oracleDOCOrderDetails', 'actAllocationDetails','oracleBASCode'])
             ->where('addtime', '>=', $startDate)
             ->whereIn('customerID', $ownerIds)
-            ->orderBy('addtime')
             ->get();
     }
 
@@ -33,11 +32,10 @@ Class OracleDOCOrderHeaderService
         $owners = $ownerService->获取订单跟踪的货主();
         $ownerIds = data_get($owners, '*.code');
         return OracleDOCOrderHeader::query()
-            ->with(['oracleDOCOrderDetails', 'actAllocationDetails','oracleBASCustomer'])
+            ->with(['oracleDOCOrderDetails', 'actAllocationDetails','oracleBASCode'])
             ->where('EditTime','>=',$startDate)
             ->whereColumn('EditTime','<>','addtime')
             ->whereIn('customerID', $ownerIds)
-            ->orderBy('EditTime')
             ->get();
     }
 

app/Services/OrderIssueService.php

@@ -33,7 +33,7 @@ class OrderIssueService
         if ($condition['owner_id'] ?? false) {
             $owner_ids = explode(',', $condition['owner_id']);
         }
-        $query = OrderIssue::with(['userWorkGroup', 'issueType', 'logs' => function ($query) {
+        $query = OrderIssue::with(['top','userWorkGroup', 'issueType', 'logs' => function ($query) {
             $query->with('user')->orderByDesc('created_at');
         }, 'order' => function ($query) {
             $query->with(['shop', 'logistic', 'owner', 'packages.commodities.commodity']);
@@ -393,7 +393,7 @@ class OrderIssueService
                 $rejectedBill->同步问题件();
                 $rejectedBill->同步问题件退件状态();
 
-            } /*else if ($arr['rejectedBill']['id_logistic_return'] ?? false && $arr['rejectedBill']['logistic_number_return'] ?? false) {
+            } else if ($arr['rejectedBill']['id_logistic_return'] ?? false && $arr['rejectedBill']['logistic_number_return'] ?? false) {
                 $owner_id = $orderIssue['order']['owner_id'];
                 $rejectedBill = RejectedBill::query()->firstOrCreate([
                         'id_logistic_return' => $arr['rejectedBill']['id_logistic_return'] ?? '',
@@ -405,7 +405,7 @@ class OrderIssueService
                 $rejectedBill->同步问题件退件状态();
                 $arr['orderIssues']['rejected_bill_id'] = $rejectedBill['id'];
                 $arr['orderIssues']['is_new_rejecting'] = '有';
-            }*/
+            }
         }
         if ($arr['order'] ?? false) {
             $order = Order::query()->where('id', $arr['order']['id'])->first();

app/Services/OrderPackageCommoditiesService.php

@@ -381,7 +381,7 @@ class OrderPackageCommoditiesService
         $orderPackagerCommodities = [];
         foreach ($details as $detail) {
             $key = 'sku='.$detail['sku'].' owner_id='.$order['owner_id'];
-            $commodity = $commoditiesMap[$key];
+            $commodity = $commoditiesMap[$key] ?? '';
             $fillable = [
                 'order_package_id' => $orderPackage['id'] ?? '',
                 'commodity_id' => $commodity['id'] ?? '',

app/Services/OrderPackageService.php

@@ -226,7 +226,6 @@ class OrderPackageService
 
     public function 更新WAS订单的包裹的重量和体积($orderHeaders,$orderPackages)
     {
-
         /** @var CommodityService $commodityService */
         $commodityService = app('commodityService');
         $commodities = $commodityService->getWASCommoditiesByWMSOrderHeaders($orderHeaders); // 商品
@@ -235,14 +234,16 @@ class OrderPackageService
         $batchUpdateService = app('batchUpdateService');
         $multipleData = [['id','weight','bulk']];
         $noAttributeCommodity = [];
+
         foreach ($orderPackages as $packages) {
             foreach ($packages as $package) {
-                $orderPackageCommodities =   $orderPackage['commodities'] ?? [];
+                $orderPackageCommodities =  $package['commodities'] ?? [];
                 $updateArr = [
-                    'id' => $package['id'],
+                    'id' => $package->id,
                     'weight' => 0,
                     'bulk' => 0,
                 ];
+
                 foreach ($orderPackageCommodities as $packageCommodity) {
                     $commodity = $commodities->where('id',$packageCommodity['commodity_id'])->first();
                     if(!($commodity['weight'] ?? false) ||!($packageCommodity['amount'] ?? false) ){

app/Services/OrderService.php

@@ -393,11 +393,13 @@ class OrderService
 
         /** @var OracleDOCOrderHeaderService $oracleDOCOrderHeaderService */
         $oracleDOCOrderHeaderService = app('oracleDOCOrderHeaderService');
+        var_dump('根据时间获取在这段时间内创建的WMS订单',Carbon::now());
         $orderHeadersResult = $oracleDOCOrderHeaderService->根据时间获取在这段时间内创建的WMS订单($startDate);
+        var_dump('根据时间获取在这段时间内创建的WMS订单',Carbon::now());
+
         if ($orderHeadersResult->count() == 0) {
             return null;
         }
-
         $orderHeaders_map = [];
         $oracleDOCOrderDetails = [];
         $actAllocationDetails = [];
@@ -430,8 +432,10 @@ class OrderService
     {
         /** @var OracleDOCOrderHeaderService $oracleDOCOrderHeaderService */
         $oracleDOCOrderHeaderService = app('oracleDOCOrderHeaderService');
-
+        var_dump('根据时间获取在这段时间内更新的WMS订单',Carbon::now());
         $editedOrderHeaders = $oracleDOCOrderHeaderService->根据时间获取在这段时间内更新的WMS订单($startDate);
+        var_dump('根据时间获取在这段时间内更新的WMS订单',Carbon::now());
+
         $orderHeaders_map = [];
         foreach ($editedOrderHeaders as $editedOrderHeader) {
             $orderHeaders_map[$editedOrderHeader['orderno']] = $editedOrderHeader;
@@ -490,8 +494,9 @@ class OrderService
 
         $orderPackages = [];
         foreach ($orders as $order) {
-           $packages =  $order['packages'];
-           array_push($orderPackages,$packages);
+           $packages =  $order['packages'] ?? null;
+            $orderPackages[] =  $packages;
+//           array_push($orderPackages,$packages);
         }
         $orderPackageService->更新WAS订单的包裹的重量和体积($orderHeaders,$orderPackages);
         return compact('orders', 'orderHeaders', 'actAllocationDetails', 'oracleDOCOrderDetails');
@@ -571,6 +576,7 @@ class OrderService
         }
 
         // XXX 循环 300 个元素 3s-5s
+
         foreach ($orderHeaders as $orderHeader) {
             $customerid = $orderHeader->customerid;
 
@@ -600,6 +606,7 @@ class OrderService
                 'wms_edittime' => $orderHeader->edittime,
             ];
         }
+
         try {
             if (count($fillables) > 0) {
                 Order::query()->insert($fillables);
@@ -633,17 +640,23 @@ class OrderService
         $orderPackageCommoditiesService->更新WAS订单快递打包商品信息($orderHeaders, $ordersList, $commodities);
 
         $orderNos = data_get($ordersList,'*.code');
-        $orderPackages = OrderPackage::query()
+/*        $orderPackages = OrderPackage::query()
             ->with('commodities','order')
             ->whereHas('order', function ($query) use ($orderNos) {
                 $query->whereIn('code', $orderNos);
             })
+            ->get();*/
+        $orders = Order::query()
+            ->with('packages.commodities')
+            ->whereIn('code',$orderNos)
             ->get();
-
+        $orderPackages = [];
+        foreach ($orders as $order) {
+            $packages =  $order['packages'] ?? null;
+            $orderPackages[] =  $packages;
+        }
         unset($orderNos);
-
         $orderPackageService->更新WAS订单的包裹的重量和体积($orderHeaders,$orderPackages);    // 同步包裹重量和体积
-
     }
 
     public function  更新WMS订单对应的的WAS订单($orderHeaders, $orders)
@@ -653,10 +666,11 @@ class OrderService
         ]];
 
         // XXX 循环 300个元素 3s - 5s
+        var_dump('foreach $orders -- start',Carbon::now(),count($orders));
+            /** @var Order $order */
         foreach ($orders as $key=>$order) {
             $orderHeader = $orderHeaders[$key] ?? false;
             if ($orderHeader) {
-
                 if($order->wms_status != $orderHeader->oracleBASCode_codename_c ||
                     $order->consignee_name != $orderHeader->c_contact ||
                     $order->consignee_phone != $orderHeader->c_tel2 ||
@@ -679,12 +693,11 @@ class OrderService
                         'address' => $orderHeader->c_address1,
                         'client_code' => $orderHeader->soreference1,
                     ];
-
-
-
                 }
             }
         }
+        var_dump('foreach $orders -- end',Carbon::now());
+
         if(count($multipleData)  > 1){
             try {
                 /** @var BatchUpdateService $batchUpdateService */

resources/views/order/issue/edit.blade.php

@@ -254,7 +254,6 @@
                                 _this.rejectedBill.id_logistic_return = res.data.rejectedBill.id_logistic_return;
                                 _this.rejectedBill.id_owner = res.data.rejectedBill.id_owner;
                                 _this.orderIssues.rejected_bill_id = res.data.rejectedBill.id;
-                                _this.isSubmit = false;
                             }
                             if(res.data.msg){
                                 tempTip.setDuration(2000);
@@ -265,6 +264,7 @@
                                 tempTip.setDuration(2000);
                                 tempTip.showSuccess('找到对应的问题单');
                             }
+                            _this.isSubmit = false;
                         }else{
                             _this.isSubmit = true;
                             tempTip.setDuration(4000);

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

@@ -84,7 +84,8 @@
                         <td>@{{ trackOrder.orderClientCode }}</td>
                         <td>
                             @can('订单管理-跟踪-仓库编辑')
-                                <button class="btn btn-sm btn-outline-secondary border-50" @click="displayInput($event)">@{{ trackOrder.web_order_number ?  trackOrder.web_order_number : '点击编辑' }}</button>
+                                <button v-if="trackOrder.web_order_number" class="btn btn-sm border-50" @click="displayInput($event)" >@{{ trackOrder.web_order_number }}</button>
+                                <button v-else class="btn btn-sm border-50" @click="displayInput($event)" style="height: 30px;width:75px;">@{{ 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 +93,8 @@
                         </td>
                         <td>
                             @can('订单管理-跟踪-仓库编辑')
-                                <button class="btn btn-sm btn-outline-secondary border-50" @click="displayInput($event)">@{{ trackOrder.pick_up_at ? trackOrder.pick_up_at :'点击编辑' }}</button>
+                                <button v-if="trackOrder.pick_up_at" class="btn btn-sm border-50" @click="displayInput($event)">@{{ trackOrder.pick_up_at }}</button>
+                                <button v-else class="btn btn-sm border-50" @click="displayInput($event)" style="height: 30px;width:75px;">@{{ 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 +102,9 @@
                         </td>
                         <td>
                             @can('订单管理-跟踪-仓库编辑')
-                                <button class="btn btn-sm btn-outline-secondary border-50" @click="displayInput($event)">@{{ trackOrder.sale ? trackOrder.sale:'点击编辑' }}</button>
+                                <button v-if="trackOrder.sale" class="btn btn-sm border-50" @click="displayInput($event)">@{{ trackOrder.sale }}</button>
+                                <button v-else class="btn btn-sm border-50" @click="displayInput($event)" style="height: 30px;width:75px;">@{{ 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 +112,9 @@
                         </td>
                         <td>
                             @can('订单管理-跟踪-仓库编辑')
-                                <button class="btn btn-sm btn-outline-secondary border-50" @click="displayInput($event)">@{{ trackOrder.client  ? trackOrder.client:'点击编辑'}}</button>
+                                <button v-if="trackOrder.client"  class="btn btn-sm border-50" @click="displayInput($event)">@{{ trackOrder.client  }}</button>
+                                <button class="btn btn-sm border-50" @click="displayInput($event)" style="height: 30px;width:75px;">@{{ 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 +125,9 @@
                         <td>@{{ trackOrder.sku.skuAmount }}</td>
                         <td>
                             @can('订单管理-跟踪-仓库编辑')
-                                <button class="btn btn-sm btn-outline-secondary border-50" @click="displayInput($event)">@{{ trackOrder.order_remark ? trackOrder.order_remark:'点击编辑' }}</button>
+                                <button v-if="trackOrder.order_remark" class="btn btn-sm border-50" @click="displayInput($event)">@{{ trackOrder.order_remark }}</button>
+                                <button v-else class="btn btn-sm border-50" @click="displayInput($event)" style="height: 30px;width:75px;">@{{ 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 +137,9 @@
                         <td>@{{ trackOrder.packageBulk }}</td>
                         <td>
                             @can('订单管理-跟踪-仓库编辑')
-                                <button class="btn btn-sm btn-outline-secondary border-50" @click="displayInput($event)">@{{ trackOrder.pallet_total ? trackOrder.pallet_total:'点击编辑' }}</button>
+                                <button v-if="trackOrder.pallet_total" class="btn btn-sm border-50" @click="displayInput($event)">@{{ trackOrder.pallet_total }}</button>
+                                <button v-else class="btn btn-sm border-50" @click="displayInput($event)" style="height: 30px;width:75px;">@{{ 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 +151,9 @@
 
                         <td>
                             @can('订单管理-跟踪-物流公司编辑')
-                                <button class="btn btn-sm btn-outline-secondary border-50" @click="displayInput($event)">@{{ trackOrder.planning_sent_at ? trackOrder.planning_sent_at:'点击编辑' }}</button>
+                                <button v-if="trackOrder.planning_sent_at" class="btn btn-sm border-50" @click="displayInput($event)">@{{ trackOrder.planning_sent_at }}</button>
+                                <button v-else class="btn btn-sm border-50" @click="displayInput($event)" style="height: 30px;width:75px;">@{{ 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 +161,9 @@
                         </td>
                         <td>
                             @can('订单管理-跟踪-物流公司编辑')
-                                <button class="btn btn-sm btn-outline-secondary border-50" @click="displayInput($event)">@{{ trackOrder.is_on_duty_shift ? trackOrder.is_on_duty_shift :'点击编辑'}}</button>
+                                <button v-if="trackOrder.is_on_duty_shift" class="btn btn-sm border-50" @click="displayInput($event)">@{{ trackOrder.is_on_duty_shift}}</button>
+                                <button v-else class="btn btn-sm border-50" @click="displayInput($event)" style="height: 30px;width:75px;">@{{ 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 +171,9 @@
                         </td>
                         <td>
                             @can('订单管理-跟踪-物流公司编辑')
-                                <button class="btn btn-sm btn-outline-secondary border-50" @click="displayInput($event)">@{{ trackOrder.is_arrival ? trackOrder.is_arrival : '点击编辑' }}</button>
+                                <button v-if="trackOrder.is_arrival" class="btn btn-sm border-50" @click="displayInput($event)">@{{ trackOrder.is_arrival  }}</button>
+                                <button v-else class="btn btn-sm border-50" @click="displayInput($event)" style="height: 30px;width:75px;">@{{ 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 +181,9 @@
                         </td>
                         <td>
                             @can('订单管理-跟踪-物流公司编辑')
-                                <button class="btn btn-sm btn-outline-secondary border-50" @click="displayInput($event)">@{{ trackOrder.signed_at ? trackOrder.signed_at : '点击编辑' }}</button>
+                                <button v-if="trackOrder.signed_at" class="btn btn-sm border-50" @click="displayInput($event)">@{{ trackOrder.signed_at }}</button>
+                                <button v-else class="btn btn-sm border-50" @click="displayInput($event)" style="height: 30px;width:75px;">@{{ 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 +192,9 @@
 
                         <td>
                             @can('订单管理-跟踪-仓库编辑')
-                                <button class="btn btn-sm btn-outline-secondary border-50" @click="displayInput($event)">@{{ trackOrder.receive_bill_status ? trackOrder.receive_bill_status:'点击编辑' }}</button>
+                                <button v-if="trackOrder.receive_bill_status" class="btn btn-sm border-50" @click="displayInput($event)">@{{ trackOrder.receive_bill_status  }}</button>
+                                <button v-else class="btn btn-sm border-50" @click="displayInput($event)" style="height: 30px;width:75px;">@{{ 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 +202,9 @@
                         </td>
                         <td>
                             @can('订单管理-跟踪-仓库编辑')
-                                <button class="btn btn-sm btn-outline-secondary border-50" @click="displayInput($event)">@{{ trackOrder.remark ? trackOrder.remark:'点击编辑'}}</button>
+                                <button v-if="trackOrder.remark" class="btn btn-sm border-50" @click="displayInput($event)"  >@{{ trackOrder.remark}}</button>
+                                <button v-else class="btn btn-sm border-50" @click="displayInput($event)" style="height: 30px;width:75px;">@{{ 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 }}
@@ -232,9 +254,9 @@
     <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);
-        }*/
+        .border-50{
+            border-color: rgba(108, 117, 125,0.5);
+        }
     </style>
     <script>
         let tracking_vue = new Vue({