From d2398eb18ecfbfc9ecafe597a22b00615e61db46 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 04 十一月 2025 14:20:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/integrationWms' into integrationWms
---
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index 3b06a95..42f11d2 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -1,6 +1,8 @@
package com.zy.asrs.task;
+import com.zy.asrs.entity.Task;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.TaskService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.WorkMastHandler;
@@ -8,6 +10,7 @@
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;
@@ -15,7 +18,7 @@
/**
* Created by vincent on 2020/7/7
*/
-//@Component
+@Component
public class WorkMastScheduler {
private static final Logger log = LoggerFactory.getLogger(WorkMastScheduler.class);
@@ -24,9 +27,11 @@
private WrkMastService wrkMastService;
@Autowired
private WorkMastHandler workMastHandler;
+ @Autowired
+ private TaskService taskService;
@Scheduled(cron = "0/3 * * * * ? ")
- private void execute(){
+ private void execute() {
List<WrkMast> wrkMasts = wrkMastService.selectToBeCompleteData();
if (wrkMasts.isEmpty()) {
return;
@@ -44,4 +49,23 @@
}
}
+ @Scheduled(cron = "0/3 * * * * ? ")
+ private void executeTask() {
+ List<Task> wrkMasts = taskService.selectToBeCompleteData();
+ if (wrkMasts.isEmpty()) {
+ 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());
+ }
+ }
+ }
+ }
+
}
--
Gitblit v1.9.1