From 9d38f2354b3a7267a2486d937bb7d256fcb949c1 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 13 六月 2025 08:15:48 +0800
Subject: [PATCH] #增加生产日期，到期日期字段，增加库存明细超期库存检索

---
 src/main/java/com/zy/asrs/entity/LocDetl.java |   55 +++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 0556824..4353bb9 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -12,6 +12,7 @@
 import com.zy.system.service.UserService;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
@@ -35,16 +36,16 @@
     @ExcelProperty("鏁伴噺")
     private Double anfme;
 
-    @ApiModelProperty(value= "鍟嗗搧缂栧彿")
-    @ExcelProperty("鍟嗗搧缂栧彿")
+    @ApiModelProperty(value= "鐗╂枡鍙�")
+    @ExcelProperty("鐗╂枡鍙�")
     private String matnr;
 
-    @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
-    @ExcelProperty("鍟嗗搧鍚嶇О")
+    @ApiModelProperty(value= "鐗╂枡鍚嶇О")
+    @ExcelProperty("鐗╂枡鍚嶇О")
     private String maktx;
 
-    @ApiModelProperty(value= "鎵瑰彿")
-    @ExcelProperty("鎵瑰彿")
+    @ApiModelProperty(value= "搴忓垪鐮�")
+    @ExcelProperty("搴忓垪鐮�")
     private String batch;
 
     @ApiModelProperty(value= "鍗曟嵁缂栧彿")
@@ -55,7 +56,7 @@
     @ApiModelProperty(value= "瑙勬牸")
     private String specs;
 
-    @ApiModelProperty(value= "鍨嬪彿")
+    @ApiModelProperty(value= "鎵规")
     private String model;
 
     @ApiModelProperty(value= "棰滆壊")
@@ -73,19 +74,19 @@
     @ApiModelProperty(value= "sku")
     private String sku;
 
-    @ApiModelProperty(value= "鍗曚綅閲�")
+    @ApiModelProperty(value= "鍖呮暟")
     private Double units;
 
     @ApiModelProperty(value= "鏉＄爜")
     private String barcode;
 
-    @ApiModelProperty(value= "浜у湴")
+    @ApiModelProperty(value= "鐗╂枡鐘舵��")
     private String origin;
 
     @ApiModelProperty(value= "鍘傚")
     private String manu;
 
-    @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+    @ApiModelProperty(value= "鍗曟嵁鏃堕棿")
     @TableField("manu_date")
     private String manuDate;
 
@@ -156,6 +157,21 @@
 
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
+
+    @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+    @TableField("proddate")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+
+    private Date proddate;
+    @ApiModelProperty(value= "鍒版湡鏃ユ湡")
+    @TableField("deadline")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date deadline;
+
+
+    @TableField("stock_freeze")
+    @ApiModelProperty(value= "搴撳瓨鍐荤粨{1:姝ｅ父,0:鍐荤粨}")
+    private Integer stockFreeze;
 
     public String getLocNo$(){
         LocMastService service = SpringUtils.getBean(LocMastService.class);
@@ -240,6 +256,18 @@
         }
         return null;
     }
+    public String getProddate$(){
+        if (Cools.isEmpty(this.proddate)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd").format(this.proddate);
+    }
+    public String getDeadline$(){
+        if (Cools.isEmpty(this.deadline)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd").format(this.deadline);
+    }
 
     public String getAppeTime$(){
         if (Cools.isEmpty(this.appeTime)){
@@ -252,4 +280,11 @@
         Synchro.Copy(source, this);
     }
 
+    public String getStockFreeze$() {
+        if (Cools.isEmpty(this.stockFreeze)){
+            return "";
+        }
+        return this.stockFreeze == 1 ? "姝ｅ父" : "鍐荤粨";
+    }
+
 }

--
Gitblit v1.9.1