From 58bb9d3e0a8d8c385085f8cce3492eccf5448ec4 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 10 九月 2025 16:20:12 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java
index ef92490..db9082c 100644
--- a/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java
@@ -69,11 +69,26 @@
private boolean flag1007 = false;
+ private Map<Integer, Long> staNoSet = new HashMap<>();
+
+ public Map<Integer, Long> getStaNoSet() {
+ return staNoSet;
+ }
+
+ public void setStaNoSet(Map<Integer, Long> staNoSet) {
+ this.staNoSet = staNoSet;
+ }
/**
* 鍏ュ簱锛屼粠鎷ｆ枡绔欏埌鍏ュ簱绔欙紙CTU鍙栬揣绔欙級
*/
public synchronized void generateStoreWrkFile(Integer mark) {
+ for (Map.Entry<Integer, Long> entry : staNoSet.entrySet()) {
+ if (entry.getValue() != null && System.currentTimeMillis() - entry.getValue() > 1000 * 60 * 5) {
+ log.info("瓒呮椂锛歿}", entry.getKey());
+ staNoSet.remove(entry.getKey());
+ }
+ }
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
StaProtocol staProtocol = devpThread.getStation().get(1004);
@@ -83,9 +98,13 @@
staProtocol = staProtocol.clone();
}
// 鍒ゆ柇鏄惁婊¤冻鏉′欢
-// if (!staProtocol.isLoading()) {
-// return;
-// }
+ if (!staProtocol.isLoading()) {
+ return;
+ }
+ Long i = staNoSet.get(staProtocol.getWorkNo());
+ if (i != null) {
+ return;
+ }
// && staProtocol.isInEnable()
if (staProtocol.getWorkNo() > 0 && staProtocol.isAutoing() && !staProtocol.isEmptyMk() && staProtocol.isPakMk()) {
if (staProtocol.getStaNo() == 1004) {
@@ -96,6 +115,7 @@
}
staProtocol.setStaNo((short) 1007);
boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
+ staNoSet.put(staProtocol.getWorkNo(), System.currentTimeMillis());
log.info("鍏ュ簱杈撻�佺嚎涓嬪彂锛歿},{}", staProtocol.getWorkNo(), 1007);
}
@@ -302,7 +322,7 @@
}
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
StaProtocol staProtocol = devpThread.getStation().get(1001);
- if (i >= 6) {
+ if (i >= 7) {
OpenBusSubmitParam openBusSubmitParam = new OpenBusSubmitParam();
openBusSubmitParam.setBatch(DateUtils.convert(new Date()));
List<TaskDto> taskList = new ArrayList<>();
--
Gitblit v1.9.1