From ed361165f4518ab5eaa94bfc5fc97f30603619f4 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 29 六月 2023 14:45:09 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/LocMast.java |   33 ++++++++++++++++++++++++++++-----
 1 files changed, 28 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 23d8301..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;
 
@@ -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);
@@ -226,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);
         }
@@ -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