From b5b1e08632b780133bb2346c017d6dab3c1e5533 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 22 七月 2025 14:46:50 +0800
Subject: [PATCH] #库位状态变更日志
---
src/main/java/com/zy/asrs/entity/OrderDetl.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index aafcf23..23347ea 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -279,6 +279,17 @@
@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 +298,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 +338,8 @@
this.updateBy = updateBy;
this.updateTime = updateTime;
this.memo = memo;
+ this.proddate = proddate;
+ this.deadline = deadline;
}
public String getOrderId$(){
@@ -433,10 +446,15 @@
}
public Double getEnableQty() {
+ Double enableQty = null;
if (null != this.anfme && this.qty != null) {
- return this.anfme - this.qty;
+ enableQty = this.anfme - this.qty;
+ if (enableQty < 0) {
+ enableQty = 0.0D;
+ }
+// return this.anfme - this.qty;
}
- return null;
+ return enableQty;
}
public void sync(Object source) {
--
Gitblit v1.9.1