From ffbcb17a9ce705b443c3a450e3e3d56f13ee712f Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期二, 23 九月 2025 13:13:56 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/shuttle_rcs_dev' into shuttle_rcs_dev --- src/main/java/com/zy/core/thread/ForkLiftThread.java | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zy/core/thread/ForkLiftThread.java b/src/main/java/com/zy/core/thread/ForkLiftThread.java index 408ad8c..62fe964 100644 --- a/src/main/java/com/zy/core/thread/ForkLiftThread.java +++ b/src/main/java/com/zy/core/thread/ForkLiftThread.java @@ -26,6 +26,8 @@ CommandResponse move(ForkLiftCommand command);//灏忚溅鎹㈠眰 + CommandResponse switchIOMode(ForkLiftCommand command);//鍒囨崲鍑哄叆搴撴ā寮� + CommandResponse reset();//澶嶄綅 boolean isIdle();//鏄惁绌洪棽 @@ -38,16 +40,18 @@ boolean setSyncTaskNo(Integer taskNo);//璁剧疆宸ヤ綔鍙� - boolean switchIOMode(ForkLiftIoModeType type);//鍒囨崲鍑哄叆搴撴ā寮� - int generateDeviceTaskNo(int taskNo, ForkLiftTaskModeType type);//鐢熸垚纭欢璁惧宸ヤ綔鍙� //***************鑾峰彇鍛戒护***************** - List<ForkLiftCommand> getPickAndPutCommand(Integer taskNo, Integer pick, Integer put);//鍙栨斁璐ф寚浠� + ForkLiftCommand getPickAndPutCommand(Integer taskNo, Integer pick, Integer put);//鍙栨斁璐ф寚浠� - List<ForkLiftCommand> getShuttleSwitchCommand(Integer taskNo, Integer pick, Integer put);//灏忚溅鎹㈠眰 + ForkLiftCommand getShuttleSwitchCommand(Integer taskNo, Integer pick, Integer put);//灏忚溅鎹㈠眰 - List<ForkLiftCommand> getMoveCommand(Integer taskNo, Integer pick, Integer put);//鎻愬崌鏈虹Щ鍔� + ForkLiftCommand getMoveCommand(Integer taskNo, Integer pick, Integer put);//鎻愬崌鏈虹Щ鍔� + + ForkLiftCommand getSwitchIOCommand(Integer taskNo, ForkLiftIoModeType mode); + + ForkLiftCommand getResetCommand(Integer taskNo); } -- Gitblit v1.9.1