From 88e6db11cf5c11e9f85c0a9f9a6c76b6e2ed61bf Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 10 四月 2026 13:05:12 +0800
Subject: [PATCH] 1.数字孪生--近期订单(默认7天)优化

---
 src/main/java/com/zy/asrs/entity/LocMast.java |   40 ++++++++++++++++++++++++++++++++++++----
 1 files changed, 36 insertions(+), 4 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..239377e 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;
 
@@ -78,6 +79,12 @@
      */
     @ApiModelProperty(value= "灞�")
     private Integer lev1;
+
+    /**
+     * 缁�
+     */
+    @ApiModelProperty(value= "缁�")
+    private Integer gro1;
 
     /**
      * 婊℃澘
@@ -156,7 +163,7 @@
 
     @ApiModelProperty(value= "")
     @TableField("sc_weight")
-    private Double scWeight;
+    private BigDecimal scWeight;
 
     @ApiModelProperty(value= "")
     @TableField("inv_wh")
@@ -172,9 +179,22 @@
     @TableField("Pdc_type")
     private String PdcType;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value= "搴撲綅绫诲瀷锛�1.鏁h揣 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$(){
@@ -215,9 +235,9 @@
             case 0:
                 return "鏈煡";
             case 1:
-                return "灏忓簱浣�";
+                return "浣庡簱浣�";
             case 2:
-                return "澶у簱浣�";
+                return "楂樺簱浣�";
             default:
                 return String.valueOf(this.locType1);
         }
@@ -290,4 +310,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