Просмотр исходного кода

问题件二次客户订单号 Bug修改 【二次客户订单号修改后,承运商不显示】

ajun 5 лет назад
Родитель
Сommit
2a9e5ef92b
2 измененных файлов с 4 добавлено и 5 удалено
  1. 3 4
      app/Http/Controllers/OrderIssueController.php
  2. 1 1
      app/Services/OrderService.php

+ 3 - 4
app/Http/Controllers/OrderIssueController.php

@@ -461,14 +461,13 @@ class OrderIssueController extends Controller
         if(!Gate::allows('订单管理-问题件-编辑')){
             return ['success'=>false,'fail_info'=>'没有对应权限'];
         }
-        $secondClientNo = $request->input('secondClientNo');
         try {
-            app(OrderIssueService::class)->editOrderIssueSecondClientNo($request->id,$secondClientNo);
-            $order = Order::query()->with('packages.commodities.commodity')->where('client_code',$secondClientNo)->first();
+            app(OrderIssueService::class)->editOrderIssueSecondClientNo($request['id'],$request['secondClientNo']);
+            $order = Order::query()->with(['packages.commodities.commodity','logistic'])->where('client_code',$request['secondClientNo'])->first();
             if (!$order) {
                 return ['success' => true, 'message' => '二次客户单号已修改,没有对应的订单信息'];
             } else {
-               return ['success' => true, 'order' => $secondClientNo =='' ? null : $order];
+               return ['success' => true, 'order' => $request['secondClientNo'] == '' ? null : $order];
             }
         } catch (Exception $e) {
             app('LogService')->log(__METHOD__, __FUNCTION__, json_encode($request->getContent()).$e->getMessage().$e->getTraceAsString());

+ 1 - 1
app/Services/OrderService.php

@@ -365,7 +365,7 @@ class OrderService
         $orderHeaderService = app('OracleDocOrderHeaderService');
         $orderHeaders = $orderHeaderService->getQuery()->where('SOReference1',$clientCode)->get();
         $this->syncOrderInfo($orderHeaders,false);
-        return Order::with('packages.commodities.commodity')->where('client_code', $clientCode)->first();
+        return Order::with(['packages.commodities.commodity','logistic'])->where('client_code', $clientCode)->first();
     }
 
     public function getRejectedBillOfClientCode($clientCode)