From 4b97844365fddeeb66a00f4ac42389cadb545bcf Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期二, 06 一月 2026 09:02:21 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/network/real/ZyDualCrnRealConnect.java |   48 +++++++++++++++++++++++++++---------------------
 1 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/zy/core/network/real/ZyDualCrnRealConnect.java b/src/main/java/com/zy/core/network/real/ZyDualCrnRealConnect.java
index 2d3b82e..e4762c6 100644
--- a/src/main/java/com/zy/core/network/real/ZyDualCrnRealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyDualCrnRealConnect.java
@@ -64,31 +64,37 @@
                 //宸ヤ綅1
                 crnStatus.setTaskNo((int) siemensNet.getByteTransform().TransInt16(result.Content, 2));
                 crnStatus.setStatus((int) siemensNet.getByteTransform().TransInt16(result.Content, 4));
-                crnStatus.setForkPos((int) siemensNet.getByteTransform().TransInt16(result.Content, 10));
-                crnStatus.setLoaded((int) siemensNet.getByteTransform().TransInt16(result.Content, 12));
+                crnStatus.setForkPos((int) siemensNet.getByteTransform().TransInt16(result.Content, 6));
+                crnStatus.setLoaded((int) siemensNet.getByteTransform().TransInt16(result.Content, 8));
+                crnStatus.setTaskReceive((int) siemensNet.getByteTransform().TransInt16(result.Content, 10));
 
                 //宸ヤ綅2
-                crnStatus.setTaskNoTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 14));
-                crnStatus.setStatusTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 16));
-                crnStatus.setForkPosTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 22));
-                crnStatus.setLoadedTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 24));
+                crnStatus.setTaskNoTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 12));
+                crnStatus.setStatusTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 14));
+                crnStatus.setForkPosTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 16));
+                crnStatus.setLoadedTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 18));
+                crnStatus.setTaskReceiveTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 20));
 
-                crnStatus.setBay((int) siemensNet.getByteTransform().TransInt16(result.Content, 6));
-                crnStatus.setLevel((int) siemensNet.getByteTransform().TransInt16(result.Content, 8));
-                crnStatus.setWalkPos((int) siemensNet.getByteTransform().TransInt16(result.Content, 26));
-                crnStatus.setAlarm((int) siemensNet.getByteTransform().TransInt16(result.Content, 18));
-                crnStatus.setTemp1((int) siemensNet.getByteTransform().TransInt16(result.Content, 20));
-                crnStatus.setTemp2((int) siemensNet.getByteTransform().TransInt16(result.Content, 22));
-                crnStatus.setTemp3((int) siemensNet.getByteTransform().TransInt16(result.Content, 24));
-                crnStatus.setTemp4((int) siemensNet.getByteTransform().TransInt16(result.Content, 26));
-                crnStatus.setXSpeed((int) siemensNet.getByteTransform().TransInt16(result.Content, 28));
-                crnStatus.setYSpeed((int) siemensNet.getByteTransform().TransInt16(result.Content, 32));
-                crnStatus.setZSpeed((int) siemensNet.getByteTransform().TransInt16(result.Content, 36));
-                crnStatus.setXDistance((int) siemensNet.getByteTransform().TransInt16(result.Content, 40));
-                crnStatus.setYDistance((int) siemensNet.getByteTransform().TransInt16(result.Content, 44));
-                crnStatus.setXDuration((int) siemensNet.getByteTransform().TransInt16(result.Content, 48));
-                crnStatus.setYDuration((int) siemensNet.getByteTransform().TransInt16(result.Content, 52));
+                crnStatus.setBay((int) siemensNet.getByteTransform().TransInt16(result.Content, 22));
+                crnStatus.setLevel((int) siemensNet.getByteTransform().TransInt16(result.Content, 24));
+                crnStatus.setLiftPos((int) siemensNet.getByteTransform().TransInt16(result.Content, 26));
+                crnStatus.setWalkPos((int) siemensNet.getByteTransform().TransInt16(result.Content, 28));
+                crnStatus.setAlarm((int) siemensNet.getByteTransform().TransInt16(result.Content, 30));
+                crnStatus.setTemp1((int) siemensNet.getByteTransform().TransInt16(result.Content, 34));
+                crnStatus.setTemp2((int) siemensNet.getByteTransform().TransInt16(result.Content, 36));
+                crnStatus.setTemp3((int) siemensNet.getByteTransform().TransInt16(result.Content, 38));
+                crnStatus.setTemp4((int) siemensNet.getByteTransform().TransInt16(result.Content, 40));
+                crnStatus.setXSpeed((int) siemensNet.getByteTransform().TransInt16(result.Content, 42));
+                crnStatus.setYSpeed((int) siemensNet.getByteTransform().TransInt16(result.Content, 44));
+                crnStatus.setZSpeed((int) siemensNet.getByteTransform().TransInt16(result.Content, 46));
+                crnStatus.setXDistance((int) siemensNet.getByteTransform().TransInt16(result.Content, 48));
+                crnStatus.setYDistance((int) siemensNet.getByteTransform().TransInt16(result.Content, 50));
+                crnStatus.setXDuration((int) siemensNet.getByteTransform().TransInt16(result.Content, 52));
+                crnStatus.setYDuration((int) siemensNet.getByteTransform().TransInt16(result.Content, 54));
+                crnStatus.setGoodsType((int) siemensNet.getByteTransform().TransInt16(result.Content, 56));
 
+                String barcode = siemensNet.getByteTransform().TransString(result.Content, 58, 8, "UTF-8");
+                crnStatus.setBarcode(barcode);
                 return crnStatus;
             } else {
                 OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栧弻宸ヤ綅鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort()));

--
Gitblit v1.9.1