From 4a2703db125e67a4a9590b55a2b7fa857e87ef45 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 18 八月 2025 14:16:48 +0800
Subject: [PATCH] 合并出库添加日志
---
src/main/java/com/zy/asrs/entity/LocDetl.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 789ca66..cd7e72a 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;
@@ -39,8 +40,8 @@
@ExcelProperty("鐗╂枡鍙�")
private String matnr;
- @ApiModelProperty(value= "鐗╂枡鍙�")
- @ExcelProperty("鐗╂枡鍙�")
+ @ApiModelProperty(value= "鐗╂枡鍚嶇О")
+ @ExcelProperty("鐗╂枡鍚嶇О")
private String maktx;
@ApiModelProperty(value= "搴忓垪鐮�")
@@ -161,6 +162,29 @@
@ApiModelProperty(value= "搴撳瓨鍐荤粨{1:姝ｅ父,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 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 getLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.locNo);
--
Gitblit v1.9.1