From 8ba4ddfed043b20b0a15316141a9be10162ba664 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期一, 12 十二月 2022 12:17:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfwcs_tqs' into bfwcs_tqs
---
src/main/java/com/zy/core/thread/SteThread.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SteThread.java b/src/main/java/com/zy/core/thread/SteThread.java
index d6be176..41a37c8 100644
--- a/src/main/java/com/zy/core/thread/SteThread.java
+++ b/src/main/java/com/zy/core/thread/SteThread.java
@@ -233,6 +233,9 @@
OperateResult result = null;
// 寮�濮嬩换鍔�
if (!command.getComplete()) {
+ //缁勭粐浠诲姟鍓嶏紝鍏堟竻绌哄啓浠诲姟纭浣嶏紝浠ュ強浠诲姟瀹屾垚纭浣�
+ siemensS7Net.Write("V2000.0", false);
+ siemensS7Net.Write("V2000.1", false);
// 1.浠诲姟鍙�
OperateResult result0 = siemensS7Net.Write("V998", command.getTaskNo().shortValue());
try {
@@ -274,6 +277,7 @@
log.info("鏀跺埌绌挎鏉跨‘璁や俊鍙峰悗鍑嗗缁欏浣嶆爣璁帮紝绌挎鏉縄D={}, 浠诲姟鍙�={}, 绌挎鏉跨姸鎬�={}",slave.getId(), steProtocol.getTaskNo(),steProtocol.getStatus());
siemensS7Net.Write("V998", (short) 0);
siemensS7Net.Write("V1000", (short) 0);
+ siemensS7Net.Write("V2000.0", false);
result = siemensS7Net.Write("V2000.1", true);
}
@@ -318,7 +322,7 @@
OutputQueue.STE.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
try {
- Thread.sleep(200);
+ Thread.sleep(500);
} catch (Exception e){
}
@@ -326,7 +330,9 @@
if (result1.IsSuccess) {
short taskNo = siemensS7Net.getByteTransform().TransInt16(result1.Content, 0);
short taskType = siemensS7Net.getByteTransform().TransInt16(result1.Content, 2);
+ readStatus();
log.info("绌挎鏉夸换鍔′笅鍙戞垚鍔熷悗浼戠湢200ms绔嬪嵆鍥炶鍐欏叆鏁版嵁锛岀┛姊澘ID={}, 浠诲姟鍙�={}, 浣滀笟绫诲瀷={}",slave.getId(), taskNo, taskType);
+ log.info("绌挎鏉夸换鍔′笅鍙戞垚鍔熷悗浼戠湢200ms绔嬪嵆鍥炶绌挎鏉跨姸鎬侊紝绌挎鏉縄D={}, 浠诲姟鍙�={}, 绌挎鏉跨姸鎬�={}",slave.getId(), steProtocol.getTaskNo(),steProtocol.getStatus());
}
return true;
--
Gitblit v1.9.1