From 1596ce91095ad30f781006a2cfa5d856d3ac9416 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期六, 09 九月 2023 11:00:45 +0800
Subject: [PATCH] Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs
---
src/main/java/com/zy/asrs/entity/OrderDetl.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 05abc92..d1073af 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -62,9 +62,9 @@
private Double qty;
/**
- * 鍗曟嵁鍙�
+ * 鐗╂枡鍙�
*/
- @ApiModelProperty(value= "鍗曟嵁鍙�")
+ @ApiModelProperty(value= "鐗╂枡鍙�")
private String matnr;
/**
@@ -285,6 +285,13 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ //寰呭嚭搴撴暟閲�
+ private Double amount;
+
+ public Double getAmount() {
+ return anfme - qty;
+ }
+
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) {
@@ -433,10 +440,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