From a9cf56a7be8b5e27e2c3dcb416b734093e7a8dc3 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 28 一月 2026 12:54:15 +0800
Subject: [PATCH] Merge branch 'rcs_master' into ctu_conveyor
---
zy-acs-common/src/main/java/com/zy/acs/common/domain/protocol/action/ReadyReleaseToConveyorSta.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
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..de4f0f6 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
@@ -19,9 +19,16 @@
@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);
+ return Utils.reverse(RadixTools.shortToByte(this.height));
+
+// 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
--
Gitblit v1.9.1