From 8e6aa832606dd0e341e280dd210a51b45fb99bf6 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期日, 29 一月 2023 16:29:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitbit/stwcs' into stwcs
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 a688135..f89fb2a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -212,13 +212,17 @@
throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
}
- String successMsg = "鍏ュ簱宸ヤ綔妗�--宸ヤ綔鍙�:" + dto.getWorkNo() + " 鐩爣搴撲綅:" + dto.getLocNo();
- MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, successMsg));
+
+ if (ledThread != null) {
+ String successMsg = "鍏ュ簱宸ヤ綔妗�--宸ヤ綔鍙�:" + dto.getWorkNo() + " 鐩爣搴撲綅:" + dto.getLocNo();
+ MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, successMsg));
+ }
} else {
staProtocol.setWorkNo((short) 9998);
staProtocol.setStaNo((short) 14);
devpThread.setPakMk(staProtocol.getSiteId(), false);
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+
if (ledThread != null) {
String errorMsg = jsonObject.getString("msg");
if (!Cools.isEmpty(errorMsg)) {
--
Gitblit v1.9.1