From 391cbdd2309469a48d2068c0849b8140e5d5670a Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 13 一月 2026 13:27:32 +0800
Subject: [PATCH] 修复堆垛机

---
 src/main/java/com/zy/core/thread/SiemensCrnThread.java |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 27e31f3..da7e86c 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -158,9 +158,6 @@
     private void readStatus(){
         try {
             short len = 56;
-            if (slave.getId() == 1) {
-                len = 58;
-            }
             OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", len);
             if (result.IsSuccess) {
                 if (null == crnProtocol) {
@@ -184,13 +181,10 @@
                 crnProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 28));
                 crnProtocol.setySpeed(siemensNet.getByteTransform().TransInt16(result.Content, 32));
                 crnProtocol.setzSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 36));
-                crnProtocol.setxDistance(siemensNet.getByteTransform().TransInt16(result.Content, 40));
-                crnProtocol.setyDistance(siemensNet.getByteTransform().TransInt16(result.Content, 44));
-                crnProtocol.setxDuration(siemensNet.getByteTransform().TransInt16(result.Content, 48));
-                crnProtocol.setyDuration(siemensNet.getByteTransform().TransInt16(result.Content, 52));
-                if (slave.getId() == 1) {
-                    crnProtocol.setCrnLane((int) siemensNet.getByteTransform().TransInt16(result.Content, 56));
-                }
+                crnProtocol.setxDistance((short) siemensNet.getByteTransform().TransSingle(result.Content, 40));
+                crnProtocol.setyDistance((short) siemensNet.getByteTransform().TransSingle(result.Content, 44));
+                crnProtocol.setxDuration((short) siemensNet.getByteTransform().TransSingle(result.Content, 48));
+                crnProtocol.setyDuration((short) siemensNet.getByteTransform().TransSingle(result.Content, 52));
 
                 OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
 

--
Gitblit v1.9.1