From 5252d40ed210204c9055207a834f1162f9616e08 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 04 十一月 2022 16:01:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 7 ++++++-
1 files changed, 6 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 d80a469..63a0566 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -82,7 +82,7 @@
//澶嶄綅娴嬭瘯淇″彿
case 3:
StaProtocol staProtocol = (StaProtocol)task.getData();
- siemensS7Net.Write("DB200." + staProtocol.getSiteId(), staProtocol.getStaNo());
+ siemensS7Net.Write("DB102.0" + staProtocol.getSiteId(), staProtocol.getStaNo());
break;
default:
break;
@@ -254,6 +254,11 @@
} else {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
log.info("杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", slave.getId(), JSON.toJSON(staProtocol));
+ Integer siteId = staProtocol.getSiteId();
+ staProtocol = station.get(siteId);
+ if ( siteId == 102 && (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0)) {
+ staProtocol.setPakMk(true);
+ }
}
}
--
Gitblit v1.9.1