From 35309c86535d392d593471236585b4b36fb417d6 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 15 一月 2024 15:19:48 +0800
Subject: [PATCH] # 需求更改

---
 src/main/java/com/zy/asrs/entity/OrderDetl.java |   27 ++++++++++++++++++++++++---
 1 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 9dcc5aa..1922dc7 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -327,6 +327,23 @@
     @TableField("uuid")
     private String uuid;
 
+    //鏈�澶х啍鎸�
+    private double fingerMeltingMin;
+    //鏈�灏忕啍鎸�
+    private double fingerMeltingMax;
+    //鏈�澶х啍鐐�
+    private double fusingPointMin;
+    //鏈�灏忕啍鐐�
+    private double fusingPointMax;
+    //鏈�澶ч粍搴�
+    private double yellownessMin;
+    //鏈�澶ч粍搴�
+    private double yellownessMax;
+    //鏈�灏忎笉閫忔槑搴�
+    private double opacityMin;
+    //鏈�澶т笉閫忔槑搴�
+    private double opacityMax;
+
     public String getOwner$(){
         LocOwnerService service = SpringUtils.getBean(LocOwnerService.class);
         LocOwner locOwner = service.selectById(this.owner);
@@ -506,11 +523,15 @@
     }
 
     public Double getEnableQty() {
+        Double enableQty = null;
+        if (null != this.anfme && this.workQty != null) {
+            enableQty = this.anfme  - this.workQty;
+           if (enableQty <0){
+               enableQty = 0.0D;
+           }
 
-        if (null != this.anfme && this.qty != null) {
-            return this.anfme - this.qty;
         }
-        return null;
+        return enableQty;
     }
 
     public void sync(Object source) {

--
Gitblit v1.9.1