From 4f33cf4caa568544dc9c50c60e2f607a02da11c1 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期一, 24 十一月 2025 15:58:13 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 5 ++++-
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 7 +++++--
2 files changed, 9 insertions(+), 3 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 89b94a5..274db59 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -46,6 +46,9 @@
// 浣�
private boolean low;
+ // 涓�
+ private boolean mid;
+
// 閿佸畾鏍囪
private boolean pakMk = true;
@@ -116,7 +119,7 @@
basDevp.setLoading(loading?"Y":"N");
basDevp.setInEnable(inEnable?"Y":"N");
basDevp.setOutEnable(outEnable?"Y":"N");
- basDevp.setLocType1((short) 0); // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿
+ basDevp.setLocType1((short) 0); // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣�,3:涓簱浣峿
basDevp.setLocType2((short) 0); // 瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿
basDevp.setLocType3((short) 0); // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿
basDevp.setLocType1(high != low && low ? (short) 1 : (short) 2);
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 9d87197..e7110bf 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -317,6 +317,9 @@
staProtocol.setHigh(status[6]); // 楂樺簱浣�
staProtocol.setLow(status[7]); // 浣庡簱浣�
+ status = siemensS7Net.getByteTransform().TransBool(result.Content, i * 8 + 7, 1);
+ staProtocol.setMid(status[0]); // 涓簱浣�
+
if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
staProtocol.setPakMk(true);
}
@@ -325,7 +328,7 @@
//鏉＄爜鎵弿鍣�
ArrayList<Integer> barcodeList = getBarcodeList();
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.602", (short) (barcodeList.size() * 8));
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.200", (short) (barcodeList.size() * 8));
if (result2.IsSuccess) {
for (int i = 0; i < barcodeList.size(); i++) {
Integer barcodeId = barcodeList.get(i);
@@ -339,7 +342,7 @@
//澶栧舰妫�娴�
ArrayList<Integer> staNoErrs = staNosErrList;
int staNoErrsSize = staNoErrs.size();
- OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.702", (short) (staNoErrsSize * 7));
+ OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.102", (short) (staNoErrsSize * 7));
if (resultErr.IsSuccess) {
for (int i = 0; i < staNoErrsSize; i++) {
Integer siteId = staNoErrs.get(i); // 绔欑偣缂栧彿
--
Gitblit v1.9.1