From acb97360cabb518da166d4b050c848d0af9626cf Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期五, 02 一月 2026 15:12:56 +0800
Subject: [PATCH] 注释
---
src/main/java/com/zy/service/impl/MainServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/service/impl/MainServiceImpl.java b/src/main/java/com/zy/service/impl/MainServiceImpl.java
index d790c99..83a4e94 100644
--- a/src/main/java/com/zy/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/service/impl/MainServiceImpl.java
@@ -159,7 +159,7 @@
back = true;
}
// 閫�鍥�
- if (back && staProtocol.isInEnable() && staProtocol.isLoading() && staProtocol.isPakMk()) {
+ if (back && staProtocol.isInEnable() && staProtocol.isLoading() && staProtocol.isPakMk() && !staProtocol.isEmptyMk() ) {
MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errMsg));
staProtocol.setWorkNo(wrkNo);
wrkNo++;
@@ -228,6 +228,7 @@
devpThread.setPakMk(staProtocol.getSiteId(), false);
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
String errorMsg = jsonObject.getString("msg");
+ log.error("鍏ㄧ増鍏ュ簱鍥為��,"+wrkNo+","+errorMsg);
if (!Cools.isEmpty(errorMsg)) {
MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
}
@@ -1092,7 +1093,7 @@
LedCommand ledCommand = new LedCommand();
ledCommand.setWorkNo(dto.getWorkNo());
ledCommand.setIoType(1);
- ledCommand.setTitle("鍏ㄦ澘鍏ュ簱");
+ ledCommand.setTitle("绌烘澘鍏ュ簱");
ledCommand.setLocNo(dto.getLocNo());
ledCommand.setStaNo(dto.getStaNo());
commands.add(ledCommand);
@@ -1105,13 +1106,15 @@
staProtocol.setStaNo(emptyInSta.getBackSta().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ String errorMsg = jsonObject.getString("msg");
+ log.error("绌烘澘鍏ュ簱鍥為��"+wrkNo+","+errorMsg);
if (!result) {
News.errorNoLog(""+mark+" - 2"+" - 鏇存柊plc绔欑偣淇℃伅澶辫触");
throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
}
if (ledThread != null) {
- String errorMsg = jsonObject.getString("msg");
+
if (!Cools.isEmpty(errorMsg)) {
MessageQueue.offer(SlaveType.Led, emptyInSta.getLed(), new Task(3, errorMsg));
}
--
Gitblit v1.9.1