From d4e6820f6cc65ab6d7315abeff8360dbf5fd4a91 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 19 三月 2026 16:32:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/network/real/ZyCrnV2RealConnect.java | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 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 893f288..051f892 100644
--- a/src/main/java/com/zy/core/network/real/ZyCrnV2RealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyCrnV2RealConnect.java
@@ -11,6 +11,7 @@
import com.zy.common.utils.RedisUtil;
import com.zy.core.News;
import com.zy.core.cache.OutputQueue;
+import com.zy.core.enums.CrnTaskModeType;
import com.zy.core.enums.RedisKeyType;
import com.zy.core.model.CommandResponse;
import com.zy.core.model.command.CrnCommand;
@@ -191,7 +192,14 @@
short destinationPosX = siemensNet.getByteTransform().TransInt16(resultRead.Content, 12);
short destinationPosY = siemensNet.getByteTransform().TransInt16(resultRead.Content, 14);
short destinationPosZ = siemensNet.getByteTransform().TransInt16(resultRead.Content, 16);
- if (taskNo == 0 || taskMode == 0 || sourcePosX == 0 || sourcePosY == 0 || sourcePosZ == 0 || destinationPosX == 0 || destinationPosY == 0 || destinationPosZ == 0) {
+ 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()) {
result = siemensNet.Write("DB100.0", array);
} else {
commandDataResult = true;
@@ -208,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