From 5c0622d48c825ca4b75f63dda78d51ed75bc7a2f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 12 四月 2024 11:04:19 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/ShuttleCommandService.java | 23 ++++++-----------------
1 files changed, 6 insertions(+), 17 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 b805fc3..122398a 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
@@ -70,10 +70,7 @@
if (null == shuttleProtocol) {
return false;
}
- if (!shuttleProtocol.getIdle()) {//璁惧涓嶇┖闂�
- return false;
- }
- if (!shuttleProtocol.getPakMk()) {
+ if (!shuttleThread.isIdle()) {//璁惧涓嶇┖闂�
return false;
}
if (motionService.count(new LambdaQueryWrapper<Motion>()
@@ -94,14 +91,6 @@
LiftThread liftThread = null;
LiftProtocol liftProtocol = null;
-
- //鍒ゆ柇灏忚溅鐘舵��
- if (shuttleProtocol.getIdle()
- && shuttleProtocol.getProtocolStatusType().equals(ShuttleProtocolStatusType.IDLE)
- && shuttleProtocol.getTaskNo() != 0
- ) {
- return false;
- }
switch (Objects.requireNonNull(MotionCtgType.get(motion.getMotionCtgEl()))){
case SHUTTLE_MOVE:
@@ -269,11 +258,11 @@
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()) {
--
Gitblit v1.9.1