From 655ba6bfba4b1087e093efe675e46afbff597b97 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期二, 27 一月 2026 09:19:38 +0800
Subject: [PATCH] #
---
version/doc/AGV-RCS 通信协议 V1.1.xlsx | 0
zy-acs-common/src/main/java/com/zy/acs/common/domain/protocol/action/ReadyReleaseToConveyorSta.java | 12 ++++++++----
zy-acs-common/src/main/java/com/zy/acs/common/domain/protocol/action/ReadyTakeFromShelvesLoc.java | 13 +++++++++----
zy-acs-common/src/main/java/com/zy/acs/common/domain/protocol/action/ReadyTakeFromConveyorSta.java | 13 +++++++++----
zy-acs-common/src/main/java/com/zy/acs/common/domain/protocol/action/ReadyReleaseToShelvesLoc.java | 12 ++++++++----
5 files changed, 34 insertions(+), 16 deletions(-)
diff --git "a/version/doc/AGV-RCS \351\200\232\344\277\241\345\215\217\350\256\256 V1.1.xlsx" "b/version/doc/AGV-RCS \351\200\232\344\277\241\345\215\217\350\256\256 V1.1.xlsx"
index 95482c4..c884034 100644
--- "a/version/doc/AGV-RCS \351\200\232\344\277\241\345\215\217\350\256\256 V1.1.xlsx"
+++ "b/version/doc/AGV-RCS \351\200\232\344\277\241\345\215\217\350\256\256 V1.1.xlsx"
Binary files differ
diff --git a/zy-acs-common/src/main/java/com/zy/acs/common/domain/protocol/action/ReadyReleaseToConveyorSta.java b/zy-acs-common/src/main/java/com/zy/acs/common/domain/protocol/action/ReadyReleaseToConveyorSta.java
index a0f25df..0aaa444 100644
--- a/zy-acs-common/src/main/java/com/zy/acs/common/domain/protocol/action/ReadyReleaseToConveyorSta.java
+++ b/zy-acs-common/src/main/java/com/zy/acs/common/domain/protocol/action/ReadyReleaseToConveyorSta.java
@@ -2,7 +2,6 @@
import com.zy.acs.common.domain.protocol.IActionBody;
import com.zy.acs.common.utils.Utils;
-import com.zy.acs.framework.common.RadixTools;
import lombok.Data;
import java.io.Serializable;
@@ -19,9 +18,14 @@
@Override
public byte[] writeToBytes() {
- byte[] heightBytes = Utils.reverse(RadixTools.shortToByte(this.height));
- byte[] depthBytes = Utils.reverse(RadixTools.shortToByte(this.depth));
- return Utils.merge(heightBytes, depthBytes);
+// byte[] heightBytes = Utils.reverse(RadixTools.shortToByte(this.height));
+// byte[] depthBytes = Utils.reverse(RadixTools.shortToByte(this.depth));
+// return Utils.merge(heightBytes, depthBytes);
+
+ byte heightByte = (byte) ((this.height == null ? 0 : this.height) & 0xFF);
+ byte depthByte = (byte) ((this.depth == null ? 0 : this.depth) & 0xFF);
+ return Utils.merge(heightByte, depthByte);
+// return new byte[]{ heightByte, depthByte };
}
@Override
diff --git a/zy-acs-common/src/main/java/com/zy/acs/common/domain/protocol/action/ReadyReleaseToShelvesLoc.java b/zy-acs-common/src/main/java/com/zy/acs/common/domain/protocol/action/ReadyReleaseToShelvesLoc.java
index 5c354e4..c1a352b 100644
--- a/zy-acs-common/src/main/java/com/zy/acs/common/domain/protocol/action/ReadyReleaseToShelvesLoc.java
+++ b/zy-acs-common/src/main/java/com/zy/acs/common/domain/protocol/action/ReadyReleaseToShelvesLoc.java
@@ -1,6 +1,5 @@
package com.zy.acs.common.domain.protocol.action;
-import com.zy.acs.framework.common.RadixTools;
import com.zy.acs.common.domain.protocol.IActionBody;
import com.zy.acs.common.utils.Utils;
import lombok.Data;
@@ -19,9 +18,14 @@
@Override
public byte[] writeToBytes() {
- byte[] heightBytes = Utils.reverse(RadixTools.shortToByte(this.height));
- byte[] depthBytes = Utils.reverse(RadixTools.shortToByte(this.depth));
- return Utils.merge(heightBytes, depthBytes);
+// byte[] heightBytes = Utils.reverse(RadixTools.shortToByte(this.height));
+// byte[] depthBytes = Utils.reverse(RadixTools.shortToByte(this.depth));
+// return Utils.merge(heightBytes, depthBytes);
+
+ byte heightByte = (byte) ((this.height == null ? 0 : this.height) & 0xFF);
+ byte depthByte = (byte) ((this.depth == null ? 0 : this.depth) & 0xFF);
+ return Utils.merge(heightByte, depthByte);
+// return new byte[]{ heightByte, depthByte };
}
@Override
diff --git a/zy-acs-common/src/main/java/com/zy/acs/common/domain/protocol/action/ReadyTakeFromConveyorSta.java b/zy-acs-common/src/main/java/com/zy/acs/common/domain/protocol/action/ReadyTakeFromConveyorSta.java
index d6ea0ac..5493d4a 100644
--- a/zy-acs-common/src/main/java/com/zy/acs/common/domain/protocol/action/ReadyTakeFromConveyorSta.java
+++ b/zy-acs-common/src/main/java/com/zy/acs/common/domain/protocol/action/ReadyTakeFromConveyorSta.java
@@ -2,7 +2,6 @@
import com.zy.acs.common.domain.protocol.IActionBody;
import com.zy.acs.common.utils.Utils;
-import com.zy.acs.framework.common.RadixTools;
import lombok.Data;
import java.io.Serializable;
@@ -19,11 +18,17 @@
@Override
public byte[] writeToBytes() {
- byte[] heightBytes = Utils.reverse(RadixTools.shortToByte(this.height));
- byte[] depthBytes = Utils.reverse(RadixTools.shortToByte(this.depth));
- return Utils.merge(heightBytes, depthBytes);
+// byte[] heightBytes = Utils.reverse(RadixTools.shortToByte(this.height));
+// byte[] depthBytes = Utils.reverse(RadixTools.shortToByte(this.depth));
+// return Utils.merge(heightBytes, depthBytes);
+
+ byte heightByte = (byte) ((this.height == null ? 0 : this.height) & 0xFF);
+ byte depthByte = (byte) ((this.depth == null ? 0 : this.depth) & 0xFF);
+ return Utils.merge(heightByte, depthByte);
+// return new byte[]{ heightByte, depthByte };
}
+
@Override
public void readFromBytes(byte[] messageBodyBytes) {
diff --git a/zy-acs-common/src/main/java/com/zy/acs/common/domain/protocol/action/ReadyTakeFromShelvesLoc.java b/zy-acs-common/src/main/java/com/zy/acs/common/domain/protocol/action/ReadyTakeFromShelvesLoc.java
index 88500f0..eef4c92 100644
--- a/zy-acs-common/src/main/java/com/zy/acs/common/domain/protocol/action/ReadyTakeFromShelvesLoc.java
+++ b/zy-acs-common/src/main/java/com/zy/acs/common/domain/protocol/action/ReadyTakeFromShelvesLoc.java
@@ -1,6 +1,5 @@
package com.zy.acs.common.domain.protocol.action;
-import com.zy.acs.framework.common.RadixTools;
import com.zy.acs.common.domain.protocol.IActionBody;
import com.zy.acs.common.utils.Utils;
import lombok.Data;
@@ -19,11 +18,17 @@
@Override
public byte[] writeToBytes() {
- byte[] heightBytes = Utils.reverse(RadixTools.shortToByte(this.height));
- byte[] depthBytes = Utils.reverse(RadixTools.shortToByte(this.depth));
- return Utils.merge(heightBytes, depthBytes);
+// byte[] heightBytes = Utils.reverse(RadixTools.shortToByte(this.height));
+// byte[] depthBytes = Utils.reverse(RadixTools.shortToByte(this.depth));
+// return Utils.merge(heightBytes, depthBytes);
+
+ byte heightByte = (byte) ((this.height == null ? 0 : this.height) & 0xFF);
+ byte depthByte = (byte) ((this.depth == null ? 0 : this.depth) & 0xFF);
+ return Utils.merge(heightByte, depthByte);
+// return new byte[]{ heightByte, depthByte };
}
+
@Override
public void readFromBytes(byte[] messageBodyBytes) {
--
Gitblit v1.9.1