From a5e6584d1363b6d2754bd3abd9e7d288a05330df Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 29 七月 2025 15:42:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs
---
src/main/java/com/zy/asrs/entity/OrderDetl.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index f08621d..442cdb2 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -15,6 +15,7 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -295,6 +296,15 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @ApiModelProperty(value= "棰勭暀1")
+ private String temp1;
+ @ApiModelProperty(value= "棰勭暀1")
+ private String temp2;
+ @ApiModelProperty(value= "棰勭暀1")
+ private String temp3;
+ @ApiModelProperty(value= "棰勭暀1")
+ private String temp4;
+
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) {
@@ -444,7 +454,10 @@
public Double getEnableQty() {
if (null != this.anfme && this.workQty != null) {
- return this.anfme - this.workQty;
+
+ BigDecimal subtract = new BigDecimal(this.anfme).subtract(new BigDecimal(this.workQty));
+
+ return subtract.doubleValue();
}
// if (null != this.anfme && this.qty != null) {
// return this.anfme - this.qty;
--
Gitblit v1.9.1