From ddc462832f99c124fbcc9653a0878e18768224cd Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 11 六月 2025 16:19:13 +0800
Subject: [PATCH] #修复bug，检索该排全部空库位进行判断
---
src/main/java/com/zy/asrs/entity/OrderDetl.java | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 9f51f3c..2ad4d0d 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -55,10 +55,20 @@
/**
* 浣滀笟鏁伴噺
*
- * 1. 鍏ュ簱 : qty 馃憜
- * 1. 鍑哄簱 : qty 馃憜
+ * 鍏ュ簱 : 缁勬墭瀹屾垚锛岀粍鎵樻。銆佸伐浣滄。銆佸叆搴撳畬鎴愭暟閲�
+ * 鍑哄簱 : 宸ヤ綔妗ｃ�佸嚭搴撳畬鎴愭暟閲�
*/
@ApiModelProperty(value= "浣滀笟鏁伴噺")
+ @TableField("work_qty")
+ private Double workQty;
+
+ /**
+ * 瀹屾垚鏁伴噺
+ *
+ * 鍏ュ簱 : qty 馃憜
+ * 鍑哄簱 : qty 馃憜
+ */
+ @ApiModelProperty(value= "瀹屾垚鏁伴噺")
private Double qty;
/**
@@ -132,6 +142,12 @@
*/
@ApiModelProperty(value= "鏉＄爜")
private String barcode;
+
+ /**
+ * 瀛樺偍闅旇啘绯荤粺涓殧鑶滃嵎淇℃伅鐨勬潯褰㈢爜
+ */
+ @ApiModelProperty(value= "鏉″舰鐮�")
+ private String qrCode;
/**
* 浜у湴
@@ -278,6 +294,22 @@
@TableField("update_time")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "鏀跺嵎寮�濮嬫棩鏈�")
+ @TableField("start_date")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date startDate;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "鏀跺嵎缁撴潫鏃ユ湡")
+ @TableField("end_date")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date endDate;
/**
* 澶囨敞
@@ -433,9 +465,12 @@
}
public Double getEnableQty() {
- if (null != this.anfme && this.qty != null) {
- return this.anfme - this.qty;
+ if (null != this.anfme && this.workQty != null) {
+ return this.anfme - this.workQty;
}
+// if (null != this.anfme && this.qty != null) {
+// return this.anfme - this.qty;
+// }
return null;
}
@@ -443,4 +478,4 @@
Synchro.Copy(source, this);
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.1