订单管理-工单处理-修改部分

app/Http/Controllers/OrderIssueController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
 use App\Events\AddOrUpdateOrderIssues;
 use App\Filters\OrderIssueFilters;
 use App\Imports\OrderIssueImport;
+use App\Jobs\SyncRejectedBillRejectingStatusJob;
 use App\Logistic;
 use App\OracleDOCOrderHeader;
 use App\Order;
@@ -19,9 +20,11 @@ use App\Services\LogService;
 use App\Services\OrderIssueProcessLogService;
 use App\Services\OrderIssueService;
 use App\Services\OrderIssueTypeService;
+use App\Services\OrderRejectedBillRelationService;
 use App\Services\OrderService;
 use App\Services\OwnerService;
 use App\Services\OrderRejectingStatusService;
+use App\Services\RejectedService;
 use App\Shop;
 use App\UserOwnerGroup;
 use App\UserWorkgroup;
@@ -43,6 +46,7 @@ class OrderIssueController extends Controller
     private $orderIssueProcessLogService;
     private $orderIssueTypeService;
     private $rejectedBillSyncOrderService;
+    private $orderRejectedBillRelationService;
     private $logService;
 
     public function __construct(OrderIssueService $service,
@@ -51,6 +55,7 @@ class OrderIssueController extends Controller
                                 OrderService $orderService,
                                 OrderIssueTypeService $orderIssueTypeService,
                                 OrderRejectingStatusService $rejectedBillSyncOrderService,
+                                OrderRejectedBillRelationService $orderRejectedBillRelationService,
                                 LogService $logService)
     {
         $this->service = $service;
@@ -59,6 +64,7 @@ class OrderIssueController extends Controller
         $this->orderService = $orderService;
         $this->orderIssueTypeService = $orderIssueTypeService;
         $this->rejectedBillSyncOrderService = $rejectedBillSyncOrderService;
+        $this->orderRejectedBillRelationService = $orderRejectedBillRelationService;
         $this->logService = $logService;
     }
 
@@ -99,10 +105,14 @@ class OrderIssueController extends Controller
         $this->service->validatorCreate($request)->validate();
         $orderIssue = $this->service->create($request->all());
         event(new AddOrUpdateOrderIssues([$orderIssue['order_id']]));
-        if ($request->has('logistic_number_return') && !OrderIssueRejectedBill::isExit($orderIssue->id, $request['logistic_number_return'])) {
-            $orderIssue->joinRejectedBill($request['logistic_number_return']);
+        if ($request->has('logistic_number_return') && !OrderIssueRejectedBill::isExit($orderIssue->order_id, $request['logistic_number_return'])) {
+            OrderIssueRejectedBill::query()->create([
+                'order_id' => $orderIssue->order_id,
+                'logistic_number_return' => $request->input('logistic_number_return'),
+                'order_issue_id' => $orderIssue->id,
+            ]);
         }
-        $this->rejectedBillSyncOrderService->orderIssueSyncRejectingStatus($orderIssue);
+        SyncRejectedBillRejectingStatusJob::dispatch($orderIssue->order);
         OrderIssueProcessLog::query()->create(['order_issue_id' => $orderIssue['id'], 'user_id' => Auth::user()['id'], 'content' => $request['content'], 'type' => '创建']);
         return redirect('order/issue/index');
     }
@@ -207,7 +217,7 @@ class OrderIssueController extends Controller
             ]);
             $orderIssue = OrderIssue::query()->find($request->id);
             $orderIssue->update($data);
-            $this->rejectedBillSyncOrderService->orderIssueSyncRejectingStatus($orderIssue);
+            SyncRejectedBillRejectingStatusJob::dispatch($orderIssue->order);
             $this->logService->log(__METHOD__, __FUNCTION__, json_encode($request));
             return ['success' => true];
         } catch (Exception $e) {

app/Imports/OrderIssueImport.php

@@ -3,6 +3,7 @@
 namespace App\Imports;
 
 use App\Events\AddOrUpdateOrderIssues;
+use App\Jobs\SyncRejectedBillRejectingStatusJob;
 use App\OracleActAllocationDetails;
 use App\OracleDOCOrderHeader;
 use App\Order;
@@ -10,9 +11,7 @@ use App\OrderIssue;
 use App\OrderIssueProcessLog;
 use App\OrderIssueType;
 use App\OrderPackage;
-use App\Services\OrderIssueRejectedBillService;
 use App\Services\OrderService;
-use App\Services\OrderRejectingStatusService;
 use App\Services\RejectedService;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
@@ -26,24 +25,18 @@ HeadingRowFormatter::default('none');
 
 class OrderIssueImport implements ToCollection, WithHeadingRow, WithMultipleSheets
 {
+    /** @var  OrderService $orderService*/
     private $orderService;
-    private $orderIssueRejectedBillService;
+    /** @var RejectedService  $rejectedService */
     private $rejectedService;
-    private $rejectedBillSyncOrderService;
 
-    public function __construct(OrderService $orderService,
-                                OrderIssueRejectedBillService $orderIssueRejectedBillService,
-                                RejectedService $rejectedService,
-                                OrderRejectingStatusService $rejectedBillSyncOrderService)
-    {
-        $this->orderService = $orderService;
-        $this->orderIssueRejectedBillService = $orderIssueRejectedBillService;
-        $this->rejectedService = $rejectedService;
-        $this->rejectedBillSyncOrderService = $rejectedBillSyncOrderService;
-    }
 
     public function Collection(Collection $collection)
     {
+
+        $this->orderService = app(OrderService::class);
+        $this->rejectedService = app(RejectedService::class);
+
         $endIS = false;
         $headerRow = $collection->toArray()[0];
         if (!isset($headerRow['原始运单号']) || !isset($headerRow['情况说明']) || !isset($headerRow['问题类别'])) {
@@ -116,7 +109,7 @@ class OrderIssueImport implements ToCollection, WithHeadingRow, WithMultipleShee
                 /** @var OrderIssue $orderIssue */
                 $orderIssue = OrderIssue::query()->create($arr);
                 event(new AddOrUpdateOrderIssues([$orderIssue->order_id]));
-                $this->rejectedBillSyncOrderService->orderIssueSyncRejectingStatus($orderIssue);
+                SyncRejectedBillRejectingStatusJob::dispatch($orderIssue->order);
                 if ($orderIssue) {
                     array_push($exception, ['订单' . $row['原始运单号'] . '问题件创建成功！']);
                     OrderIssueProcessLog::query()->create(['order_issue_id' => $orderIssue['id'], 'user_id' => Auth::user()['id'], 'content' => '', 'type' => '创建']);

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

@@ -226,7 +226,7 @@
 {{--                                                       @change="reviseJoinRejectedBill(item,orderIssueRejectedBill.logistic_number_return,$event)"--}}
                                                    @focus="displayDelBtn(true,$event)"
                                                    @blur="displayDelBtn(false,$event)">
-                                            <button type="button" class="btn btn-sm btn-outline-danger mt-1 d-none"
+                                            <button type="butto n" class="btn btn-sm btn-outline-danger mt-1 d-none"
                                                     @click="unJoinLogisticNumberReturn(item,relation.logistic_number_return,i)"
                                             >
                                                 删
@@ -1901,8 +1901,6 @@
                         window.tempTip.cancelWaitingTip();
                         if (res.data.success) {
                             this.sortOrder(res.data.data);
-
-                            res.data.data.is_issue_order = 'order_issue' in res.data.data;
                             this.$set(this.workOrders, this.selectIndex, res.data.data);
                             this.successTempTip('处理完成');
                             if (this.logisticEditWorkOrder.is_edit) this.dialogEditLogisticVisible = false;
@@ -2397,7 +2395,6 @@
                         if (res.data.success) {
                             this.successTempTip('处理完成');
                             this.sortOrder(res.data.data);
-                            res.data.data.is_issue_order = 'order_issue' in res.data.data;
                             this.$set(this.workOrders, this.selectIndex, res.data.data);
                             this.selectIndex = null;
                             if (this.ownerEditWorkOrder.is_edit) this.dialogEditOwnerVisible = false;
@@ -3336,7 +3333,6 @@
                         window.tempTip.cancelWaitingTip();
                         if (res.data.success){
                             this.sortOrder(res.data.data);
-                            res.data.data.is_issue_order = 'order_issue' in res.data.data;
                             this.$set(this.workOrders,index,res.data.data);
                             this.successTempTip('处理完成');
                             this.$forceUpdate();
@@ -3361,7 +3357,6 @@
                         window.tempTip.cancelWaitingTip();
                         if (res.data.success){
                             this.sortOrder(res.data.data);
-                            res.data.data.is_issue_order = 'order_issue' in res.data.data;
                             this.$set(this.workOrders,index,res.data.data);
                             this.successTempTip('处理完成');
                             this.$forceUpdate();