From 690448421bb1a0fef886edb74a0fa33844d9c1b7 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 19 六月 2025 08:35:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 2 ++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 4 ++++
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 5 +++++
3 files changed, 11 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 1b5cb24..3432916 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -652,6 +652,10 @@
continue;
}
+ if (System.currentTimeMillis() - crnProtocol.getLastCommandTime() < 1000 * 60 * 2) {
+ continue;
+ }
+
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
.eq("crn_no", crn.getId()));
if (!wrkMasts.isEmpty()) {
diff --git a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
index fff8bc1..ab44484 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -192,6 +192,11 @@
*/
private Integer crnLane = 1;
+ /**
+ * 涓婁竴娆℃寚浠や笅鍙戞椂闂�
+ */
+ private Long lastCommandTime = System.currentTimeMillis();
+
public void setMode(Short mode) {
this.mode = mode;
this.modeType = CrnModeType.get(mode);
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index e55b359..db1785d 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -316,6 +316,7 @@
} while (i < 5);
}
+ this.crnProtocol.setLastCommandTime(System.currentTimeMillis());
try {
// 鏃ュ織璁板綍
BasCrnOptService bean = SpringUtils.getBean(BasCrnOptService.class);
@@ -427,6 +428,7 @@
} while (i < 5);
}
+ this.crnProtocol.setLastCommandTime(System.currentTimeMillis());
try {
// 鏃ュ織璁板綍
BasCrnOptService bean = SpringUtils.getBean(BasCrnOptService.class);
--
Gitblit v1.9.1