From cdc12aeeb8aca9061796a27ecc2ceb3aa61c3737 Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期二, 05 十一月 2024 09:40:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/enums/RgvStatusType.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/core/enums/RgvStatusType.java b/src/main/java/com/zy/core/enums/RgvStatusType.java
index 26c5663..39e2ecf 100644
--- a/src/main/java/com/zy/core/enums/RgvStatusType.java
+++ b/src/main/java/com/zy/core/enums/RgvStatusType.java
@@ -8,21 +8,27 @@
OFFLINE((short) -1, "绂荤嚎"),
IDLE((short) 0, "绌洪棽"),
PICK_WALK((short) 1, "鍙栬揣璧拌"),
+ PICK_WALK2((short) 21, "鍙栬揣璧拌2"),
PICK_WAIT((short) 2, "鍙栬揣绛夊緟"),
+ PICK_WAIT2((short) 22, "鍙栬揣绛夊緟2"),
PICK_WORKING((short) 3, "鍙栬揣涓�"),
+ PICK_WORKING2((short) 23, "鍙栬揣涓�2"),
RELEASE_WALK((short) 4, "鏀捐揣璧拌"),
+ RELEASE_WALK2((short) 24, "鏀捐揣璧拌2"),
OUTSTN1((short)5,"宸ヤ綔浣�1璇锋眰鍑虹珯"),
- OUTSTN8((short)6,"宸ヤ綔浣�2璇锋眰鍑虹珯"),
+ OUTSTN8((short)25,"宸ヤ綔浣�2璇锋眰鍑虹珯"),
- WALKING((short) 7, "鏀捐揣涓�"),
- WALKING2((short) 8, "绛夊緟璐т綅2浠诲姟鎵ц"),
+ WALKING((short) 6, "鏀捐揣涓�"),
+// WALKING2((short) 26, "鏀捐揣涓�2"),
+ WALKING2((short) 26, "绛夊緟璐т綅2浠诲姟鎵ц"),
WAITING((short) 90, "宸ヤ綅涓�浠诲姟瀹屾垚绛夊緟WCS纭"),
WAITING2((short) 91, "宸ヤ綅浜屼换鍔″畬鎴愮瓑寰匴CS纭"),
WAITING3((short)98,"鑱旀満浠诲姟涓柇"),
ALARM((short) 99, "鎶ヨ"),
OTHER((short) 100, "鍏朵粬"),
+ OTHER1000((short) 1000, "鏈煡"),
;
public Short id;
public String desc;
@@ -34,25 +40,25 @@
public static RgvStatusType get(Short id) {
if (null == id) {
- return null;
+ return OTHER1000;
}
for (RgvStatusType type : RgvStatusType.values()) {
if (type.id.equals(id)) {
return type;
}
}
- return null;
+ return OTHER1000;
}
public static RgvStatusType get(RgvStatusType type) {
if (null == type) {
- return null;
+ return OTHER1000;
}
for (RgvStatusType type1 : RgvStatusType.values()) {
if (type1 == type) {
return type1;
}
}
- return null;
+ return OTHER1000;
}
}
--
Gitblit v1.9.1