From 9145f8a44c6ae733019e43c775cc30243032e502 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 29 四月 2026 16:16:43 +0800
Subject: [PATCH] 拍照触发修改

---
 src/main/java/com/zy/asrs/entity/LocMast.java |   57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 54 insertions(+), 3 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..eb20d57 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -6,6 +6,7 @@
 import com.baomidou.mybatisplus.enums.IdType;
 import com.zy.asrs.service.BasLocStsService;
 import com.zy.asrs.service.BasWhsService;
+import com.zy.asrs.utils.LocAliasUtils;
 import com.zy.system.entity.User;
 import com.zy.system.service.UserService;
 import com.core.common.Cools;
@@ -14,6 +15,7 @@
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
@@ -62,6 +64,20 @@
     private Integer crnNo;
 
     /**
+     * 搴撳尯锛�1=A鍖猴紝2=B鍖猴紝3=C鍖�
+     */
+    @ApiModelProperty(value= "搴撳尯")
+    @TableField("area_id")
+    private Integer areaId;
+
+    /**
+     * 搴撲綅鍒悕
+     */
+    @ApiModelProperty(value= "搴撲綅鍒悕")
+    @TableField("loc_alias")
+    private String locAlias;
+
+    /**
      * 鎺�
      */
     @ApiModelProperty(value= "鎺�")
@@ -80,6 +96,12 @@
     private Integer lev1;
 
     /**
+     * 缁�
+     */
+    @ApiModelProperty(value= "缁�")
+    private Integer gro1;
+
+    /**
      * 婊℃澘
      */
     @ApiModelProperty(value= "婊℃澘")
@@ -90,7 +112,7 @@
     @TableField("loc_type")
     private String locType;
 
-    @ApiModelProperty(value= "楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿")
+    @ApiModelProperty(value= "楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣�,3:绌烘墭鐩樺厹搴曞簱浣峿")
     @TableField("loc_type1")
     private Short locType1;
 
@@ -156,7 +178,7 @@
 
     @ApiModelProperty(value= "")
     @TableField("sc_weight")
-    private Double scWeight;
+    private BigDecimal scWeight;
 
     @ApiModelProperty(value= "")
     @TableField("inv_wh")
@@ -172,9 +194,22 @@
     @TableField("Pdc_type")
     private String PdcType;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value= "搴撲綅绫诲瀷锛�1.鏁ｈ揣 2.鏁存澘 3.绌烘墭鐩� ")
     @TableField("ctn_no")
     private String ctnNo;
+
+    /**
+     * 鏄惁鍐荤粨
+     */
+    @ApiModelProperty(value= "鏄惁鍐荤粨,0.鏈喕缁擄紝1.宸插喕缁�")
+    private Integer frozen;
+
+    /**
+     * 鍐荤粨澶囨敞
+     */
+    @ApiModelProperty(value= "鍐荤粨澶囨敞")
+    @TableField("frozen_memo")
+    private String frozenMemo;
 
 
     public String getWhsType$(){
@@ -193,6 +228,10 @@
             return String.valueOf(basLocSts.getLocDesc());
         }
         return null;
+    }
+
+    public String getAreaId$() {
+        return LocAliasUtils.areaName(this.areaId);
     }
 
     public String getIoTime$(){
@@ -290,4 +329,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