From f35fc1f577af2cb76198a520f47b4c7b85fb170e Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 21 十二月 2023 15:19:52 +0800
Subject: [PATCH] 合并订单bug修改

---
 src/main/java/com/zy/asrs/entity/OrderDetl.java |   13 +++++++++----
 1 files changed, 9 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..2d20f94 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;
 
     /**
@@ -433,10 +433,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