From 91d05844fa5d170face76455d38a330f24e214bc Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 03 十一月 2022 13:58:26 +0800
Subject: [PATCH] Merge branch 'bfasrs' of http://47.97.1.152:5880/r/zy-asrs into bfasrs

---
 src/main/java/com/zy/asrs/entity/LocMast.java |   16 ++++++++++++++++
 1 files changed, 16 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..ccb8433 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -176,6 +176,11 @@
     @TableField("ctn_no")
     private String ctnNo;
 
+    /**
+     * 鏄惁鍐荤粨
+     */
+    @ApiModelProperty(value= "鏄惁鍐荤粨")
+    private Integer frozen;
 
     public String getWhsType$(){
         BasWhsService service = SpringUtils.getBean(BasWhsService.class);
@@ -290,4 +295,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