From 42bb7c4d621ce4ebe1c1d12203bf874f0b0b296e Mon Sep 17 00:00:00 2001
From: Administrator <1051256694@qq.com>
Date: 星期五, 24 四月 2026 14:37:20 +0800
Subject: [PATCH] 电视机入库托数修复

---
 src/main/java/com/zy/asrs/entity/LocMast.java |   11 ++++++-----
 1 files changed, 6 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 3103c4b..471d978 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -14,6 +14,7 @@
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
@@ -96,7 +97,7 @@
     @TableField("loc_type")
     private String locType;
 
-    @ApiModelProperty(value= "楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿")
+    @ApiModelProperty(value= "楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣�,3:绌烘墭鐩樺厹搴曞簱浣峿")
     @TableField("loc_type1")
     private Short locType1;
 
@@ -162,7 +163,7 @@
 
     @ApiModelProperty(value= "")
     @TableField("sc_weight")
-    private Double scWeight;
+    private BigDecimal scWeight;
 
     @ApiModelProperty(value= "")
     @TableField("inv_wh")
@@ -178,7 +179,7 @@
     @TableField("Pdc_type")
     private String PdcType;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value= "搴撲綅绫诲瀷锛�1.鏁h揣 2.鏁存澘 3.绌烘墭鐩� ")
     @TableField("ctn_no")
     private String ctnNo;
 
@@ -310,14 +311,14 @@
     }
 
     public String getFrozen$() {
-        if (null == this.frozen){ return null; }
+        if (null == this.frozen){ return "鏈喕缁�"; }
         switch (this.frozen){
             case 0:
                 return "鏈喕缁�";
             case 1:
                 return "宸插喕缁�";
             default:
-                return null;
+                return "鏈喕缁�";
         }
     }
 

--
Gitblit v1.9.1