From 52f664f561bb5c2c7811d0f1c35fedf70684a83d Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 12 四月 2024 10:24:10 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/ShuttleCommandService.java | 26 +++++++++-----------------
1 files changed, 9 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 e276f9a..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
@@ -63,14 +63,14 @@
public Boolean accept(Motion motion) {
Integer deviceNo = Integer.parseInt(motion.getDevice());
ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, deviceNo);
+ if (shuttleThread == null) {
+ return false;
+ }
ShuttleProtocol shuttleProtocol = shuttleThread.getStatus();
if (null == shuttleProtocol) {
return false;
}
- if (!shuttleProtocol.getIdle()) {//璁惧涓嶇┖闂�
- return false;
- }
- if (!shuttleProtocol.getPakMk()) {
+ if (!shuttleThread.isIdle()) {//璁惧涓嶇┖闂�
return false;
}
if (motionService.count(new LambdaQueryWrapper<Motion>()
@@ -91,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:
@@ -266,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