From 3ba1c6b6591f5949cbad37192f411eb388f8fba7 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 15 十二月 2025 17:10:24 +0800
Subject: [PATCH] 济南二机床wcs功能调试完善

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |   42 +++++++++++++++++++++---------------------
 1 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 9c3c08c..7181d32 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -45,20 +45,20 @@
     private short heartBeatVal = 1;
     private StaError1 staError1;
     public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
-        add(201);add(202);add(203);add(204);add(205);
+        add(101);add(102);add(103);add(104);add(105);add(106);
     }};
 
     public static final ArrayList<Integer> BarcodeList = new ArrayList<Integer>() {{
-        add(1); add(2);add(3);
+        add(1);
     }};
     public static final ArrayList<Integer> staNosErrList = new ArrayList<Integer>() {{
-        add(201); add(203); add(205);
+//        add(201); add(203); add(205);
     }};
 
     /**
      * 鏉$爜鏁伴噺
      */
-    private int barcodeSize = 3;
+    private int barcodeSize = 1;
 
     /**
      * 鍏ュ嚭搴撴ā寮�
@@ -233,23 +233,23 @@
         }
 
         // 澶栧舰妫�娴�
-        OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.700", (short) (staNosErrList.size() *4)); // 涓嶈繛缁紝澶氳涓棿涓�涓�
-        if (resultErr.IsSuccess){
-            for (int i = 0;i<staNosErrList.size();i++){
-                boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i*4 + 2, 1);
-                StaProtocol staProtocol = station.get(staNosErrList.get(i));
-                staProtocol.setFrontErr(status[0]);
-                staProtocol.setBackErr(status[1]);
-                staProtocol.setHighErr(status[2]);
-                staProtocol.setLeftErr(status[3]);
-                staProtocol.setRightErr(status[4]);
-//                staProtocol.setGroupSupportErr(status[5]);
-                staProtocol.setWeightErr(status[5]);
-                staProtocol.setBarcodeErr(status[6]);
-//                short goodsHeight = siemensS7Net.getByteTransform().TransInt16(resultErr.Content, i * 4 + 2);
-//                staProtocol.setGoodsHeight(goodsHeight);
-            }
-        }
+//        OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.700", (short) (staNosErrList.size() *4)); // 涓嶈繛缁紝澶氳涓棿涓�涓�
+//        if (resultErr.IsSuccess){
+//            for (int i = 0;i<staNosErrList.size();i++){
+//                boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i*4 + 2, 1);
+//                StaProtocol staProtocol = station.get(staNosErrList.get(i));
+//                staProtocol.setFrontErr(status[0]);
+//                staProtocol.setBackErr(status[1]);
+//                staProtocol.setHighErr(status[2]);
+//                staProtocol.setLeftErr(status[3]);
+//                staProtocol.setRightErr(status[4]);
+////                staProtocol.setGroupSupportErr(status[5]);
+//                staProtocol.setWeightErr(status[5]);
+//                staProtocol.setBarcodeErr(status[6]);
+////                short goodsHeight = siemensS7Net.getByteTransform().TransInt16(resultErr.Content, i * 4 + 2);
+////                staProtocol.setGoodsHeight(goodsHeight);
+//            }
+//        }
 
         // 鏁呴殰淇℃伅鍙嶉
         OperateResultExOne<byte[]> resultErr2 = siemensS7Net.Read("DB101.400", (short) (staNos.size() * 4));

--
Gitblit v1.9.1