From 1dbdcf2bf037a06f0a498c84520c8d75ca8de1c0 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 01 九月 2023 08:50:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnasrs' into zjfnasrs
---
src/main/java/com/zy/asrs/entity/LocMast.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 3d386fd..cfbf077 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -150,7 +150,7 @@
@TableField("error_memo")
private String errorMemo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "鏄惁鍚姩1锛�0")
@TableField("ctn_kind")
private Integer ctnKind;
@@ -193,6 +193,9 @@
@ApiModelProperty(value= "閫氶亾")
private Integer channel;
+
+ @ApiModelProperty(value= "鍐荤粨")
+ private Integer freeze;
public String getWhsType$(){
@@ -282,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