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/AgvLocDetl.java | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/AgvLocDetl.java b/src/main/java/com/zy/asrs/entity/AgvLocDetl.java index 1ea03d2..e6c4e18 100644 --- a/src/main/java/com/zy/asrs/entity/AgvLocDetl.java +++ b/src/main/java/com/zy/asrs/entity/AgvLocDetl.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; @@ -160,6 +161,15 @@ @TableField("stock_freeze") @ApiModelProperty(value= "搴撳瓨鍐荤粨{1:姝e父,0:鍐荤粨}") private Integer stockFreeze; + @ApiModelProperty(value= "鐢熶骇鏃ユ湡") + @TableField("proddate") + @DateTimeFormat(pattern="yyyy-MM-dd") + + private Date proddate; + @ApiModelProperty(value= "鍒版湡鏃ユ湡") + @TableField("deadline") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date deadline; public String getLocNo$(){ LocMastService service = SpringUtils.getBean(LocMastService.class); @@ -262,5 +272,16 @@ } return this.stockFreeze == 1 ? "姝e父" : "鍐荤粨"; } - + 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); + } } -- Gitblit v1.9.1