From 4f4559efbe2d2f20f2c37d8582b74f0a558a54c7 Mon Sep 17 00:00:00 2001
From: whycq <you@example.com>
Date: 星期一, 30 一月 2023 22:10:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs
---
src/main/java/com/zy/asrs/entity/LocMast.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 23d8301..92eb5ac 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -176,6 +176,18 @@
@TableField("ctn_no")
private String ctnNo;
+ /**
+ * 鏄惁鍐荤粨
+ */
+ @ApiModelProperty(value= "鏄惁鍐荤粨")
+ private Integer frozen;
+
+ /**
+ * 鍐荤粨澶囨敞
+ */
+ @ApiModelProperty(value= "鍐荤粨澶囨敞")
+ @TableField("frozen_memo")
+ private String frozenMemo;
public String getWhsType$(){
BasWhsService service = SpringUtils.getBean(BasWhsService.class);
@@ -290,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