Quellcode durchsuchen

修改问题件类型进行消息推送

loustwo vor 3 Jahren
Ursprung
Commit
f4d002ad01

+ 4 - 3
app/Jobs/SyncOrderIssueOrWorkOrderBySWMS.php

@@ -48,10 +48,11 @@ class SyncOrderIssueOrWorkOrderBySWMS implements ShouldQueue
         /** @var SyncSWMSOrderIssueAndWorkOrderService  $service */
         $service = app(SyncSWMSOrderIssueAndWorkOrderService::class);
         if($this->type ==  $this::$ORDER_ISSUE_TYPE){
-            if($this->orderIssue instanceof WorkOrder){
-                $service->sendWorkOrder($this->workOrder);
-            } else if($this->orderIssue instanceof OrderIssue){
+            $class = $this->orderIssue->getMorphClass();
+            if(str_contains($class,'OrderIssue')){
                 $service->sendOrderIssue($this->orderIssue);
+            } else {
+                $service->sendWorkOrder($this->orderIssue);
             }
         } else if($this->type ==  $this::$WORK_ORDER_TYPE){
             $service->sendWorkOrder($this->workOrder);

+ 2 - 2
app/Services/WorkOrderProcessLogService.php

@@ -50,7 +50,7 @@ class WorkOrderProcessLogService
             $detail->workOrder()->whereIn('status', [2, 6])->update(['owner_tag' => 1]);
         }
         $process_log->setAttribute('user', $user);
-        SyncOrderIssueOrWorkOrderBySWMS::dispatch($work_order,SyncOrderIssueOrWorkOrderBySWMS::$ORDER_ISSUE_TYPE);
+        SyncOrderIssueOrWorkOrderBySWMS::dispatch($work_order,SyncOrderIssueOrWorkOrderBySWMS::$WORK_ORDER_TYPE);
         return $process_log;
     }
 
@@ -70,7 +70,7 @@ class WorkOrderProcessLogService
             $detail = $workOrder->details()->where('order_issue_type_id',$workOrder->order_issue_type_id)->orderByDesc('created_at')->first();
             if (!$detail) continue;
             $process_logs[] = $this->createProcessLog($detail, $params, $user);
-            SyncOrderIssueOrWorkOrderBySWMS::dispatch($workOrder,SyncOrderIssueOrWorkOrderBySWMS::$ORDER_ISSUE_TYPE);
+            SyncOrderIssueOrWorkOrderBySWMS::dispatch($workOrder,SyncOrderIssueOrWorkOrderBySWMS::$WORK_ORDER_TYPE);
         }
         return $process_logs;
     }