From c7d036d6ba067fb90e53a56a400695d991101d89 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 03 七月 2025 15:20:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/OrderDetl.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 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 da61de9..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;
@@ -84,9 +85,9 @@
private String maktx;
/**
- * 搴忓垪鐮�
+ * 鎵瑰彿
*/
- @ApiModelProperty(value= "搴忓垪鐮�")
+ @ApiModelProperty(value= "鎵瑰彿")
private String batch;
/**
@@ -236,7 +237,7 @@
private Integer deadWarn;
/**
- * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
+ * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 銆併�佸疁绉戯細 鏄惁纭 1: 纭 2: 鏈‘璁�
*/
@ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
private Integer source;
@@ -294,6 +295,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() {}
@@ -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;
@@ -452,6 +465,13 @@
return null;
}
+ public String getQty$(){
+ if (getAnfme().equals(getQty())){
+ return "宸插畬鎴�";
+ }
+ return "鏈畬鎴�";
+ }
+
public void sync(Object source) {
Synchro.Copy(source, this);
}
--
Gitblit v1.9.1