From d3f11759e6b32d7e9e63e0f7b0cc4b6874aea020 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 28 八月 2023 11:14:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6
---
src/main/java/com/zy/asrs/entity/LocMast.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index cd5f3ba..04b4eea 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -94,7 +94,7 @@
@TableField("loc_type1")
private Short locType1;
- @ApiModelProperty(value= "瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿")
+ @ApiModelProperty(value= "涓婃灦鍖哄煙绫诲瀷{1:鍗曞搧鍖�,2:楂橀娣锋斁鍖�,3:浣庨娣锋斁鍖簘")
@TableField("loc_type2")
private Short locType2;
@@ -182,6 +182,13 @@
@ApiModelProperty(value= "鏄惁鍐荤粨")
private Integer frozen;
+ /**
+ * 鍐荤粨澶囨敞
+ */
+ @ApiModelProperty(value= "鍐荤粨澶囨敞")
+ @TableField("frozen_memo")
+ private String frozenMemo;
+
public String getWhsType$(){
BasWhsService service = SpringUtils.getBean(BasWhsService.class);
BasWhs basWhs = service.selectById(this.whsType);
@@ -231,12 +238,12 @@
public String getLocType2$() {
if (null == this.locType2){ return null; }
switch (this.locType2){
- case 0:
- return "鏈煡";
case 1:
- return "绐勫簱浣�";
+ return "鍗曞搧鍖�";
case 2:
- return "瀹藉簱浣�";
+ return "楂橀娣锋斁鍖�";
+ case 3:
+ return "浣庨娣锋斁鍖�";
default:
return String.valueOf(this.locType2);
}
@@ -295,4 +302,15 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
}
+ public String getFrozen$() {
+ if (null == this.frozen){ return null; }
+ switch (this.frozen){
+ case 0:
+ return "";
+ case 1:
+ return "宸插喕缁�";
+ default:
+ return null;
+ }
+ }
}
--
Gitblit v1.9.1