From 9c248839d8750db523fe6192101bfa085fe1305f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 26 三月 2024 16:20:23 +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/model/protocol/ShuttleProtocol.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/ShuttleProtocol.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/ShuttleProtocol.java
index d9a3147..9bf65b6 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/ShuttleProtocol.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/ShuttleProtocol.java
@@ -249,4 +249,23 @@
return currentLoc.getLocNo();
}
+ // 鏄惁澶勪簬绌洪棽寰呭懡鐘舵��
+ public Boolean isIdle() {
+ if (this.deviceStatus == null
+ || this.pakMk == null
+ || this.errorCode == null
+ || this.protocolStatus == null
+ ) {
+ return false;
+ }
+
+ boolean res = this.deviceStatus.equals(ShuttleDeviceStatusType.IDLE)
+ && this.pakMk
+ && !this.errorCode.equals("0")
+ && this.getTaskNo() == 0
+ && this.protocolStatus.intValue() == ShuttleProtocolStatusType.IDLE.id
+ ;
+ return res;
+ }
+
}
--
Gitblit v1.9.1