From 41e68f8b4deaabb52d5fe5f8181e9a8cffeb2456 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 16 三月 2026 16:39:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/network/real/ZyCrnV2RealConnect.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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..8b2bc1c 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;
@@ -165,9 +166,14 @@
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] = command.getTaskNo().shortValue();
+ array[1] = commandTaskNo.shortValue();
array[2] = command.getTaskMode().shortValue();
array[3] = command.getSourcePosX().shortValue();
array[4] = command.getSourcePosY().shortValue();
@@ -191,7 +197,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;
--
Gitblit v1.9.1