From b4e0f827567f8d5ad4a1ff5caa22675cbc165b88 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期三, 11 六月 2025 10:27:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 10 ++++++++++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 1 +
src/main/java/com/zy/core/DevpThread.java | 1 +
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 11 +++++++++++
4 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 4d6cb49..4b83d4a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -3200,6 +3200,7 @@
staProtocolnew.setWorkNo(wrkMast.getWrkNo());
staProtocolnew.setStaNo(144);
devpThread.setPakMk(staProtocolnew.getSiteId(), false);
+ devpThread.setReportSign(staProtocolnew.getSiteId(), true);
boolean result = MessageQueue.offer(SlaveType.Devp, devpThread.getSlave().getId(), new Task(2, staProtocolnew));
if (!result) {
throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触==>椹卞姩鐮佸灈浣嶆墭鐩樺墠杩涘け璐ワ紒");
diff --git a/src/main/java/com/zy/core/DevpThread.java b/src/main/java/com/zy/core/DevpThread.java
index 715c3a5..243dd7e 100644
--- a/src/main/java/com/zy/core/DevpThread.java
+++ b/src/main/java/com/zy/core/DevpThread.java
@@ -9,5 +9,6 @@
Map<Integer, StaProtocol> getStation();
void setPakMk(Integer siteId, boolean pakMk);
+ void setReportSign(Integer siteId, boolean pakMk);
}
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 63460ac..1a638d1 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -80,6 +80,8 @@
// Super鏈夋棤淇℃伅
private boolean loadingSuper = true;
+ private boolean reportSign = false;
+ private int reportSignCount = 1;
public BasDevp toSqlModel(){
BasDevp basDevp = new BasDevp();
@@ -95,6 +97,14 @@
if (siteId == 213 && autoing && (loadingSuper || loading)){
basDevp.setReportSign(1);
}
+ if (reportSign){
+ basDevp.setReportSign(0);
+ reportSignCount++;
+ }
+ if (reportSignCount>3){
+ reportSign = false;
+ reportSignCount = 0;
+ }
basDevp.setInEnable(inEnable?"Y":"N");
basDevp.setOutEnable(outEnable?"Y":"N");
basDevp.setLocType1((short) 0); // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index f15b955..8d7b143 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -593,6 +593,17 @@
}
}
+ /**
+ * 璁剧疆鍏ュ簱鏍囪
+ */
+ @Override
+ public void setReportSign(Integer siteId, boolean pakMk) {
+ StaProtocol staProtocol = station.get(siteId);
+ if (null != staProtocol) {
+ staProtocol.setReportSign(pakMk);
+ }
+ }
+
@Override
public void close() {
siemensS7Net.ConnectClose();
--
Gitblit v1.9.1