From aba87f9bdad213868e2c8faeabe631c7d882e15d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 22 十月 2024 17:35:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 7 +++++++
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 2 +-
2 files changed, 8 insertions(+), 1 deletions(-)
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 f98f31a..5b5812e 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -135,6 +135,13 @@
}
}
+ public Boolean isPakReset(){
+ if (workNo == 0 && workType == DevpWorkType.BUSY && requestType != DevpRequestType.IN){
+ return true;
+ }
+ return false;
+ }
+
public BasDevp toSqlModel(){
BasDevp basDevp = new BasDevp();
basDevp.setDevNo(siteId);
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index d29590c..8939e1d 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -237,7 +237,7 @@
// staProtocol.setWeightIo(siemensS7Net.getByteTransform().TransDouble(result.Content,i*66 + 40));
staProtocol.setMode(siemensS7Net.getByteTransform().TransInt16(result.Content, i*66 + 44));
- if (!staProtocol.isPakMk() && staProtocol.workType == DevpWorkType.IDLE) {
+ if (!staProtocol.isPakMk() && (staProtocol.workType == DevpWorkType.IDLE || staProtocol.isPakReset())) {
staProtocol.setPakMk(true);
}
}
--
Gitblit v1.9.1