From 63c44c444e567a90ef6ddba21cb03bb06c43b41a Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期日, 16 十月 2022 10:25:06 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/domain/enums/PackStatusType.java | 10 ++++------
src/main/java/com/zy/asrs/entity/LocMast.java | 10 ++++++++--
2 files changed, 12 insertions(+), 8 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..1d3265e 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("鍦ㄥ簱闈欑疆涓�"),
// 闈欑疆瀹屾垚
@@ -39,12 +37,12 @@
return LOC_WAIT_TESTINT;
} else if (packStatus == 2){
return LOC_TESTING;
- } else if (packStatus == 3){
- return LOC_TESTEND;
- } else if (packStatus == 4){
- return LOC_STAY;
} else if (packStatus == 5){
+ return LOC_STAY;
+ } else if (packStatus == 6){
return LOC_STAY_OVER;
+ }else {
+ return LOC_EMPTY;
}
} else if (locSts.equals("O") || locSts.equals("S")){
return LOC_EMPTY;
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 1bdae9f..29eaf0e 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -189,7 +189,7 @@
private Integer fireStatus;
/**
- * 浜у搧鐘舵�亄0:鏃�,1:寰呮祴,2:娴嬭瘯涓�;3.闈欑疆涓�;4:闈欑疆瀹屾垚}
+ * 浜у搧鐘舵�亄0:鏃�,1:寰呮祴,2:娴嬭瘯涓�;3.娴嬭瘯瀹屾垚;4.娴嬭瘯澶辫触;5.闈欑疆涓�;6:闈欑疆瀹屾垚;7:鏆傚仠娴嬭瘯;8:绱ф�ュ嚭搴�;}
*/
@ApiModelProperty(value= "浜у搧鐘舵�亄0:鏃�,1:寰呮祴,2:娴嬭瘯涓�;3.闈欑疆涓�;4:闈欑疆瀹屾垚}")
@TableField("pack_status")
@@ -317,9 +317,15 @@
case 3:
return "娴嬭瘯瀹屾垚";
case 4:
- return "闈欑疆涓�";
+ return "娴嬭瘯NG";
case 5:
+ return "闈欑疆涓�";
+ case 6:
return "闈欑疆瀹屾垚";
+ case 7:
+ return "鏆傚仠娴嬭瘯";
+ case 8:
+ return "绱ф�ュ嚭搴�";
default:
return String.valueOf(this.packStatus);
}
--
Gitblit v1.9.1