From d044aacbc8ca59393530c328863f9eb6950d0b35 Mon Sep 17 00:00:00 2001
From: Administrator <1051256694@qq.com>
Date: 星期一, 16 三月 2026 14:30:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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 9215b2c..5bd751a 100644
--- a/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java
@@ -10,6 +10,7 @@
import com.zy.asrs.entity.DeviceConfig;
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;
@@ -132,10 +133,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();
@@ -193,7 +201,7 @@
}
writeConfirmIdx++;
Thread.sleep(200);
- } while (writeConfirmIdx < 5);
+ } while (writeConfirmIdx < 1);
if (!commandConfirmResult) {
News.error("鍫嗗灈鏈哄啓鍏ョ‘璁ゆ暟鎹け璐� ===>> [id:{}]", command.getCrnNo());
@@ -250,7 +258,7 @@
if (resultAck.IsSuccess) {
News.info("搴撲綅姗欒壊鎸夐挳鍛戒护涓嬪彂[locNo:{}] >>>>> {}", command.getLocNo(), command.getValue());
} else {
- News.error("搴撲綅鐧借壊鐏懡浠や笅鍙戝け璐locNo:{}] >>>>> {}", command.getLocNo(), command.getValue());
+ News.error("搴撲綅姗欒壊鎸夐挳鍛戒护涓嬪彂澶辫触[locNo:{}] >>>>> {}", command.getLocNo(), command.getValue());
}
return response;
} catch (Exception e) {
--
Gitblit v1.9.1