From dd3fb4ab39ede8427e3f106fc5c654ea6562365c Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期六, 13 四月 2024 11:40:08 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/ShuttleCommandService.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/ShuttleCommandService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/ShuttleCommandService.java
index 33e9853..f15d1ae 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/ShuttleCommandService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/ShuttleCommandService.java
@@ -252,17 +252,17 @@
//鍏呯數浠诲姟
if (Objects.requireNonNull(MotionCtgType.get(motion.getMotionCtgEl())).equals(MotionCtgType.SHUTTLE_CHARGE_ON)) {
// 澶嶄綅绌挎杞�
- shuttleProtocol.setTaskNo(0);
+ shuttleProtocol.setSyncTaskNo(0);
shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.IDLE);
shuttleProtocol.setPakMk(true);
return true;
}
-// if (!shuttleProtocol.getProtocolStatusType().equals(ShuttleProtocolStatusType.WAITING)
-// && !shuttleProtocol.getProtocolStatusType().equals(ShuttleProtocolStatusType.CHARGING_WAITING)
-// ) {
-// return false;
-// }
+ if (!shuttleProtocol.getProtocolStatusType().equals(ShuttleProtocolStatusType.WAITING)
+ && !shuttleProtocol.getProtocolStatusType().equals(ShuttleProtocolStatusType.CHARGING_WAITING)
+ ) {
+ return false;
+ }
//鍒ゆ柇璁惧鏄惁绌洪棽
if (!shuttleThread.isIdle()) {
@@ -323,7 +323,7 @@
}
// 澶嶄綅绌挎杞�
- shuttleProtocol.setTaskNo(0);
+ shuttleProtocol.setSyncTaskNo(0);
shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.IDLE);
shuttleProtocol.setPakMk(true);
--
Gitblit v1.9.1