From 616b3433ab70a15afd88468d59105bd7cbfe6c02 Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期一, 20 六月 2022 15:57:30 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs
---
src/main/java/com/zy/asrs/entity/OrderDetl.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 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..da61de9 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;
/**
@@ -74,9 +84,9 @@
private String maktx;
/**
- * 鎵瑰彿
+ * 搴忓垪鐮�
*/
- @ApiModelProperty(value= "鎵瑰彿")
+ @ApiModelProperty(value= "搴忓垪鐮�")
private String batch;
/**
@@ -433,9 +443,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 +456,4 @@
Synchro.Copy(source, this);
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.1