From 152a81472f4a8a593950ef19d716df1c82098a6c Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期一, 17 十一月 2025 08:48:47 +0800
Subject: [PATCH] 堆垛机移库任务等待确认调整
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 1 +
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 5 +++++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 748e4a6..74ec644 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2093,6 +2093,11 @@
}
// 鐘舵�侊細绛夊緟纭 骞朵笖 浠诲姟瀹屾垚浣� = 1
if (crnProtocol.statusType == CrnStatusType.WAITING && crnProtocol.getTaskNo() != 0) {
+ if ((System.currentTimeMillis() - crnProtocol.getLastCommandTime()) < 1000 * 60) {
+ News.error("" + mark + " - 0" + " - 鍫嗗灈鏈烘寚浠ょ瓑寰呯‘璁ゅ畬鎴愯繃蹇紓甯革紝浠诲姟鍙�:" + crnProtocol.getTaskNo());
+ continue;
+ }
+
News.warnNoLog("" + mark + " - 0" + " - 寮�濮嬫墽琛屽宸ヤ綔妗ｇ殑瀹屾垚鎿嶄綔锛屼换鍔″彿:" + crnProtocol.getTaskNo());
if (crnProtocol.getTaskNo() == 9999) {
crnThread.setResetFlag(true);
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 2e00922..babbb57 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -75,6 +75,7 @@
// 鍐欏叆鏁版嵁 1鍙峰伐浣�
case 2:
CrnCommand data = (CrnCommand) task.getData();
+ crnProtocol.setLastCommandTime(System.currentTimeMillis());
if (data.getPltType() == null || data.getPltType() == 1) {
write(data);
} else if (data.getPltType() == 2) {
--
Gitblit v1.9.1