From 759cd0e706e252e907955073eed8e4935b21d9c8 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 31 十二月 2025 08:13:48 +0800
Subject: [PATCH] 1.修复拣料回库时拣料出库转历史档 2.生成移动任务修复 3.完善agv搬运入库出库申请

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

diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index ed0455a..0e9d160 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -181,10 +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));
+                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));
 //                if (slave.getId() == 1) {
 //                    crnProtocol.setCrnLane((int) siemensNet.getByteTransform().TransInt16(result.Content, 56));
 //                }

--
Gitblit v1.9.1