From 4f45f8f3ec334a73ba24fc5d16017b5c044168aa Mon Sep 17 00:00:00 2001
From: Administrator <1051256694@qq.com>
Date: 星期五, 13 三月 2026 11:24:01 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/AutomaticallyIssueWCSTasksScheduler.java |   23 +++++++++--------------
 1 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/AutomaticallyIssueWCSTasksScheduler.java b/src/main/java/com/zy/asrs/task/AutomaticallyIssueWCSTasksScheduler.java
index ae73b41..73b17c8 100644
--- a/src/main/java/com/zy/asrs/task/AutomaticallyIssueWCSTasksScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutomaticallyIssueWCSTasksScheduler.java
@@ -3,6 +3,7 @@
 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.AutomaticallyIssueWCSTasksHandler;
 import com.zy.asrs.task.handler.WorkMastHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,24 +20,18 @@
     @Autowired
     private WrkMastService wrkMastService;
     @Autowired
-    private WorkMastHandler workMastHandler;
+    private AutomaticallyIssueWCSTasksHandler automaticallyIssueWCSTasksHandler;
 
-    @Scheduled(cron = "0/3 * * * * ? ")
+//    @Scheduled(cron = "0/3 * * * * ? ")
     private void execute(){
-        List<WrkMast> wrkMasts = wrkMastService.selectToBeCompleteData();
+        List<WrkMast> wrkMasts = wrkMastService.selectList(
+                new com.baomidou.mybatisplus.mapper.EntityWrapper<WrkMast>()
+                        .eq("wrk_sts", 11)
+                        .last(" and (pause_mk is null or pause_mk <> 'Y') and (io_type not in (101,103,104,107,110) or Pdc_type = 'Y')")
+        );
         if (wrkMasts.isEmpty()) {
             return;
         }
-        for (WrkMast wrkMast : wrkMasts) {
-            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());
-                }
-            }
-        }
+        ReturnT<String> returnT = automaticallyIssueWCSTasksHandler.start(wrkMasts);
     }
 }

--
Gitblit v1.9.1