From f165afcbf9e8837ea49b5c46d47c8b1b3bfb4a03 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 20 一月 2026 11:17:34 +0800
Subject: [PATCH] 初始化

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

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index eb91f97..8b2dc25 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -44,12 +44,9 @@
     private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
     private short heartBeatVal = 1;
     private StaError1 staError1;
-//    public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
-//
-//    }};
     public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
         add(101);add(102);add(103);
-        add(104);add(105);
+        add(104);add(105);add(106);
     }};
 
     /*public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
@@ -65,7 +62,7 @@
     }};*/
 
     public static final ArrayList<Integer> BarcodeList1 = new ArrayList<Integer>() {{
-        add(1); add(2);add(3);add(4);add(5);
+        add(1); add(2);add(3);add(4);add(5);add(6);
     }};
 
    /* public static final ArrayList<Integer> BarcodeList2 = new ArrayList<Integer>() {{
@@ -78,12 +75,13 @@
     }};*/
 
     public static final ArrayList<Integer> staNosErrList1 = new ArrayList<Integer>() {{
-        add(101);
-        add(102);add(103);add(104);add(105);
+//        add(101);
+//        add(102);add(103);add(104);add(105);
+        add(102);
     }};
 
     public static final ArrayList<Integer> staNoWeight1 = new ArrayList<Integer>() {{
-        add(101);add(102);add(103);add(104);add(105);
+        add(101);add(102);add(103);add(104);add(105);add(106);
     }};
 
     /*public static final ArrayList<Integer> staNoWeight2 = new ArrayList<Integer>() {{
@@ -305,7 +303,7 @@
                     }
                 }*/
                 staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 8 + 4));   // 鐩爣绔�
-                status = siemensS7Net.getByteTransform().TransBool(result.Content, i * 8 + 6, 2);
+                status = siemensS7Net.getByteTransform().TransBool(result.Content, i * 8 + 6, 1);
 
                 staProtocol.setAutoing(status[0]);  // 鑷姩
                 staProtocol.setLoading(status[1]);  // 鏈夌墿
@@ -324,7 +322,7 @@
 
             //鏉$爜鎵弿鍣�
             ArrayList<Integer> barcodeList = getBarcodeList();
-            OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.2848", (short) (barcodeList.size() * 8));
+            OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.840", (short) (barcodeList.size() * 8));
             if (result2.IsSuccess) {
                 for (int i = 0; i < barcodeList.size(); i++) {
                     Integer barcodeId = barcodeList.get(i);
@@ -338,11 +336,12 @@
             //澶栧舰妫�娴�
             ArrayList<Integer> staNoErrs = staNosErrList;
             int staNoErrsSize = staNoErrs.size();
-            OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.2808", (short) (staNoErrsSize * 4));
+            OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.802", (short) (staNoErrsSize * 7));
             if (resultErr.IsSuccess) {
                 for (int i = 0; i < staNoErrsSize; i++) {
                     Integer siteId = staNoErrs.get(i); // 绔欑偣缂栧彿
-                    boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i * 4 + 2, 1);
+//                    boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i * 4 + 2, 1);
+                    boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i * 7, 1);
                     StaProtocol staProtocol = station.get(siteId);
                     staProtocol.setFrontErr(status[0]);
                     staProtocol.setBackErr(status[1]);
@@ -439,17 +438,17 @@
             return;
         }
         ArrayList<Integer> staNos = getStaNo();
-//        int index = staNos.indexOf(staProtocol.getSiteId());
-        int offset = getOffsetFromSiteId2(staProtocol.getSiteId());//鍙栦綑鑾峰緱瀵瑰簲db鍧楁暟鎹�
+        int index = staNos.indexOf(staProtocol.getSiteId());
+//        int offset = getOffsetFromSiteId2(staProtocol.getSiteId());//鍙栦綑鑾峰緱瀵瑰簲db鍧楁暟鎹�
 
         OperateResult write = null;
         OperateResult write1 = null;
         //浠诲姟涓嬪彂娆℃暟
         int writeCount = 0;
         do {
-            write = siemensS7Net.Write("DB100." + offset, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
+            write = siemensS7Net.Write("DB100." + index * 6, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
             Thread.sleep(200);
-            write1 = siemensS7Net.Write("DB100." + (offset+4), staProtocol.getStaNo().shortValue());    // 鐩爣绔�
+            write1 = siemensS7Net.Write("DB100." + (index * 6 + 4), staProtocol.getStaNo().shortValue());    // 鐩爣绔�
             if(write.IsSuccess && write1.IsSuccess){
                 log.error("鍐欏叆杈撻�佺嚎鍛戒护鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
                 break;

--
Gitblit v1.9.1