From 59f035bfb7170cc1f422c134d5909231e7208d91 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 23 九月 2022 13:06:01 +0800
Subject: [PATCH] #库位添加状态 3.测试完成

---
 src/main/java/com/zy/asrs/domain/enums/PackStatusType.java |    6 +++++-
 src/main/java/com/zy/asrs/entity/LocMast.java              |    4 +++-
 2 files changed, 8 insertions(+), 2 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")){
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 33aa00c..2a220ef 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -312,8 +312,10 @@
             case 2:
                 return "娴嬭瘯涓�";
             case 3:
-                return "闈欑疆涓�";
+                return "娴嬭瘯瀹屾垚";
             case 4:
+                return "闈欑疆涓�";
+            case 5:
                 return "闈欑疆瀹屾垚";
             default:
                 return String.valueOf(this.packStatus);

--
Gitblit v1.9.1