From 973eed10d720c7dbd0020407c3b89fe1d385944f Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 08 十二月 2025 09:42:20 +0800
Subject: [PATCH] wms功能完善

---
 src/main/java/com/zy/asrs/task/WorkMastScheduler.java |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index 0d39e15..1c60f79 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -2,6 +2,7 @@
 
 import com.zy.asrs.entity.Task;
 import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.MesService;
 import com.zy.asrs.service.TaskService;
 import com.zy.asrs.service.WrkMastService;
 import com.zy.asrs.task.core.ReturnT;
@@ -12,6 +13,7 @@
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
 
@@ -29,6 +31,9 @@
     private WorkMastHandler workMastHandler;
     @Autowired
     private TaskService taskService;
+    @Resource
+    private MesService mesService;
+    // TODO锛歳eporterTask()
 
     @Scheduled(cron = "0/3 * * * * ? ")
     private void execute(){
@@ -56,15 +61,7 @@
             return;
         }
         for (Task wrkMast : wrkMasts) {
-            ReturnT<String> returnT = workMastHandler.AgvStart(wrkMast);
-            if (!returnT.isSuccess()) {
-                wrkMast.setUpdMk("X");
-                wrkMast.setErrorMemo(returnT.getMsg());
-                wrkMast.setErrorTime(new Date());
-                if (!taskService.updateById(wrkMast)) {
-                    log.error("宸ヤ綔妗workNo={}]鏍囪寰呭鐞嗗け璐�", wrkMast.getWrkNo());
-                }
-            }
+            workMastHandler.AgvStart(wrkMast);
         }
     }
 

--
Gitblit v1.9.1