From 2bf65500161ae37c120d0d9af8f6d8dd7afdec75 Mon Sep 17 00:00:00 2001 From: LSH Date: 星期二, 16 五月 2023 14:53:14 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/entity/LocMast.java | 43 +++++++++++++++++++++++++++++++++---------- 1 files changed, 33 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java index 28c709e..3d386fd 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锛氭祴璇曞け璐ュ簱浣嶃��0锛氭湭鐭�") @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; @@ -186,10 +186,13 @@ @TableField("fire_status") private Integer fireStatus; -// 浜у搧鐘舵�亄0:鏃�,1:寰呮祴,2:娴嬭瘯涓�;3.娴嬭瘯瀹屾垚;4.闈欑疆涓�;5:闈欑疆瀹屾垚} +// 浜у搧鐘舵�亄0:鏃�,1:寰呮祴,2:娴嬭瘯涓�;3.娴嬭瘯瀹屾垚;4.娴嬭瘯澶辫触;5.闈欑疆涓�;6:闈欑疆瀹屾垚;7:鏆傚仠娴嬭瘯;8:绱ф�ュ嚭搴�;} @ApiModelProperty(value= "") @TableField("pack_status") private Integer packStatus; + + @ApiModelProperty(value= "閫氶亾") + private Integer channel; public String getWhsType$(){ @@ -230,9 +233,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 +249,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 ""; } } @@ -317,6 +333,7 @@ } } +// 浜у搧鐘舵�亄0:鏃�,1:寰呮祴,2:娴嬭瘯涓�;3.娴嬭瘯瀹屾垚;4.娴嬭瘯澶辫触;5.闈欑疆涓�;6:闈欑疆瀹屾垚;7:鏆傚仠娴嬭瘯;8:绱ф�ュ嚭搴�;} public String getPackStatus$() { if (null == this.packStatus){ return null; } switch (this.packStatus){ @@ -329,9 +346,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