From ad79ba405b2d1ac96423f88f4e8a76c584b9d38a Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 09 二月 2026 15:57:06 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/network/real/ZyStationRealConnect.java |   27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zy/core/network/real/ZyStationRealConnect.java b/src/main/java/com/zy/core/network/real/ZyStationRealConnect.java
index f3fab96..fe83d45 100644
--- a/src/main/java/com/zy/core/network/real/ZyStationRealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyStationRealConnect.java
@@ -99,7 +99,7 @@
         if (result.IsSuccess) {
             for (int i = 0; i < statusList.size(); i++) {
                 ZyStationStatusEntity statusEntity = statusList.get(i); // 绔欑偣缂栧彿
-                statusEntity.setTaskNo((int) siemensNet.getByteTransform().TransInt16(result.Content, i * 8)); // 宸ヤ綔鍙�
+                statusEntity.setTaskNo(siemensNet.getByteTransform().TransInt32(result.Content, i * 8)); // 宸ヤ綔鍙�
                 statusEntity.setTargetStaNo((int) siemensNet.getByteTransform().TransInt16(result.Content, i * 8 + 4)); // 鐩爣绔�
 
                 boolean[] status = siemensNet.getByteTransform().TransBool(result.Content, i * 8 + 6, 2);
@@ -109,25 +109,32 @@
                 statusEntity.setOutEnable(status[3]);// 鍙嚭
                 statusEntity.setEmptyMk(status[4]); // 绌烘澘淇″彿
                 statusEntity.setFullPlt(status[5]); // 婊℃墭鐩�
+
+                if (statusEntity.getStationId()==1015){
+                    OperateResultExOne<byte[]> result1 = siemensNet.Read("DB101.3826", (short) (4));
+                    if (result1.IsSuccess) {
+                        statusEntity.setWeight((double) siemensNet.getByteTransform().TransSingle(result1.Content, 0));
+                    }
+                }
             }
         }
 
         // 鏉$爜鎵弿鍣�
-        OperateResultExOne<byte[]> result2 = siemensNet.Read("DB101.840", (short) (barcodeOriginList.size() * 8));
+        OperateResultExOne<byte[]> result2 = siemensNet.Read("DB101.3760", (short) (barcodeOriginList.size() * 52));
         if (result2.IsSuccess) {
             for (int i = 0; i < barcodeOriginList.size(); i++) {
                 ZyStationStatusEntity barcodeEntity = findStatusEntityByBarcodeIdx(i + 1);
                 if (barcodeEntity == null) {
                     continue;
                 }
-                String barcode = siemensNet.getByteTransform().TransString(result2.Content, i * 8, 8, "UTF-8");
+                String barcode = siemensNet.getByteTransform().TransString(result2.Content, i * 52, 52, "UTF-8");
                 barcode = barcode.trim();
                 barcodeEntity.setBarcode(barcode);
             }
         }
 
         // 鎶ヨ淇℃伅
-        OperateResultExOne<byte[]> result3 = siemensNet.Read("DB101.800", (short) (barcodeOriginList.size() * 3));
+        OperateResultExOne<byte[]> result3 = siemensNet.Read("DB101.2400", (short) (barcodeOriginList.size() * 3));
         if (result3.IsSuccess) {
             for (int i = 0; i < barcodeOriginList.size(); i++) {
                 ZyStationStatusEntity barcodeEntity = findStatusEntityByBarcodeIdx(i + 1);
@@ -189,15 +196,17 @@
         }
 
         OperateResult write = null;
+        OperateResult write1 = null;
         // 浠诲姟涓嬪彂娆℃暟
         int writeCount = 0;
         do {
-            short[] data = new short[2];
-            data[0] = command.getTaskNo().shortValue();
-            data[1] = command.getTargetStaNo().shortValue();
+//            short[] data = new short[2];
+//            data[0] = command.getTaskNo();
+//            data[1] = command.getTargetStaNo().shortValue();
 
-            write = siemensNet.Write("DB100." + index * 4, data);
-            if (write.IsSuccess) {
+            write = siemensNet.Write("DB100." + index * 6, command.getTaskNo());
+            write1 =siemensNet.Write("DB100." + (index * 6+4), command.getTargetStaNo().shortValue());
+            if (write.IsSuccess&&write1.IsSuccess) {
                 log.error("鍐欏叆杈撻�佺嚎鍛戒护鎴愬姛銆傜珯鐐圭紪鍙�={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", command.getStationId(), JSON.toJSON(command),
                         writeCount);
                 commandResponse.setResult(true);

--
Gitblit v1.9.1