From 96868c07fba2beda4a33d4789abe43e01bafc61b Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期一, 26 九月 2022 14:34:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitbit/gzynwcs' into gzynwcs
---
src/main/java/com/zy/asrs/domain/enums/PackStatusType.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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 3b7b9ed..ccde3c2 100644
--- a/src/main/java/com/zy/asrs/domain/enums/PackStatusType.java
+++ b/src/main/java/com/zy/asrs/domain/enums/PackStatusType.java
@@ -12,6 +12,8 @@
LOC_WAIT_TESTINT("鍦ㄥ簱寰呮祴"),
// 鍦ㄥ簱娴嬭瘯涓�
LOC_TESTING("鍦ㄥ簱娴嬭瘯涓�"),
+ // 娴嬭瘯瀹屾垚
+ LOC_TESTEND("娴嬭瘯瀹屾垚"),
// 鍦ㄥ簱闈欑疆涓�
LOC_STAY("鍦ㄥ簱闈欑疆涓�"),
// 闈欑疆瀹屾垚
@@ -38,8 +40,10 @@
} else if (packStatus == 2){
return LOC_TESTING;
} else if (packStatus == 3){
- return LOC_STAY;
+ return LOC_TESTEND;
} else if (packStatus == 4){
+ return LOC_STAY;
+ } else if (packStatus == 5){
return LOC_STAY_OVER;
}
} else if (locSts.equals("O") || locSts.equals("S")){
--
Gitblit v1.9.1