From 94860d0ab6d9fedf9413b2083eb9af17d8bd7d54 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 28 九月 2022 13:44:11 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/SteProtocol.java | 49 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 39 insertions(+), 10 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 726504c..0b6a91a 100644
--- a/src/main/java/com/zy/core/model/protocol/SteProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/SteProtocol.java
@@ -185,6 +185,11 @@
*/
public Short crnAllowRun;
+ /**
+ * 鍏呯數鐘舵�� 1锛氬湪鍏呯數锛�0锛氫笉鍦ㄥ厖鐢�
+ */
+ private Short chargeStatus;
+
public void setStatus(Short status){
this.status = status;
this.statusType = SteStatusType.get(status);
@@ -229,15 +234,17 @@
basSte.setSteErr(alarm.longValue());
}
basSte.setWrkNo(taskNo.intValue());
- if (!Cools.isEmpty(row)) {
- basSte.setRow(row.intValue());
- }
- if (!Cools.isEmpty(bay)) {
- basSte.setBay(bay.intValue());
- }
- if (!Cools.isEmpty(lev)) {
- basSte.setLev(lev.intValue());
- }
+// if (basSte.getPakMk().equals("N")) {
+// if (!Cools.isEmpty(row)) {
+// basSte.setRow(row.intValue());
+// }
+// if (!Cools.isEmpty(bay)) {
+// basSte.setBay(bay.intValue());
+// }
+// if (!Cools.isEmpty(lev)) {
+// basSte.setLev(lev.intValue());
+// }
+// }
return basSte;
}
@@ -245,7 +252,10 @@
public Boolean isIdle() {
boolean res = this.statusType.equals(SteStatusType.IDLE)
&& this.pakMk.equals("N")
- && !isAlarm();
+ && !isAlarm()
+ && this.chargeStatus == 0
+ && isEnable()
+ ;
if (!res) {
return res;
} else {
@@ -265,4 +275,23 @@
return this.alarm > 1;
}
+ public Boolean isEnable() {
+ if (Cools.isEmpty(row)) {
+ if (row == 0) {
+ return false;
+ }
+ }
+ if (Cools.isEmpty(bay)) {
+ if (bay == 0) {
+ return false;
+ }
+ }
+ if (Cools.isEmpty(lev)) {
+ if (lev == 0) {
+ return false;
+ }
+ }
+ return true;
+ }
+
}
--
Gitblit v1.9.1