From b931c44bee33ccae4d14594a6419bcf0a26b29dd Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 24 一月 2024 09:39:50 +0800
Subject: [PATCH] 修复Loc_mast导出问题
---
src/main/java/com/zy/asrs/entity/LocMast.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index c9ab2f0..cfbf077 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;
@@ -150,7 +150,7 @@
@TableField("error_memo")
private String errorMemo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "鏄惁鍚姩1锛�0")
@TableField("ctn_kind")
private Integer ctnKind;
@@ -194,6 +194,9 @@
@ApiModelProperty(value= "閫氶亾")
private Integer channel;
+ @ApiModelProperty(value= "鍐荤粨")
+ private Integer freeze;
+
public String getWhsType$(){
BasWhsService service = SpringUtils.getBean(BasWhsService.class);
@@ -236,6 +239,10 @@
return "娴嬭瘯搴撲綅";
case 2:
return "闈欑疆搴撲綅";
+ case 3:
+ return "娴嬭瘯鍓嶆殏瀛樺簱浣�";
+ case 4:
+ return "NG搴撲綅";
default:
return String.valueOf(this.locType1);
}
@@ -259,7 +266,8 @@
case 6:
return "6鍙�";
default:
- return String.valueOf(this.locType2);
+// return String.valueOf(this.locType2);
+ return "";
}
}
@@ -277,6 +285,18 @@
}
}
+ public String getFreeze$() {
+ if (null == this.freeze){ return null; }
+ switch (this.freeze){
+ case 0:
+ return "姝ｅ父";
+ case 1:
+ return "鍐荤粨";
+ default:
+ return String.valueOf(this.locType3);
+ }
+ }
+
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
--
Gitblit v1.9.1