From 18046957f206ea97133f1352434bc3f4cf556a00 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 23 五月 2025 16:36:56 +0800
Subject: [PATCH] 完善agv调度

---
 src/main/java/com/zy/asrs/task/WorkMastScheduler.java |   36 +++++++++++++++++++++++++++---------
 1 files changed, 27 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 1413527..2615993 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -1,36 +1,54 @@
 package com.zy.asrs.task;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.zy.asrs.entity.BasDevp;
 import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.BasDevpService;
 import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.task.core.ReturnT;
 import com.zy.asrs.task.handler.WorkMastHandler;
+import com.zy.asrs.task.newWay.handler.AssignTasksToRCSHandler;
+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;
     @Autowired
     private WorkMastHandler workMastHandler;
+    @Autowired
+    private BasDevpService basDevpService;
 
     @Scheduled(cron = "0/3 * * * * ? ")
-    private void execute(){
+    private void execute() {
         List<WrkMast> wrkMasts = wrkMastService.selectToBeCompleteData();
-        if (wrkMasts.isEmpty()) {
-            return;
-        }
+
         for (WrkMast wrkMast : wrkMasts) {
-            ReturnT<String> start = workMastHandler.start(wrkMast);
-
-
-
+            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