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/OrderDetl.java | 29 ++++++++++++++++++++++++++++- 1 files changed, 28 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java index 2d20f94..a09ec06 100644 --- a/src/main/java/com/zy/asrs/entity/OrderDetl.java +++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java @@ -279,6 +279,18 @@ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date updateTime; + + @ApiModelProperty(value= "鐢熶骇鏃ユ湡") + @TableField("proddate") + @DateTimeFormat(pattern="yyyy-MM-dd") + + private Date proddate; + @ApiModelProperty(value= "鍒版湡鏃ユ湡") + @TableField("deadline") + @DateTimeFormat(pattern="yyyy-MM-dd") + + private Date deadline; + /** * 澶囨敞 */ @@ -287,7 +299,7 @@ public OrderDetl() {} - public OrderDetl(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double length, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) { + public OrderDetl(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double length, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo,Date proddate, Date deadline) { this.orderId = orderId; this.orderNo = orderNo; this.anfme = anfme; @@ -327,6 +339,8 @@ this.updateBy = updateBy; this.updateTime = updateTime; this.memo = memo; + this.proddate = proddate; + this.deadline = deadline; } public String getOrderId$(){ @@ -432,6 +446,19 @@ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime); } + 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 Double getEnableQty() { Double enableQty = null; if (null != this.anfme && this.qty != null) { -- Gitblit v1.9.1