From 48d8d31c884712a5dae653bc4c53ed6ae9e5b781 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期日, 12 十一月 2023 17:30:06 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/WorkMastScheduler.java |   28 +++++++++++++++++++++++-----
 1 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index 1413527..978d50b 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -1,18 +1,26 @@
 package com.zy.asrs.task;
 
+import com.core.common.Cools;
 import com.zy.asrs.entity.WrkMast;
 import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.task.core.ReturnT;
 import com.zy.asrs.task.handler.WorkMastHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
 
+import java.util.Date;
 import java.util.List;
 
 /**
  * Created by vincent on 2020/7/7
  */
-//@Component
+@Component
 public class WorkMastScheduler {
+
+    private static final Logger log = LoggerFactory.getLogger(WorkMastScheduler.class);
 
     @Autowired
     private WrkMastService wrkMastService;
@@ -26,10 +34,20 @@
             return;
         }
         for (WrkMast wrkMast : wrkMasts) {
-            ReturnT<String> start = workMastHandler.start(wrkMast);
-
-
-
+            if (wrkMast.getIoType().equals(101)){
+                if (Cools.isEmpty(wrkMast.getSheetNo()) || !wrkMast.getSheetNo().equals("2")){
+                    continue;
+                }
+            }
+            ReturnT<String> returnT = workMastHandler.start(wrkMast);
+            if (!returnT.isSuccess()) {
+                wrkMast.setUpdMk("X");
+                wrkMast.setErrorMemo(returnT.getMsg());
+                wrkMast.setErrorTime(new Date());
+                if (!wrkMastService.updateById(wrkMast)) {
+                    log.error("宸ヤ綔妗workNo={}]鏍囪寰呭鐞嗗け璐�", wrkMast.getWrkNo());
+                }
+            }
         }
     }
 

--
Gitblit v1.9.1