From 0f69561e397093b5165c4aac58530721d5c62178 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 25 十一月 2024 11:03:16 +0800
Subject: [PATCH] #led

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/ShuttleThread.java |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 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 e3fe09f..7c9f4f2 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
@@ -6,6 +6,7 @@
 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.CommandResponse;
 import com.zy.asrs.wcs.rcs.model.enums.ShuttleProtocolStatusType;
 import com.zy.asrs.wcs.rcs.model.protocol.ShuttleProtocol;
 
@@ -19,15 +20,17 @@
 
     Device getDevice();//鑾峰彇璁惧淇℃伅
 
-    boolean movePath(List<NavigateNode> nodes, Integer taskNo);//璺緞涓嬪彂
+    CommandResponse movePath(List<NavigateNode> nodes, Integer taskNo);//璺緞涓嬪彂
 
-    boolean move(ShuttleCommand command);//绉诲姩
+    CommandResponse move(ShuttleCommand command);//绉诲姩
 
-    boolean lift(ShuttleCommand command);//椤跺崌
+    CommandResponse lift(ShuttleCommand command);//椤跺崌
 
-    boolean charge(ShuttleCommand command);//鍏呯數寮�鍏�
+    CommandResponse charge(ShuttleCommand command);//鍏呯數寮�鍏�
 
-    boolean reset(ShuttleCommand command);//澶嶄綅寮�鍏�
+    CommandResponse reset(ShuttleCommand command);//澶嶄綅寮�鍏�
+
+    CommandResponse updateLocation(ShuttleCommand command);//鏇存柊鍧愭爣
 
     boolean isIdle();
 
@@ -53,7 +56,9 @@
 
     boolean setPakMk(boolean pakMk);//璁剧疆鏍囪
 
-    boolean enableMoveLoc(ShuttleMoveLocParam param);
+    boolean enableMoveLoc(ShuttleMoveLocParam param, boolean enable);
+
+    boolean requestWaiting();
 
     //***************鑾峰彇鍛戒护*****************
 
@@ -63,4 +68,6 @@
 
     ShuttleCommand getChargeCommand(Integer taskNo, Boolean charge);//鍏呯數寮�鍏冲懡浠� true=>寮� false=>鍏�
 
+    ShuttleCommand getUpdateLocationCommand(Integer taskNo, String locNo);//鑾峰彇鏇存柊鍧愭爣鍛戒护
+
 }

--
Gitblit v1.9.1