From 02e30f3f81e597fdd1c2dc0dd99ed31e335d30d7 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期四, 29 八月 2024 18:42:55 +0800
Subject: [PATCH] 配置

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

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 83ca450..c7914fb 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -52,9 +52,11 @@
 
     public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
         add(200);add(201);add(202);
-        add(210);add(211);add(212);
     }};
 
+    public static final ArrayList<Integer> staNos3 = new ArrayList<Integer>() {{
+        add(210);add(211);add(212);
+    }};
 
     private Integer count=0;
 
@@ -86,6 +88,8 @@
                 return staNos1;
             case 2:
                 return staNos2;
+            case 3:
+                return staNos3;
             default:
                 throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
         }
@@ -206,6 +210,13 @@
                 Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
                 boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*4, 1);
                 StaProtocol staProtocol = station.get(siteId);
+
+
+                staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*8));     // 宸ヤ綔鍙�
+
+                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*8 + 4));   // 鐩爣绔�
+
+
                 staProtocol.setAutoing(status[0]);  // 鑷姩
                 staProtocol.setLoading(status[1]);  // 鏈夌墿
                 staProtocol.setInEnable(status[2]); // 鍙叆

--
Gitblit v1.9.1