From 9f981b542e85a6ec4acffe40c6fab60756e2b486 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 07 九月 2024 09:30:34 +0800
Subject: [PATCH] 输送线指令优化
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 77 ++++++++++++++------------------------
1 files changed, 28 insertions(+), 49 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index ba4b33a..7554728 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -187,46 +187,41 @@
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛", DateUtils.convert(new Date()), slave.getId()));
- if (crnProtocol.getMode() == 1) {
+ if (crnProtocol.getStatusType() == CrnStatusType.WAITING_ONE) {
// 澶嶄綅淇″彿
- if (!Cools.isEmpty(crnProtocol.getStatusType()) && crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
- if (resetFlag) {
- if (crnProtocol.getTaskNo() == 9999) {
- backHpFlag = false;
- }
- CrnCommand crnCommand = new CrnCommand();
- crnCommand.setAckFinish((short) 1);
- if (write(crnCommand)) {
- resetFlag = false;
- }
+ if (resetFlag) {
+ if (crnProtocol.getTaskNo() == 9999) {
+ backHpFlag = false;
+ }
+ CrnCommand crnCommand = new CrnCommand();
+ crnCommand.setAckFinish((short) 1);
+ if (write(crnCommand)) {
+ resetFlag = false;
}
}
- } else if (crnProtocol.getMode() == 2) {
+ } else if (crnProtocol.getStatusTypeTwo() == CrnStatusType.WAITING_TWO) {
// 澶嶄綅淇″彿
- if (!Cools.isEmpty(crnProtocol.getStatusTypeTwo()) && crnProtocol.getStatusTypeTwo().equals(CrnStatusType.WAITING)) {
- if (resetFlagTwo) {
- if (crnProtocol.getTaskNo() == 9999) {
- backHpFlag = false;
- }
- CrnCommand crnCommand = new CrnCommand();
- crnCommand.setAckFinish((short) 1);
- if (write(crnCommand)) {
- resetFlag = false;
- }
+ if (resetFlagTwo) {
+ if (crnProtocol.getTaskNo() == 9999) {
+ backHpFlag = false;
+ }
+ CrnCommand crnCommand = new CrnCommand();
+ crnCommand.setAckFinish((short) 1);
+ if (write(crnCommand)) {
+ resetFlagTwo = false;
}
}
- } else if (crnProtocol.getMode() == 3) {
+ } else if (crnProtocol.getStatusType() == CrnStatusType.WAITING_All && crnProtocol.getStatusTypeTwo() == CrnStatusType.WAITING_All) {
// 澶嶄綅淇″彿
- if (!Cools.isEmpty(crnProtocol.getStatusType()) && crnProtocol.getStatusType().equals(CrnStatusType.WAITING) && !Cools.isEmpty(crnProtocol.getStatusTypeTwo()) && crnProtocol.getStatusTypeTwo().equals(CrnStatusType.WAITING)) {
- if (resetFlag && resetFlagTwo) {
- if (crnProtocol.getTaskNo() == 9999) {
- backHpFlag = false;
- }
- CrnCommand crnCommand = new CrnCommand();
- crnCommand.setAckFinish((short) 1);
- if (write(crnCommand)) {
- resetFlag = false;
- }
+ if (resetFlag && resetFlagTwo) {
+ if (crnProtocol.getTaskNo() == 9999) {
+ backHpFlag = false;
+ }
+ CrnCommand crnCommand = new CrnCommand();
+ crnCommand.setAckFinish((short) 1);
+ if (write(crnCommand)) {
+ resetFlag = false;
+ resetFlagTwo = false;
}
}
}
@@ -337,14 +332,6 @@
|| !command.getSourcePosZ().equals(one.getSourcePosZ()) || !command.getDestinationPosX().equals(one.getDestinationPosX())
|| !command.getDestinationPosY().equals(one.getDestinationPosY()) || !command.getDestinationPosZ().equals(one.getDestinationPosZ())
) {
- System.out.println(command.getTaskNo().equals(one.getTaskNo()));
- System.out.println(command.getTaskMode().equals(one.getTaskMode()));
- System.out.println(command.getDestinationPosX().equals(one.getDestinationPosX()));
- System.out.println(command.getDestinationPosY().equals(one.getDestinationPosY()));
- System.out.println(command.getDestinationPosZ().equals(one.getDestinationPosZ()));
- System.out.println(command.getSourcePosZ().equals(one.getSourcePosZ()));
- System.out.println(command.getSourcePosY().equals(one.getSourcePosY()));
- System.out.println(command.getSourcePosX().equals(one.getSourcePosX()));
try {
log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐�==>涓嶄竴鑷碵id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSONString(command), JSON.toJSONString(one));
} catch (Exception e) {
@@ -373,14 +360,6 @@
|| !command.getSourcePosZTwo().equals(one.getSourcePosZTwo()) || !command.getDestinationPosXTwo().equals(one.getDestinationPosXTwo())
|| !command.getDestinationPosYTwo().equals(one.getDestinationPosYTwo()) || !command.getDestinationPosZTwo().equals(one.getDestinationPosZTwo())
) {
- System.out.println(command.getTaskNo().equals(one.getTaskNo()));
- System.out.println(command.getTaskMode().equals(one.getTaskMode()));
- System.out.println(command.getSourcePosXTwo().equals(one.getSourcePosXTwo()));
- System.out.println(command.getDestinationPosYTwo().equals(one.getDestinationPosYTwo()));
- System.out.println(command.getDestinationPosZTwo().equals(one.getDestinationPosZTwo()));
- System.out.println(command.getSourcePosZTwo().equals(one.getSourcePosZTwo()));
- System.out.println(command.getSourcePosYTwo().equals(one.getSourcePosYTwo()));
- System.out.println(command.getDestinationPosXTwo().equals(one.getDestinationPosXTwo()));
try {
log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐�==>涓嶄竴鑷碵id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSONString(command), JSON.toJSONString(one));
} catch (Exception e) {
--
Gitblit v1.9.1