From eab71c86022c1b3bb3ac334e0c57ad61ba7854a4 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 16 三月 2026 11:08:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java | 2 +-
src/main/java/com/zy/core/network/real/ZyCrnV2RealConnect.java | 12 ++++++++++--
src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java | 12 ++++++++++--
3 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java b/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java
index fc3cc4f..8c23c20 100644
--- a/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java
@@ -13,6 +13,7 @@
import com.zy.asrs.utils.Utils;
import com.zy.core.News;
import com.zy.core.cache.OutputQueue;
+import com.zy.core.enums.CrnTaskModeType;
import com.zy.core.model.CommandResponse;
import com.zy.core.model.command.CrnCommand;
import com.zy.core.network.api.ZyCrnConnectApi;
@@ -127,10 +128,17 @@
return response;
}
+ Integer commandTaskNo = command.getTaskNo();
+ Integer commandTaskMode = command.getTaskMode();
+ if (commandTaskMode.equals(CrnTaskModeType.RESET.id)) {
+ commandTaskNo = 0;
+ commandTaskMode = 0;
+ }
+
short[] array = new short[9];
array[0] = command.getAckFinish().shortValue();
- array[1] = command.getTaskNo().shortValue();
- array[2] = command.getTaskMode().shortValue();
+ array[1] = commandTaskNo.shortValue();
+ array[2] = commandTaskMode.shortValue();
array[3] = command.getSourcePosX().shortValue();
array[4] = command.getSourcePosY().shortValue();
array[5] = command.getSourcePosZ().shortValue();
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..97f84b3 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,10 +166,17 @@
return response;
}
+ Integer commandTaskNo = command.getTaskNo();
+ Integer commandTaskMode = command.getTaskMode();
+ if (commandTaskMode.equals(CrnTaskModeType.RESET.id)) {
+ commandTaskNo = 0;
+ commandTaskMode = 0;
+ }
+
short[] array = new short[9];
array[0] = command.getAckFinish().shortValue();
- array[1] = command.getTaskNo().shortValue();
- array[2] = command.getTaskMode().shortValue();
+ array[1] = commandTaskNo.shortValue();
+ array[2] = commandTaskMode.shortValue();
array[3] = command.getSourcePosX().shortValue();
array[4] = command.getSourcePosY().shortValue();
array[5] = command.getSourcePosZ().shortValue();
diff --git a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
index 79fdf45..0205cc1 100644
--- a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
@@ -288,7 +288,7 @@
crnCommand.setCrnNo(crnNo); // 鍫嗗灈鏈虹紪鍙�
crnCommand.setTaskNo(taskNo); // 宸ヤ綔鍙�
crnCommand.setAckFinish(1); // 浠诲姟瀹屾垚纭浣�
- crnCommand.setTaskMode(CrnTaskModeType.NONE.id); // 浠诲姟妯″紡
+ crnCommand.setTaskMode(CrnTaskModeType.RESET.id); // 浠诲姟妯″紡
crnCommand.setSourcePosX(0); // 婧愬簱浣嶆帓
crnCommand.setSourcePosY(0); // 婧愬簱浣嶅垪
crnCommand.setSourcePosZ(0); // 婧愬簱浣嶅眰
--
Gitblit v1.9.1