From aa9c0c31a023efcac1e9a0c3b5796cdf482b2276 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期日, 15 六月 2025 11:52:22 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/LiftThread.java | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/LiftThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/LiftThread.java
index b93e6eb..1774650 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/LiftThread.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/LiftThread.java
@@ -1,11 +1,16 @@
package com.zy.asrs.wcs.rcs.thread;
import com.zy.asrs.wcs.common.ExecuteSupport;
+import com.zy.asrs.wcs.core.entity.Motion;
import com.zy.asrs.wcs.core.model.command.LiftCommand;
import com.zy.asrs.wcs.core.model.enums.LiftCommandModeType;
+import com.zy.asrs.wcs.core.model.enums.MotionCtgType;
import com.zy.asrs.wcs.rcs.entity.Device;
+import com.zy.asrs.wcs.rcs.model.CommandResponse;
import com.zy.asrs.wcs.rcs.model.enums.LiftProtocolStatusType;
import com.zy.asrs.wcs.rcs.model.protocol.LiftProtocol;
+
+import java.util.List;
public interface LiftThread extends ThreadHandler{
@@ -13,19 +18,23 @@
Device getDevice();//鑾峰彇璁惧淇℃伅
- boolean move(LiftCommand command);//鍗囬檷绉诲姩
+ CommandResponse move(LiftCommand command);//鍗囬檷绉诲姩
- boolean palletInOut(LiftCommand command);//鎵樼洏鍑哄叆
+ CommandResponse palletInOut(LiftCommand command);//鎵樼洏鍑哄叆
- boolean lock(LiftCommand command);//閿佸畾鎻愬崌鏈�
+ CommandResponse lock(LiftCommand command);//閿佸畾鎻愬崌鏈�
- boolean unlock(LiftCommand command);//瑙ｉ攣鎻愬崌鏈�
+ CommandResponse unlock(LiftCommand command);//瑙ｉ攣鎻愬崌鏈�
- boolean reset(LiftCommand command);//澶嶄綅
+ CommandResponse reset(LiftCommand command);//澶嶄綅
boolean isIdle();//鏄惁绌洪棽
- boolean isIdle(ExecuteSupport support);//鏄惁绌洪棽
+ boolean isIdle(MotionCtgType flag);//鏄惁绌洪棽
+
+ boolean isDeviceIdle();//璁惧鏄惁绌洪棽
+
+ boolean isDeviceIdle(ExecuteSupport support);//璁惧鏄惁绌洪棽
boolean setProtocolStatus(LiftProtocolStatusType status);//璁剧疆宸ヤ綔鐘舵��
@@ -33,15 +42,17 @@
boolean isLock(ExecuteSupport support);
+ int generateDeviceTaskNo(int taskNo, MotionCtgType motionCtgType);//鐢熸垚纭欢璁惧宸ヤ綔鍙�
+
//***************鑾峰彇鍛戒护*****************
- LiftCommand getMoveCommand(Integer taskNo, Integer sourceLev, Integer targetLev, LiftCommandModeType mode);//鎻愬崌鏈虹Щ鍔�
+ List<LiftCommand> getMoveCommand(Integer taskNo, Integer sourceLev, Integer targetLev, LiftCommandModeType mode);//鎻愬崌鏈虹Щ鍔�
- LiftCommand getMoveWithShuttleCommand(Integer taskNo, Integer sourceLev, Integer targetLev, LiftCommandModeType mode);//杞借溅绉诲姩
+ List<LiftCommand> getMoveWithShuttleCommand(Integer taskNo, Integer sourceLev, Integer targetLev, LiftCommandModeType mode);//杞借溅绉诲姩
- LiftCommand getPalletInOutCommand(Integer taskNo, Integer sourceLev, Integer targetLev, Integer originSta, Integer targetSta, LiftCommandModeType mode);//鎵樼洏鍑哄叆
+ List<LiftCommand> getPalletInOutCommand(Integer taskNo, Integer sourceLev, Integer targetLev, Integer originSta, Integer targetSta, LiftCommandModeType mode);//鎵樼洏鍑哄叆
- LiftCommand getLockCommand(Integer taskNo, Boolean lock);//閿佸畾/瑙ｉ攣鎻愬崌鏈�
+ List<LiftCommand> getLockCommand(Integer taskNo, Boolean lock);//閿佸畾/瑙ｉ攣鎻愬崌鏈�
- LiftCommand getShuttleSignalCommand(Integer taskNo, Boolean signal);//灏忚溅宸插埌浣�/宸查┒绂讳俊鍙�
+ List<LiftCommand> getShuttleSignalCommand(Integer taskNo, Boolean signal);//灏忚溅宸插埌浣�/宸查┒绂讳俊鍙�
}
--
Gitblit v1.9.1