From 96437322dc7ebdf4bdd5dbf6723f0cfdbbcafa9e Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 11 三月 2026 15:21:47 +0800
Subject: [PATCH] 成品灌装完成后采集plc反馈的是否贴标信息随工作任务存入数据库中

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |   15 ++++++++++++++-
 1 files changed, 14 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 40d0653..6ee8453 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -386,7 +386,7 @@
                     configService.updateById(config);
                 }
                 StaProtocol staProtocol1016 = station.get(1016);
-                StaProtocol staProtocol1043 = station.get(1016);
+                StaProtocol staProtocol1043 = station.get(1043);
                 StaProtocol staProtocol1019 = station.get(1019);
                 if(staProtocol1016 != null) {
                     staProtocol1016.setInOrOutMode(inOrOutMode);
@@ -444,6 +444,19 @@
             }
         }
 
+        // 璇绘槸鍚﹁创鏍�
+        if(slave.getId() == 2) {
+            ArrayList<Integer> staNosErrList2 = getStaNosErrList();
+            OperateResultExOne<byte[]> resultErr3 = siemensS7Net.Read("DB101.838", (short) 1);
+            if (resultErr3.IsSuccess){
+                boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr3.Content, 0, 1);
+                for (int i = 0;i<staNosErrList2.size();i++){
+                    StaProtocol staProtocol = station.get(staNosErrList2.get(i));
+                    staProtocol.setLabeling(status[i]); // 鏄惁璐存爣 false 璐存爣锛宼rue 涓嶈创鏍�
+                }
+            }
+        }
+
         if (result.IsSuccess) {
 
             OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));

--
Gitblit v1.9.1