From e170c300cd11406d414e7da156fc6b2da1c13915 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 31 七月 2025 12:27:38 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
index 6a30c27..210ff7b 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -31,6 +31,11 @@
     }
 
     @Override
+    public List<OrderDetl> loadQuantity(String orderNo){
+        return baseMapper.loadQuantity(orderNo);
+    }
+
+    @Override
     public List<OrderDetl> selectItem(String orderNo) {
         return this.baseMapper.listByOrderNo(orderNo);
     }
@@ -139,6 +144,11 @@
         List<OrderDetl> detlList = selectItem(waitPakin.getOrderNo());
         for (OrderDetl orderDetl : detlList) {
             if (MatCompareUtils.compare(orderDetl, waitPakin)) {
+                Double workQty = orderDetl.getWorkQty();
+                //闃叉鍑忔垚璐熸暟
+                if (workQty - qty <= 0) {
+                    qty = workQty;
+                }
                 int decrease = this.baseMapper.decrease2(orderDetl.getId(), qty);
                 if (decrease == 0) {
                     return false;
@@ -168,11 +178,11 @@
     @Override
     public boolean increaseQtyByOrderNo(String orderNo, WrkDetl wrkDetl, Double qty) {
         List<OrderDetl> detlList = this.baseMapper.listByOrderNo(orderNo);
-        if (detlList == null || detlList.isEmpty()){
+        if (detlList == null || detlList.isEmpty()) {
             return false;
         }
-        for (OrderDetl orderDetl : detlList){
-            if (MatCompareUtils.compare(orderDetl, wrkDetl)){
+        for (OrderDetl orderDetl : detlList) {
+            if (MatCompareUtils.compare(orderDetl, wrkDetl)) {
                 return this.baseMapper.increaseQtyById(orderDetl.getId(), qty) > 0;
             }
         }

--
Gitblit v1.9.1