From e9b531edd2917b01a80dfa14e917ec21ddad8882 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 19 三月 2026 20:26:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/network/real/ZyCrnV2RealConnect.java | 45 ++++++++++++++++++++-------------------------
1 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/core/network/real/ZyCrnV2RealConnect.java b/src/main/java/com/zy/core/network/real/ZyCrnV2RealConnect.java
index 8b2bc1c..051f892 100644
--- a/src/main/java/com/zy/core/network/real/ZyCrnV2RealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyCrnV2RealConnect.java
@@ -166,14 +166,9 @@
return response;
}
- Integer commandTaskNo = command.getTaskNo();
- if (command.getTaskMode().equals(CrnTaskModeType.RESET.id)) {
- commandTaskNo = 0;
- }
-
short[] array = new short[9];
array[0] = command.getAckFinish().shortValue();
- array[1] = commandTaskNo.shortValue();
+ array[1] = command.getTaskNo().shortValue();
array[2] = command.getTaskMode().shortValue();
array[3] = command.getSourcePosX().shortValue();
array[4] = command.getSourcePosY().shortValue();
@@ -198,13 +193,13 @@
short destinationPosY = siemensNet.getByteTransform().TransInt16(resultRead.Content, 14);
short destinationPosZ = siemensNet.getByteTransform().TransInt16(resultRead.Content, 16);
if (taskNo != command.getTaskNo().shortValue()
- || taskMode == command.getTaskMode().shortValue()
- || sourcePosX == command.getSourcePosX().shortValue()
- || sourcePosY == command.getSourcePosY().shortValue()
- || sourcePosZ == command.getSourcePosZ().shortValue()
- || destinationPosX == command.getDestinationPosX().shortValue()
- || destinationPosY == command.getDestinationPosY().shortValue()
- || destinationPosZ == command.getDestinationPosZ().shortValue()) {
+ || taskMode != command.getTaskMode().shortValue()
+ || sourcePosX != command.getSourcePosX().shortValue()
+ || sourcePosY != command.getSourcePosY().shortValue()
+ || sourcePosZ != command.getSourcePosZ().shortValue()
+ || destinationPosX != command.getDestinationPosX().shortValue()
+ || destinationPosY != command.getDestinationPosY().shortValue()
+ || destinationPosZ != command.getDestinationPosZ().shortValue()) {
result = siemensNet.Write("DB100.0", array);
} else {
commandDataResult = true;
@@ -221,27 +216,27 @@
return response;
}
- int confirmIdx = 0;
- boolean confirmFlag = false;
+ int writeConfirmIdx = 0;
+ boolean commandConfirmResult = false;
do {
- OperateResult confirmResult = siemensNet.Write("DB100.18", (short) 1);
- if (!confirmResult.IsSuccess) {
- OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.18", (short) 2);
- if (resultRead.IsSuccess) {
- short confirm = siemensNet.getByteTransform().TransInt16(resultRead.Content, 0);
- if(confirm == 0) {
+ OperateResult result = siemensNet.Write("DB100.18", (short) 1);
+ if (result.IsSuccess) {
+ OperateResultExOne<byte[]> commandReadResult = siemensNet.Read("DB100.18", (short) 2);
+ if (commandReadResult.IsSuccess) {
+ short commandRead = siemensNet.getByteTransform().TransInt16(commandReadResult.Content, 0);
+ if (commandRead == 0) {
Thread.sleep(500);
}else {
- confirmFlag = true;
+ commandConfirmResult = true;
break;
}
}
}
- confirmIdx++;
+ writeConfirmIdx++;
Thread.sleep(200);
- } while (confirmIdx < 5);
+ } while (writeConfirmIdx < 5);
- if(!confirmFlag) {
+ if (!commandConfirmResult) {
News.error("鍫嗗灈鏈哄啓鍏ョ‘璁ゆ暟鎹け璐� ===>> [id:{}]", command.getCrnNo());
response.setMessage("鍫嗗灈鏈哄啓鍏ョ‘璁ゆ暟鎹け璐�");
return response;
--
Gitblit v1.9.1