From a40971b7b06d8a92107407829ce611aedca331f2 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期一, 30 三月 2026 09:57:01 +0800
Subject: [PATCH] 修复入库任务还未生成时下发出库任务会同步进行的问题
---
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 52 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 92be3a2..b8c7d55 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -1,20 +1,27 @@
package com.zy.asrs.task;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.zy.asrs.entity.BasErrLog;
+import com.zy.asrs.entity.Task;
import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.service.*;
+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 javax.annotation.Resource;
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);
@@ -23,7 +30,28 @@
private WrkMastService wrkMastService;
@Autowired
private WorkMastHandler workMastHandler;
+ @Autowired
+ private TaskService taskService;
+ @Resource
+ private MesService mesService;
+ // TODO锛歳eporterTask()
+ @Resource
+ private DigitalTwinService digitalTwinService;
+ /**
+ * 瀹氭椂缁熻姣忓ぉ鍓╀綑搴撳瓨
+ */
+ @Scheduled(cron = "0 50 23 * * ?")
+ private void locNumCount() {
+ digitalTwinService.locNumCount();
+ }
+
+/**
+ * 瀹氭椂浠诲姟鏂规硶锛屾瘡3绉掓墽琛屼竴娆�
+ * 鐢ㄤ簬澶勭悊闇�瑕佸畬鎴愮殑宸ヤ綔妗ｆ暟鎹�
+ * 浣跨敤Spring鐨凘Scheduled娉ㄨВ瀹炵幇瀹氭椂璋冨害
+ * @param "(cron = "0/3 * * * * ? ")" 琛ㄧず姣�3绉掓墽琛屼竴娆�
+ */
@Scheduled(cron = "0/3 * * * * ? ")
private void execute(){
List<WrkMast> wrkMasts = wrkMastService.selectToBeCompleteData();
@@ -43,4 +71,26 @@
}
}
+ /**
+ * AGV 304浠诲姟瀹屾垚锛屾湁鍜學MS鍏宠仈浠诲姟锛屽鍏宠仈浠诲姟鍋氬搴斿鐞嗭紝浠诲姟鐘舵�佷粠304--銆�305锛涙病鏈夊叧鑱斾换鍔★紝浠诲姟鐘舵�佷粠304--銆�305
+ */
+ @Scheduled(cron = "0/3 * * * * ? ")
+ private void executeTask(){
+ List<Task> wrkMasts = taskService.selectList(new EntityWrapper<Task>().eq("wrk_sts", 304));
+ 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