From af5081bc0d0668d526a204076557a171097ddb8d Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 05 二月 2026 14:02:59 +0800
Subject: [PATCH] Merge branch 'refs/heads/rcs_master' into ctu_conveyor
---
zy-acs-common/src/main/java/com/zy/acs/common/domain/protocol/action/ReadyTakeFromConveyorSta.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
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 30c5611..fed00bb 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
@@ -20,7 +20,17 @@
@Override
public byte[] writeToBytes() {
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
public void readFromBytes(byte[] messageBodyBytes) {
@@ -30,4 +40,7 @@
// 鍙栬揣楂樺害
private Short height;
+ // 鍙栬揣娣卞害
+ private Short depth;
+
}
--
Gitblit v1.9.1