From 84e12ecd3923f28b62b8659b138a554b0f6e084d Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 30 一月 2026 15:16:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rcs_master' into rcs_master

---
 zy-acs-common/src/main/java/com/zy/acs/common/domain/protocol/action/ReadyReleaseToShelvesLoc.java |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

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..be3593e 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,8 +1,8 @@
 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 com.zy.acs.framework.common.RadixTools;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -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