From 020f48adb61a0350924783c1b397bd381d20ddc8 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期四, 19 六月 2025 11:13:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxtlfwcs' into jxtlfwcs
---
src/main/java/com/zy/asrs/domain/enums/PackStatusType.java | 33 +++++++++++++++------------------
1 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/domain/enums/PackStatusType.java b/src/main/java/com/zy/asrs/domain/enums/PackStatusType.java
index 73fee30..905bc95 100644
--- a/src/main/java/com/zy/asrs/domain/enums/PackStatusType.java
+++ b/src/main/java/com/zy/asrs/domain/enums/PackStatusType.java
@@ -7,22 +7,17 @@
public enum PackStatusType {
// 绌哄簱浣�
- MACHINE_AUTO("绌哄簱浣�"),
+ LOC_EMPTY("绌哄簱浣�"),
// 鍦ㄥ簱寰呮祴
- MACHINE_STOCK_MOVE("鍦ㄥ簱寰呮祴"),
+ LOC_WAIT_TESTINT("鍦ㄥ簱寰呮祴"),
// 鍦ㄥ簱娴嬭瘯涓�
- MACHINE_SITE_MOVE("鍦ㄥ簱娴嬭瘯涓�"),
+ LOC_TESTING("鍦ㄥ簱娴嬭瘯涓�"),
// 鍦ㄥ簱闈欑疆涓�
- MACHINE_PAKOUT("鍦ㄥ簱闈欑疆涓�"),
+ LOC_STAY("鍦ㄥ簱闈欑疆涓�"),
// 闈欑疆瀹屾垚
- MACHINE_PAKIN("闈欑疆瀹屾垚"),
+ LOC_STAY_OVER("闈欑疆瀹屾垚"),
// 寮傚父
- MACHINE_ERROR("寮傚父鎶ヨ"),
-
- // p to p
- MACHINE_P_MOVE("PToP"),
- // 闈炶嚜鍔�/鎵嬪姩
- MACHINE_UN_AUTO("闈炶嚜鍔�"),
+ LOC_ERROR("寮傚父鎶ヨ"),
;
private String desc;
@@ -36,19 +31,21 @@
public static PackStatusType process(String locSts, Integer packStatus, Integer fireStatus){
if(fireStatus == 1){
- return MACHINE_ERROR;
+ return LOC_ERROR;
} else if (locSts.equals("F") || locSts.equals("R") || locSts.equals("D")){
- if (packStatus == 1){
- return MACHINE_STOCK_MOVE;
+ if (packStatus == 1 && locSts.equals("F")){
+ return LOC_WAIT_TESTINT;//寰呮祴
} else if (packStatus == 2){
- return MACHINE_SITE_MOVE;
+ return LOC_TESTING; //娴嬭瘯涓�
} else if (packStatus == 3){
- return MACHINE_PAKOUT;
+ return LOC_STAY; //OK
} else if (packStatus == 4){
- return MACHINE_PAKIN;
+ return LOC_STAY_OVER; //NG
+ }else {
+ return LOC_EMPTY; //
}
} else if (locSts.equals("O") || locSts.equals("S")){
- return MACHINE_AUTO;
+ return LOC_EMPTY;
}
return null;
}
--
Gitblit v1.9.1