From 14a6067ac871ed3c0d73ee1d1939db7a7aefe13a Mon Sep 17 00:00:00 2001 From: Junjie <xjj@123> Date: 星期五, 10 五月 2024 08:43:28 +0800 Subject: [PATCH] # --- zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/ShuttleThread.java | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/ShuttleThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/ShuttleThread.java index 4d17bc2..e3fe09f 100644 --- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/ShuttleThread.java +++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/ShuttleThread.java @@ -1,16 +1,21 @@ package com.zy.asrs.wcs.rcs.thread; import com.zy.asrs.wcs.common.ExecuteSupport; +import com.zy.asrs.wcs.core.domain.param.ShuttleMoveLocParam; import com.zy.asrs.wcs.core.model.NavigateNode; import com.zy.asrs.wcs.core.model.command.ShuttleCommand; +import com.zy.asrs.wcs.core.model.enums.MotionCtgType; import com.zy.asrs.wcs.rcs.entity.Device; +import com.zy.asrs.wcs.rcs.model.enums.ShuttleProtocolStatusType; import com.zy.asrs.wcs.rcs.model.protocol.ShuttleProtocol; import java.util.List; public interface ShuttleThread extends ThreadHandler{ - ShuttleProtocol getStatus();//鑾峰彇鍥涘悜绌挎杞︾姸鎬� + ShuttleProtocol getStatus(boolean clone);//鑾峰彇鍥涘悜绌挎杞︾姸鎬� + + ShuttleProtocol getStatus();//鑾峰彇鍥涘悜绌挎杞︾姸鎬�-榛樿clone Device getDevice();//鑾峰彇璁惧淇℃伅 @@ -28,15 +33,31 @@ boolean isIdle(ExecuteSupport support);//鏄惁绌洪棽 + boolean isDeviceIdle();//璁惧鏄惁绌洪棽 + + boolean isDeviceIdle(ExecuteSupport support);//璁惧鏄惁绌洪棽 + boolean isRequireCharge();//鏄惁婊¤冻鍏呯數鐘舵�� boolean isCharging();//鏄惁鍏呯數涓� boolean isChargingCompleted();//鏄惁鍏呯數瀹屾垚 + List<NavigateNode> getMoveAdvancePath();//鑾峰彇绌挎杞︿换鍔¤矾寰� + + int generateDeviceTaskNo(int taskNo, MotionCtgType motionCtgType);//鐢熸垚纭欢璁惧宸ヤ綔鍙� + + boolean setProtocolStatus(ShuttleProtocolStatusType status);//璁剧疆宸ヤ綔鐘舵�� + + boolean setSyncTaskNo(Integer taskNo);//璁剧疆宸ヤ綔鍙� + + boolean setPakMk(boolean pakMk);//璁剧疆鏍囪 + + boolean enableMoveLoc(ShuttleMoveLocParam param); + //***************鑾峰彇鍛戒护***************** - ShuttleCommand getMoveCommand(Integer taskNo, String startCodeNum, String distCodeNum, Integer allDistance, Integer runDirection, Integer runSpeed);//鑾峰彇绉诲姩鍛戒护 + ShuttleCommand getMoveCommand(Integer taskNo, String startCodeNum, String distCodeNum, Integer allDistance, Integer runDirection, Integer runSpeed, List<NavigateNode> nodes);//鑾峰彇绉诲姩鍛戒护 ShuttleCommand getLiftCommand(Integer taskNo, Boolean lift);//椤跺崌鍛戒护 true=>椤跺崌 false=>涓嬮檷 -- Gitblit v1.9.1