From 763863395f8c2174cd754ba04d3561d32e29d066 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期日, 07 四月 2024 08:17:50 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java
index 4a15a5d..0314e53 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java
@@ -85,10 +85,8 @@
return false;
}
- //鍥涘悜绌挎杞︾┖闂层�佹湁浠诲姟銆佹爣璁颁负true銆佸瓨鍦ㄤ换鍔℃寚浠わ紝闇�瑕佹墽琛屼换鍔＄殑涓嬩竴鏉℃寚浠�
- if (!shuttleProtocol.getIdle()
- || shuttleProtocol.getTaskNo() == 0
- || !shuttleProtocol.getPakMk()) {
+ //鍒ゆ柇璁惧鏄惁绌洪棽
+ if (!shuttleThread.isIdle()) {
return false;
}
@@ -136,8 +134,8 @@
if (!shuttleProtocol.getHasLift()) {
command.setComplete(true);
}
- } else if (command.getMode() == ShuttleCommandModeType.CHARGE.id) {
- // 鍏呯數寮�鍏�
+ } else if (command.getMode() == ShuttleCommandModeType.CHARGE_OPEN.id) {
+ // 鍏呯數寮�
//鍒ゆ柇灏忚溅鍏呯數鐘舵��
if (shuttleProtocol.getHasCharge()) {
command.setComplete(true);
@@ -211,7 +209,8 @@
} else if (command.getMode() == ShuttleCommandModeType.PALLET_LIFT.id
|| command.getMode() == ShuttleCommandModeType.PALLET_DOWN.id) {//椤跺崌
result = shuttleThread.lift(command);
- } else if (command.getMode() == ShuttleCommandModeType.CHARGE.id) {//鍏呯數
+ } else if (command.getMode() == ShuttleCommandModeType.CHARGE_OPEN.id
+ || command.getMode() == ShuttleCommandModeType.CHARGE_CLOSE.id) {//鍏呯數
result = shuttleThread.charge(command);
} else if (command.getMode() == ShuttleCommandModeType.RESET.id) {//澶嶄綅
result = shuttleThread.reset(command);
--
Gitblit v1.9.1