From f25bd904560faada2a00e93fbd8abab6be238f9c Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 15 四月 2025 15:44:31 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/LocMast.java |   35 +++++++++++++++++++++++++++++++++--
 1 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 24b93ea..ffca642 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -80,6 +80,12 @@
     private Integer lev1;
 
     /**
+     * 缁�
+     */
+    @ApiModelProperty(value= "缁�")
+    private Integer gro1;
+
+    /**
      * 婊℃澘
      */
     @ApiModelProperty(value= "婊℃澘")
@@ -176,6 +182,19 @@
     @TableField("ctn_no")
     private String ctnNo;
 
+    /**
+     * 鏄惁鍐荤粨
+     */
+    @ApiModelProperty(value= "鏄惁鍐荤粨,0.鏈喕缁擄紝1.宸插喕缁�")
+    private Integer frozen;
+
+    /**
+     * 鍐荤粨澶囨敞
+     */
+    @ApiModelProperty(value= "鍐荤粨澶囨敞")
+    @TableField("frozen_memo")
+    private String frozenMemo;
+
 
     public String getWhsType$(){
         BasWhsService service = SpringUtils.getBean(BasWhsService.class);
@@ -215,9 +234,9 @@
             case 0:
                 return "鏈煡";
             case 1:
-                return "灏忓簱浣�";
+                return "浣庡簱浣�";
             case 2:
-                return "澶у簱浣�";
+                return "楂樺簱浣�";
             default:
                 return String.valueOf(this.locType1);
         }
@@ -290,4 +309,16 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
     }
 
+    public String getFrozen$() {
+        if (null == this.frozen){ return "鏈喕缁�"; }
+        switch (this.frozen){
+            case 0:
+                return "鏈喕缁�";
+            case 1:
+                return "宸插喕缁�";
+            default:
+                return "鏈喕缁�";
+        }
+    }
+
 }

--
Gitblit v1.9.1