From 97e704d52a980844af0268f41b09b177e4aa7268 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期四, 26 三月 2026 19:41:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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 f842c6b..2dd7107 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -316,7 +316,8 @@
// 鏈粍鎵樻墭鐩橀��鍥� 鐢佃鏈烘樉绀鸿鍏堢粍鎵�
Integer back = 999;
if (ledThread != null) {
- String errorMsg = jsonObject.getString("msg");
+// String errorMsg = jsonObject.getString("msg");
+ String errorMsg = "璇峰厛缁勬墭";
MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg));
}
barcodeThread.setBarcode("");
@@ -579,6 +580,15 @@
if (activeCount > 0) {
return;
}
+ // 瀛樺湪5绉掑唴鐨�15鐘舵�佷笉涓嬪彂鍑哄簱
+ Date modiTimeThreshold = new Date(System.currentTimeMillis() - 5000L);
+ int recentStatus15Count = wrkMastService.selectCount(new EntityWrapper<WrkMast>()
+ .eq("wrk_sts", 15)
+ .gt("modi_time", modiTimeThreshold)
+ .ne("wrk_no", wrkMast.getWrkNo()));
+ if (recentStatus15Count > 0) {
+ return;
+ }
Integer sourceStaNo = Utils.getStaNoByLocNo(wrkMast.getSourceLocNo());
--
Gitblit v1.9.1