From ee5e6e5d4714358de0371f83d02739cb765b4dbf Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 01 七月 2023 08:18:29 +0800
Subject: [PATCH] fixed

---
 src/main/java/com/zy/core/model/protocol/LiftProtocol.java |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 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 790bb2f..1eebef4 100644
--- a/src/main/java/com/zy/core/model/protocol/LiftProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/LiftProtocol.java
@@ -246,6 +246,29 @@
     }
 
     // 鏄惁澶勪簬绌洪棽寰呭懡鐘舵��
+    public Boolean isIdle(Short taskNo) {
+        if(this.taskNo == null
+                || this.liftLock == null
+                || this.ready == null
+                || this.running == null
+                || this.mode == null
+                || this.pakMk == null
+        ){
+            return false;
+        }
+
+        boolean res = (this.taskNo == 0 || this.taskNo.intValue() == taskNo.intValue())
+                && !this.liftLock
+//                && this.ready
+                && !this.running
+                && this.mode
+                && this.pakMk.equals(true)
+                && !this.securityMk
+                ;
+        return res;
+    }
+
+    // 鏄惁澶勪簬绌洪棽寰呭懡鐘舵��
     public Boolean isIdle() {
         if(this.taskNo == null
                 || this.liftLock == null

--
Gitblit v1.9.1