From 00d9f3f5cf3b046cb42098c9bc13f2313a435f53 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 27 六月 2023 10:32:50 +0800
Subject: [PATCH] 提升机搬运前判断目标站是否可入
---
src/main/java/com/zy/core/model/protocol/LiftProtocol.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/LiftProtocol.java b/src/main/java/com/zy/core/model/protocol/LiftProtocol.java
index 419beee..790bb2f 100644
--- a/src/main/java/com/zy/core/model/protocol/LiftProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/LiftProtocol.java
@@ -268,8 +268,30 @@
return res;
}
+ // 鏄惁澶勪簬绌洪棽寰呭懡鐘舵�侊紝涓嶅垽鏂换鍔″彿
+ public Boolean isIdleNoTask() {
+ if(this.taskNo == null
+ || this.liftLock == null
+ || this.ready == null
+ || this.running == null
+ || this.mode == null
+ || this.pakMk == null
+ ){
+ return false;
+ }
+
+ boolean res = !this.liftLock
+// && this.ready
+ && !this.running
+ && this.mode
+ && this.pakMk
+ && !this.securityMk
+ ;
+ return res;
+ }
+
public void setPositionArrivalFeedback(Short position) {
- Short lev = 1;
+ Short lev = null;
switch (position) {
case 1:
lev = 1;
--
Gitblit v1.9.1