From 794d0e4115ea20b91e286405f346bd890f3702be Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 30 十一月 2022 16:18:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/SteProtocol.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/SteProtocol.java b/src/main/java/com/zy/core/model/protocol/SteProtocol.java
index 0b6a91a..dc815d7 100644
--- a/src/main/java/com/zy/core/model/protocol/SteProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/SteProtocol.java
@@ -70,6 +70,12 @@
*/
public Float charge = 0.0F;
+ public void setCharge(Float charge) {
+ if (charge >= 0) {
+ this.charge = charge;
+ }
+ }
+
/**
* 婊＄數
*/
@@ -190,6 +196,12 @@
*/
private Short chargeStatus;
+ // 鍏ュ簱鍙栫┖
+ private Boolean inEmpty;
+
+ // 鍑哄簱鍙栫┖
+ private Boolean outEmpty;
+
public void setStatus(Short status){
this.status = status;
this.statusType = SteStatusType.get(status);
@@ -251,6 +263,7 @@
// 鏄惁澶勪簬绌洪棽寰呭懡鐘舵��
public Boolean isIdle() {
boolean res = this.statusType.equals(SteStatusType.IDLE)
+ && this.mode == 1
&& this.pakMk.equals("N")
&& !isAlarm()
&& this.chargeStatus == 0
@@ -276,22 +289,10 @@
}
public Boolean isEnable() {
- if (Cools.isEmpty(row)) {
- if (row == 0) {
- return false;
- }
+ if (Cools.isEmpty(row, bay, lev)) {
+ return false;
}
- if (Cools.isEmpty(bay)) {
- if (bay == 0) {
- return false;
- }
- }
- if (Cools.isEmpty(lev)) {
- if (lev == 0) {
- return false;
- }
- }
- return true;
+ return row > 0 && bay > 0 && lev > 0;
}
}
--
Gitblit v1.9.1