From a07704c2fb0f7cd2a67b38f469c079062c92e6f9 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期一, 10 十月 2022 18:48:48 +0800
Subject: [PATCH] #lsh
---
src/main/java/com/zy/asrs/entity/LocMast.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 1f3c032..c11ce1e 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -186,10 +186,13 @@
@TableField("fire_status")
private Integer fireStatus;
-// 浜у搧鐘舵�亄0:鏃�,1:寰呮祴,2:娴嬭瘯涓�;3.娴嬭瘯瀹屾垚;4.闈欑疆涓�;5:闈欑疆瀹屾垚}
+// 浜у搧鐘舵�亄0:鏃�,1:寰呮祴,2:娴嬭瘯涓�;3.娴嬭瘯瀹屾垚;4.闈欑疆涓�;5:闈欑疆瀹屾垚;6:鏆傚仠娴嬭瘯;7:绱ф�ュ嚭搴�;}
@ApiModelProperty(value= "")
@TableField("pack_status")
private Integer packStatus;
+
+ @ApiModelProperty(value= "閫氶亾")
+ private Integer channel;
public String getWhsType$(){
@@ -242,19 +245,19 @@
if (null == this.locType2){ return null; }
switch (this.locType2){
case 0:
- return "鏃犺澶�";
+ return "";
case 1:
- return "1鍙疯澶�";
+ return "1鍙�";
case 2:
- return "2鍙疯澶�";
+ return "2鍙�";
case 3:
- return "3鍙疯澶�";
+ return "3鍙�";
case 4:
- return "4鍙疯澶�";
+ return "4鍙�";
case 5:
- return "5鍙疯澶�";
+ return "5鍙�";
case 6:
- return "6鍙疯澶�";
+ return "6鍙�";
default:
return String.valueOf(this.locType2);
}
@@ -340,6 +343,10 @@
return "闈欑疆涓�";
case 5:
return "闈欑疆瀹屾垚";
+ case 6:
+ return "鏆傚仠娴嬭瘯";
+ case 7:
+ return "绱ф�ュ嚭搴�";
default:
return String.valueOf(this.packStatus);
}
--
Gitblit v1.9.1