From 412c5291467a5812af769156912dca6024abc8f1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 14 三月 2022 16:51:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/command/SteCommand.java | 6 +++---
src/main/java/com/zy/core/thread/SteThread.java | 7 +++----
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +-
src/main/java/com/zy/core/enums/SteStatusType.java | 1 -
4 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index cc8bac1..9db8122 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1115,7 +1115,7 @@
SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, ste.getId());
SteProtocol steProtocol = steThread.getSteProtocol();
if (steProtocol == null) { continue; }
- if (steProtocol.getStatusType().equals(SteStatusType.WAITING) && steProtocol.getTaskNo() != 0) {
+ if (steProtocol.getWaiting() && steProtocol.getTaskNo() != 0) {
// 鏌ヨ鏄惁鏈夊緟鍏ュ簱鐨勪换鍔�
WrkMast wrkMast = wrkMastMapper.selectCarWaiting(steProtocol.getTaskNo());
if (wrkMast == null) { continue; }
diff --git a/src/main/java/com/zy/core/enums/SteStatusType.java b/src/main/java/com/zy/core/enums/SteStatusType.java
index 93dc683..4bceeba 100644
--- a/src/main/java/com/zy/core/enums/SteStatusType.java
+++ b/src/main/java/com/zy/core/enums/SteStatusType.java
@@ -5,7 +5,6 @@
IDLE(0, "绌洪棽"),
MOVING(1, "浣滀笟涓�"),
SOS(2, "鎶ヨ"),
- WAITING(3, "浠诲姟瀹屾垚绛夊緟WCS纭"),
;
public Integer id;
diff --git a/src/main/java/com/zy/core/model/command/SteCommand.java b/src/main/java/com/zy/core/model/command/SteCommand.java
index 4d0facb..cbb1686 100644
--- a/src/main/java/com/zy/core/model/command/SteCommand.java
+++ b/src/main/java/com/zy/core/model/command/SteCommand.java
@@ -21,10 +21,10 @@
private Short taskMode = 0;
// 姝ｅ湪鎵ц浠诲姟
- public Boolean execute;
+ public Boolean execute = Boolean.FALSE;
- // 浠诲姟瀹屾垚锛岀瓑寰匴CS纭
- public Boolean waiting;
+ // 纭浠诲姟瀹屾垚
+ public Boolean complete = Boolean.FALSE;
@JSONField(serialize = false)
private SteTaskModeType taskModeType;
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