Merge remote-tracking branch 'origin/master'

app/Http/Controllers/OrderIssueController.php

@@ -360,6 +360,8 @@ class OrderIssueController extends Controller
             OrderIssue::query()
                 ->where('id', $request->input('id'))
                 ->update([$request->input('column') => $request->input('value')]);
+            $orderIssue = OrderIssue::query() ->where('id', $request->input('id'))->first();
+            SyncOrderIssueOrWorkOrderBySWMS::dispatch($orderIssue,SyncOrderIssueOrWorkOrderBySWMS::$ORDER_ISSUE_TYPE);
             $this->logService->log(__METHOD__, '更新问题件', json_encode($request->getContent()));
             if ($request->input('column') == 'order_issue_type_id') {
                 event(new AddOrUpdateOrderIssues([$request->input('id')]));
@@ -826,6 +828,10 @@ class OrderIssueController extends Controller
             $data['baoshi_express_remission'] = $request->input("baoshi_express_remission");
         }
         OrderIssue::query()->whereIn('id', $orderIssueIds)->update($data);
+        $orderIssues = OrderIssue::query()->whereIn('id',$orderIssueIds)->get();
+        foreach ($orderIssues as $orderIssue){
+            SyncOrderIssueOrWorkOrderBySWMS::dispatch($orderIssue,SyncOrderIssueOrWorkOrderBySWMS::$ORDER_ISSUE_TYPE);
+        }
         $userWorkGroupIds = $request->input("userWorkGroupIds");
         if (isset($userWorkGroupIds)) {
             $orderIssues = OrderIssue::query()->whereIn('id', $orderIssueIds)->get();
@@ -852,6 +858,10 @@ class OrderIssueController extends Controller
         if (!Gate::allows('订单管理-问题件-编辑')) return ['success' => false, 'error' => '没有对应权限'];
         try {
             $service->batchUpdateFinalStatus($request->input('ids', []), $request->input('final_status'));
+            $orderIssues = OrderIssue::query()->whereIn('id',$request->input('ids', []))->get();
+            foreach ($orderIssues as $orderIssue){
+                SyncOrderIssueOrWorkOrderBySWMS::dispatch($orderIssue,SyncOrderIssueOrWorkOrderBySWMS::$ORDER_ISSUE_TYPE);
+            }
             return ['success' => true];
         } catch (Exception $e) {
             return ['success' => false, 'message' => '批量修改异常'];

app/Services/OrderRejectingStatusService.php

@@ -86,7 +86,7 @@ class OrderRejectingStatusService
             $amount = $item->amount;
             if (!Commodity::query()->where("sku", $code)->where('owner_id', $order->owner_id)->exists()) {
                 $query = CommodityBarcode::query()->select('commodity_id')->where('code', $code);
-                $commodity = Commodity::query()->where('owner_id', $order->owner_id)->whereIn('id', $query)->first();
+                $commodity = Commodity::query()->where('owner_id', $order->owner_id)->whereIn('id', $query)->whereNotNull('sku')->first();
                 if ($commodity) $code = $commodity->sku;
             }
             $quality_name = $item->quality->name;

app/Services/WorkOrderInterceptService.php

@@ -232,6 +232,7 @@ class WorkOrderInterceptService extends WorkOrderService
         ]);
         $this->endOrderIssueAndSyncProcessLogs($detail);
         $this->logService->createLog($detail, '终审', '自动终审-' . $process_progress);
+        $this->sendSWNSMessage($workOrder);
     }
 
     /**