From e920cc2215d036bd43ed87620ff65d25b9827625 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 03 九月 2025 17:11:52 +0800
Subject: [PATCH] 许可证有效期”改成“仓储系统许可有效期
---
src/main/java/com/zy/asrs/entity/LocMast.java | 62 +++++++++++++++++++++++++-----
1 files changed, 51 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 51bfdb0..0716e43 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -90,11 +90,11 @@
@TableField("loc_type")
private String locType;
- @ApiModelProperty(value= "楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿")
+ @ApiModelProperty(value= "搴撲綅绫诲瀷锛�1锛氭祴璇曞簱浣嶃��2锛氶潤缃簱浣嶃��3锛氭祴璇曞墠鏆傚瓨搴撲负銆�4锛氭祴璇曞け璐ュ簱浣嶃��5锛氫綆搴撲綅銆�6锛氶珮搴撲綅")
@TableField("loc_type1")
private Short locType1;
- @ApiModelProperty(value= "瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿")
+ @ApiModelProperty(value= "閫氶亾锛�1銆�2銆�3銆�4銆�5銆�6")
@TableField("loc_type2")
private Short locType2;
@@ -150,7 +150,7 @@
@TableField("error_memo")
private String errorMemo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "鏄惁鍚姩1锛�0")
@TableField("ctn_kind")
private Integer ctnKind;
@@ -186,10 +186,16 @@
@TableField("fire_status")
private Integer fireStatus;
-// 浜у搧鐘舵�亄0:鏃�,1:寰呮祴,2:娴嬭瘯涓�;3.闈欑疆涓�;4:闈欑疆瀹屾垚}
+// 浜у搧鐘舵�亄0:绌洪棽,1:寰呮祴,2:娴嬭瘯涓�;3.娴嬭瘯瀹屾垚;4.娴嬭瘯澶辫触;}
@ApiModelProperty(value= "")
@TableField("pack_status")
private Integer packStatus;
+
+ @ApiModelProperty(value= "閫氶亾")
+ private Integer channel;
+
+ @ApiModelProperty(value= "鍐荤粨")
+ private Integer freeze;
public String getWhsType$(){
@@ -230,9 +236,13 @@
case 0:
return "鏈煡";
case 1:
- return "浣庡簱浣�";
+ return "娴嬭瘯搴撲綅";
case 2:
- return "楂樺簱浣�";
+ return "闈欑疆搴撲綅";
+ case 3:
+ return "娴嬭瘯鍓嶆殏瀛樺簱浣�";
+ case 4:
+ return "NG搴撲綅";
default:
return String.valueOf(this.locType1);
}
@@ -242,13 +252,22 @@
if (null == this.locType2){ return null; }
switch (this.locType2){
case 0:
- return "鏈煡";
+ return "";
case 1:
- return "绐勫簱浣�";
+ return "1鍙�";
case 2:
- return "瀹藉簱浣�";
+ return "2鍙�";
+ case 3:
+ return "3鍙�";
+ case 4:
+ return "4鍙�";
+ case 5:
+ return "5鍙�";
+ case 6:
+ return "6鍙�";
default:
- return String.valueOf(this.locType2);
+// return String.valueOf(this.locType2);
+ return "";
}
}
@@ -261,6 +280,18 @@
return "杞诲簱浣�";
case 2:
return "閲嶅簱浣�";
+ default:
+ return String.valueOf(this.locType3);
+ }
+ }
+
+ public String getFreeze$() {
+ if (null == this.freeze){ return null; }
+ switch (this.freeze){
+ case 0:
+ return "姝ｅ父";
+ case 1:
+ return "鍐荤粨";
default:
return String.valueOf(this.locType3);
}
@@ -317,6 +348,7 @@
}
}
+// 浜у搧鐘舵�亄0:鏃�,1:寰呮祴,2:娴嬭瘯涓�;3.娴嬭瘯瀹屾垚;4.娴嬭瘯澶辫触;5.闈欑疆涓�;6:闈欑疆瀹屾垚;7:鏆傚仠娴嬭瘯;8:绱ф�ュ嚭搴�;}
public String getPackStatus$() {
if (null == this.packStatus){ return null; }
switch (this.packStatus){
@@ -327,9 +359,17 @@
case 2:
return "娴嬭瘯涓�";
case 3:
- return "闈欑疆涓�";
+ return "娴嬭瘯瀹屾垚";
case 4:
+ return "娴嬭瘯NG";
+ case 5:
+ return "闈欑疆涓�";
+ case 6:
return "闈欑疆瀹屾垚";
+ case 7:
+ return "鏆傚仠娴嬭瘯";
+ case 8:
+ return "绱ф�ュ嚭搴�";
default:
return String.valueOf(this.packStatus);
}
--
Gitblit v1.9.1