From 7180e7e7c548c78f327a9f66c2bc89af64039e7e Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 12 六月 2024 13:10:38 +0800
Subject: [PATCH] #

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/ShuttleThread.java |   11 +++++++++--
 1 files changed, 9 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 f00efde..671e5f7 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,6 +1,7 @@
 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;
@@ -12,7 +13,9 @@
 
 public interface ShuttleThread extends ThreadHandler{
 
-    ShuttleProtocol getStatus();//鑾峰彇鍥涘悜绌挎杞︾姸鎬�
+    ShuttleProtocol getStatus(boolean clone);//鑾峰彇鍥涘悜绌挎杞︾姸鎬�
+
+    ShuttleProtocol getStatus();//鑾峰彇鍥涘悜绌挎杞︾姸鎬�-榛樿clone
 
     Device getDevice();//鑾峰彇璁惧淇℃伅
 
@@ -32,6 +35,8 @@
 
     boolean isDeviceIdle();//璁惧鏄惁绌洪棽
 
+    boolean isDeviceIdle(ExecuteSupport support);//璁惧鏄惁绌洪棽
+
     boolean isRequireCharge();//鏄惁婊¤冻鍏呯數鐘舵��
 
     boolean isCharging();//鏄惁鍏呯數涓�
@@ -48,9 +53,11 @@
 
     boolean setPakMk(boolean pakMk);//璁剧疆鏍囪
 
+    boolean enableMoveLoc(ShuttleMoveLocParam param, boolean enable);
+
     //***************鑾峰彇鍛戒护*****************
 
-    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