From aa73bc92cf889589097267ad72edb2528a2b6b7e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 30 十一月 2022 17:09:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/SteProtocol.java | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 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 c2c8f60..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;
+ }
+ }
+
/**
* 婊＄數
*/
@@ -185,6 +191,17 @@
*/
public Short crnAllowRun;
+ /**
+ * 鍏呯數鐘舵�� 1锛氬湪鍏呯數锛�0锛氫笉鍦ㄥ厖鐢�
+ */
+ private Short chargeStatus;
+
+ // 鍏ュ簱鍙栫┖
+ private Boolean inEmpty;
+
+ // 鍑哄簱鍙栫┖
+ private Boolean outEmpty;
+
public void setStatus(Short status){
this.status = status;
this.statusType = SteStatusType.get(status);
@@ -229,7 +246,7 @@
basSte.setSteErr(alarm.longValue());
}
basSte.setWrkNo(taskNo.intValue());
- if (basSte.getPakMk().equals("N")) {
+// if (basSte.getPakMk().equals("N")) {
// if (!Cools.isEmpty(row)) {
// basSte.setRow(row.intValue());
// }
@@ -239,15 +256,19 @@
// if (!Cools.isEmpty(lev)) {
// basSte.setLev(lev.intValue());
// }
- }
+// }
return basSte;
}
// 鏄惁澶勪簬绌洪棽寰呭懡鐘舵��
public Boolean isIdle() {
boolean res = this.statusType.equals(SteStatusType.IDLE)
+ && this.mode == 1
&& this.pakMk.equals("N")
- && !isAlarm();
+ && !isAlarm()
+ && this.chargeStatus == 0
+ && isEnable()
+ ;
if (!res) {
return res;
} else {
@@ -267,4 +288,11 @@
return this.alarm > 1;
}
+ public Boolean isEnable() {
+ if (Cools.isEmpty(row, bay, lev)) {
+ return false;
+ }
+ return row > 0 && bay > 0 && lev > 0;
+ }
+
}
--
Gitblit v1.9.1