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/WaitPakin.java | 56 +++++++++++++++++++++++++++----------------------------- 1 files changed, 27 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java index 168eba7..bc4a45f 100644 --- a/src/main/java/com/zy/asrs/entity/WaitPakin.java +++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java @@ -3,13 +3,10 @@ import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableName; import com.core.common.Cools; -import com.core.exception.CoolException; +import com.zy.common.utils.Synchro; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.beans.BeanInfo; -import java.beans.Introspector; -import java.beans.PropertyDescriptor; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.Date; @@ -30,13 +27,13 @@ @TableField("loc_no") private String locNo; - @ApiModelProperty(value= "鍟嗗搧缂栧彿") + @ApiModelProperty(value= "鐗╂枡鍙�") private String matnr; - @ApiModelProperty(value= "鍟嗗搧鍚嶇О") + @ApiModelProperty(value= "鐗╂枡鍙�") private String maktx; - @ApiModelProperty(value= "鎵瑰彿") + @ApiModelProperty(value= "搴忓垪鐮�") private String batch; @ApiModelProperty(value= "鍗曟嵁缂栧彿") @@ -46,7 +43,7 @@ @ApiModelProperty(value= "瑙勬牸") private String specs; - @ApiModelProperty(value= "鍨嬪彿") + @ApiModelProperty(value= "鎵规") private String model; @ApiModelProperty(value= "棰滆壊") @@ -64,19 +61,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; @@ -151,6 +148,12 @@ @ApiModelProperty(value= "鍒涘缓鑰�") @TableField("appe_user") private Long appeUser; + @ApiModelProperty(value= "鐢熶骇鏃ユ湡") + @TableField("proddate") + private Date proddate; + @ApiModelProperty(value= "鍒版湡鏃ユ湡") + @TableField("deadline") + private Date deadline; @ApiModelProperty(value= "澶囨敞") private String memo; @@ -218,24 +221,19 @@ } return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime); } - - public void sync(Object dest) { - try { - BeanInfo sourceBean = Introspector.getBeanInfo(this.getClass(),Object.class); - PropertyDescriptor[] sourceProperty = sourceBean.getPropertyDescriptors(); - BeanInfo destBean = Introspector.getBeanInfo(dest.getClass(),Object.class); - PropertyDescriptor[] destProperty = destBean.getPropertyDescriptors(); - for (PropertyDescriptor propertyDescriptor : sourceProperty) { - for (PropertyDescriptor descriptor : destProperty) { - if (propertyDescriptor.getName().equals(descriptor.getName()) && propertyDescriptor.getPropertyType() == descriptor.getPropertyType()) { - descriptor.getWriteMethod().invoke(dest, propertyDescriptor.getReadMethod().invoke(this)); - break; - } - } - } - } catch (Exception e) { - throw new CoolException("灞炴�у鍒跺け璐�:" + e.getMessage()); + 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 void sync(Object source) { + Synchro.Copy(source, this); + } } -- Gitblit v1.9.1