From d2314059892561c4d9f89264db43cf92d741eb42 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 26 六月 2025 15:05:08 +0800
Subject: [PATCH] 完善待测
---
src/main/java/com/zy/asrs/domain/enums/PackStatusType.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 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 ccde3c2..905bc95 100644
--- a/src/main/java/com/zy/asrs/domain/enums/PackStatusType.java
+++ b/src/main/java/com/zy/asrs/domain/enums/PackStatusType.java
@@ -12,8 +12,6 @@
LOC_WAIT_TESTINT("鍦ㄥ簱寰呮祴"),
// 鍦ㄥ簱娴嬭瘯涓�
LOC_TESTING("鍦ㄥ簱娴嬭瘯涓�"),
- // 娴嬭瘯瀹屾垚
- LOC_TESTEND("娴嬭瘯瀹屾垚"),
// 鍦ㄥ簱闈欑疆涓�
LOC_STAY("鍦ㄥ簱闈欑疆涓�"),
// 闈欑疆瀹屾垚
@@ -35,16 +33,16 @@
if(fireStatus == 1){
return LOC_ERROR;
} else if (locSts.equals("F") || locSts.equals("R") || locSts.equals("D")){
- if (packStatus == 1){
- return LOC_WAIT_TESTINT;
+ if (packStatus == 1 && locSts.equals("F")){
+ return LOC_WAIT_TESTINT;//寰呮祴
} else if (packStatus == 2){
- return LOC_TESTING;
+ return LOC_TESTING; //娴嬭瘯涓�
} else if (packStatus == 3){
- return LOC_TESTEND;
+ return LOC_STAY; //OK
} else if (packStatus == 4){
- return LOC_STAY;
- } else if (packStatus == 5){
- return LOC_STAY_OVER;
+ return LOC_STAY_OVER; //NG
+ }else {
+ return LOC_EMPTY; //
}
} else if (locSts.equals("O") || locSts.equals("S")){
return LOC_EMPTY;
--
Gitblit v1.9.1