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/model/protocol/StaProtocol.java | 3 +++
src/main/java/com/zy/common/model/CanningLineInLocParam.java | 3 +++
src/main/java/com/zy/service/impl/MainServiceImpl.java | 1 +
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 13 +++++++++++++
4 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/common/model/CanningLineInLocParam.java b/src/main/java/com/zy/common/model/CanningLineInLocParam.java
index f20026b..ab8ef6f 100644
--- a/src/main/java/com/zy/common/model/CanningLineInLocParam.java
+++ b/src/main/java/com/zy/common/model/CanningLineInLocParam.java
@@ -40,4 +40,7 @@
// 璐存爣鎴愬姛鍚�
private boolean tbFlag;
+ // 鏄惁璐存爣 false 璐存爣锛宼rue 涓嶈创鏍�
+ private boolean labeling;
+
}
diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index 1a51b5d..6fcf7c5 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -120,6 +120,9 @@
// 鍑虹綈瑁呯嚎浠诲姟瀹屾垚锛岀粰缃愯绾垮啓鍙斁淇″彿 1鍙斁锛�2涓嶅彲鏀�-------------------------------------
private int placeableFlag;
+ // 鏄惁璐存爣 false 璐存爣锛宼rue 涓嶈创鏍�
+ private boolean labeling;
+
// 澶栧舰妫�娴� ------------------------------------------------------------------------
// 鍓嶈秴闄�
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 2bc376c..6ee8453 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -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()));
diff --git a/src/main/java/com/zy/service/impl/MainServiceImpl.java b/src/main/java/com/zy/service/impl/MainServiceImpl.java
index a7a47b8..b7eceb0 100644
--- a/src/main/java/com/zy/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/service/impl/MainServiceImpl.java
@@ -2714,6 +2714,7 @@
param.setReinspection(staProtocol.isReinspection());
param.setSourceStaNo(site + 2);
param.setTbFlag(staProtocol2.isBarcodeErr());
+ param.setLabeling(staProtocol2.isLabeling());
param.setCannedVolume(Math.round(staProtocol.getCannedVolume() * 100.0) / 100.0);
String response = new HttpHandler.Builder()
--
Gitblit v1.9.1