From f19e1f429e3405202957b9c3dacbec06f0764a05 Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期二, 15 三月 2022 14:51:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SteThread.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SteThread.java b/src/main/java/com/zy/core/thread/SteThread.java
index 9880419..2d45b85 100644
--- a/src/main/java/com/zy/core/thread/SteThread.java
+++ b/src/main/java/com/zy/core/thread/SteThread.java
@@ -15,7 +15,6 @@
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.enums.SlaveType;
-import com.zy.core.enums.SteStatusType;
import com.zy.core.model.SteSlave;
import com.zy.core.model.Task;
import com.zy.core.model.command.SteCommand;
@@ -176,10 +175,10 @@
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
// 澶嶄綅淇″彿
- if (steProtocol.getStatusType().equals(SteStatusType.WAITING)) {
+ if (steProtocol.getWaiting()) {
if (resetFlag) {
SteCommand steCommand = new SteCommand();
-// steCommand.setAckFinish((short)1);
+ steCommand.setComplete(true);
if (write(steCommand) && confirmPos()) {
resetFlag = false;
}
@@ -221,7 +220,7 @@
command.setSteNo(slave.getId());
OperateResult result = null;
// 寮�濮嬩换鍔�
- if (!command.getWaiting()) {
+ if (!command.getComplete()) {
OperateResult result0 = siemensS7Net.Write("D0", command.getTaskNo());
short[] array = new short[10];
array[0] = command.getTaskMode();
--
Gitblit v1.9.1