From fad0239c357dfa96fed80028c97fa3634a92a2e5 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@63.com> Date: 星期二, 29 十一月 2022 15:05:55 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/model/protocol/SteProtocol.java | 7 +++++++ 1 files changed, 7 insertions(+), 0 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..036a718 100644 --- a/src/main/java/com/zy/core/model/protocol/SteProtocol.java +++ b/src/main/java/com/zy/core/model/protocol/SteProtocol.java @@ -190,6 +190,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 +257,7 @@ // 鏄惁澶勪簬绌洪棽寰呭懡鐘舵�� public Boolean isIdle() { boolean res = this.statusType.equals(SteStatusType.IDLE) + && this.mode == 1 && this.pakMk.equals("N") && !isAlarm() && this.chargeStatus == 0 -- Gitblit v1.9.1