From f95a3c836f06078f41389051a9d1c01969a925cb Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期五, 20 三月 2026 11:28:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shhtgcwcs' into shhtgcwcs
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 6 +++++-
1 files changed, 5 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 7c1891a..91ea6ad 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -313,8 +313,12 @@
wrkMastService.updateById(wrkMast);
Thread.sleep(3000); // 寤舵椂3S
}else {
+ // 鏈粍鎵樻墭鐩橀��鍥� 鐢佃鏈烘樉绀鸿鍏堢粍鎵�
Integer back = 999;
-
+ if (ledThread != null) {
+ String errorMsg = jsonObject.getString("msg");
+ MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg));
+ }
barcodeThread.setBarcode("");
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(4, back));
if (result) {
--
Gitblit v1.9.1