From f8416d2e77be90d79814cec0255663c180768cff Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 07 九月 2024 09:49:27 +0800
Subject: [PATCH] 输送线指令优化
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 7554728..459e37b 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -187,7 +187,7 @@
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛", DateUtils.convert(new Date()), slave.getId()));
- if (crnProtocol.getStatusType() == CrnStatusType.WAITING_ONE) {
+ if (!Cools.isEmpty(crnProtocol.getTaskNo()) && crnProtocol.getStatusType() == CrnStatusType.WAITING_ONE) {
// 澶嶄綅淇″彿
if (resetFlag) {
if (crnProtocol.getTaskNo() == 9999) {
@@ -196,10 +196,12 @@
CrnCommand crnCommand = new CrnCommand();
crnCommand.setAckFinish((short) 1);
if (write(crnCommand)) {
+ News.error("---绗簩姝ャ�乕鍫嗗灈鏈哄彿锛歿}, 宸ヤ綔鍙凤細{}]==>> 涓�宸ヤ綅澶嶄綅resetFlag鏍囪鎴愬姛{}锛侊紒",
+ slave.getId(), crnProtocol.getTaskNo(), resetFlag);
resetFlag = false;
}
}
- } else if (crnProtocol.getStatusTypeTwo() == CrnStatusType.WAITING_TWO) {
+ } else if (!Cools.isEmpty(crnProtocol.getTaskNo()) && crnProtocol.getStatusTypeTwo() == CrnStatusType.WAITING_TWO) {
// 澶嶄綅淇″彿
if (resetFlagTwo) {
if (crnProtocol.getTaskNo() == 9999) {
@@ -208,10 +210,12 @@
CrnCommand crnCommand = new CrnCommand();
crnCommand.setAckFinish((short) 1);
if (write(crnCommand)) {
+ News.error("---绗簩姝ャ�乕鍫嗗灈鏈哄彿锛歿}, 宸ヤ綔鍙凤細{}]==>> 浜屽伐浣嶅浣峳esetFlag鏍囪鎴愬姛{}锛侊紒",
+ slave.getId(), crnProtocol.getTaskNo(), resetFlag);
resetFlagTwo = false;
}
}
- } else if (crnProtocol.getStatusType() == CrnStatusType.WAITING_All && crnProtocol.getStatusTypeTwo() == CrnStatusType.WAITING_All) {
+ } else if (!Cools.isEmpty(crnProtocol.getTaskNo()) && crnProtocol.getStatusType() == CrnStatusType.WAITING_All && crnProtocol.getStatusTypeTwo() == CrnStatusType.WAITING_All) {
// 澶嶄綅淇″彿
if (resetFlag && resetFlagTwo) {
if (crnProtocol.getTaskNo() == 9999) {
@@ -220,6 +224,8 @@
CrnCommand crnCommand = new CrnCommand();
crnCommand.setAckFinish((short) 1);
if (write(crnCommand)) {
+ News.error("---绗簩姝ャ�乕鍫嗗灈鏈哄彿锛歿}, 宸ヤ綔鍙凤細{}]==>> 鍙屽伐浣嶅浣峳esetFlag鏍囪鎴愬姛{}锛侊紒",
+ slave.getId(), crnProtocol.getTaskNo(), resetFlag);
resetFlag = false;
resetFlagTwo = false;
}
--
Gitblit v1.9.1