From 16b12d978e1055e5800e2a4a0da897e057987ec0 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 25 七月 2023 10:09:34 +0800
Subject: [PATCH] 捡料
---
src/main/java/com/zy/core/model/protocol/LiftProtocol.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 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 790bb2f..a080395 100644
--- a/src/main/java/com/zy/core/model/protocol/LiftProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/LiftProtocol.java
@@ -22,7 +22,7 @@
/**
* 鎻愬崌鏈哄唴閮ㄤ簩缁寸爜
*/
- private Short barcode = 1699;
+ private Short barcode = 1661;
/**
* 浠诲姟鍙�
@@ -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