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 | 91 ++++++++++++++++++++++++++-------------------
1 files changed, 52 insertions(+), 39 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 2ab47e1..a09ec06 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -6,17 +6,14 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
-import com.core.exception.CoolException;
import com.zy.asrs.service.OrderService;
+import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
-import java.beans.BeanInfo;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -65,21 +62,21 @@
private Double qty;
/**
- * 鍟嗗搧缂栫爜
+ * 鐗╂枡鍙�
*/
- @ApiModelProperty(value= "鍟嗗搧缂栫爜")
+ @ApiModelProperty(value= "鐗╂枡鍙�")
private String matnr;
/**
- * 鍟嗗搧鍚嶇О
+ * 鐗╂枡鍙�
*/
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value= "鐗╂枡鍙�")
private String maktx;
/**
- * 鎵瑰彿
+ * 搴忓垪鐮�
*/
- @ApiModelProperty(value= "鎵瑰彿")
+ @ApiModelProperty(value= "搴忓垪鐮�")
private String batch;
/**
@@ -89,9 +86,9 @@
private String specs;
/**
- * 鍨嬪彿
+ * 鎵规
*/
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value= "鎵规")
private String model;
/**
@@ -125,9 +122,9 @@
private String sku;
/**
- * 鍗曚綅閲�
+ * 鍖呮暟
*/
- @ApiModelProperty(value= "鍗曚綅閲�")
+ @ApiModelProperty(value= "鍖呮暟")
private Double units;
/**
@@ -137,9 +134,9 @@
private String barcode;
/**
- * 浜у湴
+ * 鐗╂枡鐘舵��
*/
- @ApiModelProperty(value= "浜у湴")
+ @ApiModelProperty(value= "鐗╂枡鐘舵��")
private String origin;
/**
@@ -149,9 +146,9 @@
private String manu;
/**
- * 鐢熶骇鏃ユ湡
+ * 鍗曟嵁鏃堕棿
*/
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ @ApiModelProperty(value= "鍗曟嵁鏃堕棿")
@TableField("manu_date")
private String manuDate;
@@ -282,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;
+
/**
* 澶囨敞
*/
@@ -290,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;
@@ -330,6 +339,8 @@
this.updateBy = updateBy;
this.updateTime = updateTime;
this.memo = memo;
+ this.proddate = proddate;
+ this.deadline = deadline;
}
public String getOrderId$(){
@@ -435,31 +446,33 @@
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) {
- return this.anfme - this.qty;
- }
- return null;
- }
-
- 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;
- }
- }
+ enableQty = this.anfme - this.qty;
+ if (enableQty < 0) {
+ enableQty = 0.0D;
}
- } catch (Exception e) {
- throw new CoolException("灞炴�у鍒跺け璐�:" + e.getMessage());
+// return this.anfme - this.qty;
}
+ return enableQty;
}
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
}
--
Gitblit v1.9.1