From 33b4d29eb2ba86f3480b5060f863c45818592ba3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 16 四月 2024 14:47:31 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/ShuttleThread.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 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 2f31443..f00efde 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,8 +1,11 @@
package com.zy.asrs.wcs.rcs.thread;
+import com.zy.asrs.wcs.common.ExecuteSupport;
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;
@@ -23,7 +26,27 @@
boolean reset(ShuttleCommand command);//澶嶄綅寮�鍏�
- boolean isIdle();//鏄惁绌洪棽
+ boolean isIdle();
+
+ boolean isIdle(ExecuteSupport support);//鏄惁绌洪棽
+
+ boolean isDeviceIdle();//璁惧鏄惁绌洪棽
+
+ 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);//璁剧疆鏍囪
//***************鑾峰彇鍛戒护*****************
--
Gitblit v1.9.1