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 | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index be9a529..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,12 +36,12 @@
@ExcelProperty("鏁伴噺")
private Double anfme;
- @ApiModelProperty(value= "鍗曟嵁鍙�")
- @ExcelProperty("鍗曟嵁鍙�")
- private String matnr;
-
@ApiModelProperty(value= "鐗╂枡鍙�")
@ExcelProperty("鐗╂枡鍙�")
+ private String matnr;
+
+ @ApiModelProperty(value= "鐗╂枡鍚嶇О")
+ @ExcelProperty("鐗╂枡鍚嶇О")
private String maktx;
@ApiModelProperty(value= "搴忓垪鐮�")
@@ -157,6 +158,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);
LocMast locMast = service.selectById(this.locNo);
@@ -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