From 74e0eb7a7e84b5006903e79554c007d9d5fbbcbc Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 05 十月 2023 17:04:32 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/LiftProtocol.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 f323bc4..dcee8b0 100644
--- a/src/main/java/com/zy/core/model/protocol/LiftProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/LiftProtocol.java
@@ -147,20 +147,22 @@
// 鏄惁澶勪簬绌洪棽寰呭懡鐘舵��
public Boolean isIdle(Short taskNo) {
- if(this.taskNo == null
- || this.busy == null
+ if(this.busy == null
|| this.model == null
|| this.deviceError == null
|| this.pakMk == null
+ || this.token == null
){
return false;
}
- boolean res = (this.taskNo == 0 || this.taskNo.intValue() == taskNo.intValue())
- && !this.busy
+ boolean res =
+// (this.taskNo.equals(this.completeTaskNo) || this.taskNo.intValue() == taskNo.intValue())
+ !this.busy
&& this.model
&& !this.pakMk
&& !this.deviceError
+ && this.protocolStatusType.equals(LiftProtocolStatusType.IDLE)
;
return res;
}
@@ -177,12 +179,14 @@
return false;
}
- boolean res = this.taskNo == 0
- && !this.busy
+ boolean res =
+// this.taskNo.equals(this.completeTaskNo)
+ !this.busy
&& this.model
&& !this.pakMk
&& !this.deviceError
&& this.token == 0
+ && this.protocolStatusType.equals(LiftProtocolStatusType.IDLE)
;
return res;
}
--
Gitblit v1.9.1