From 2e01263a1d3db25eb947c38c3cf0702cb64bb07f Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 21 五月 2025 16:43:03 +0800
Subject: [PATCH] #页面更改

---
 src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 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 59c940c..548f49c 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -139,6 +139,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;
@@ -160,11 +165,26 @@
         return this.baseMapper.addToLogTable(orderDetl) > 0;
     }
 
+//    @Override
+//    public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty) {
+//        return this.baseMapper.increaseQtyByOrderNo(orderNo, matnr, batch, qty) > 0;
+//    }
+
     @Override
-    public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty) {
-        return this.baseMapper.increaseQtyByOrderNo(orderNo, matnr, batch, qty) > 0;
+    public boolean increaseQtyByOrderNo(String orderNo, WrkDetl wrkDetl, Double qty) {
+        List<OrderDetl> detlList = this.baseMapper.listByOrderNo(orderNo);
+        if (detlList == null || detlList.isEmpty()) {
+            return false;
+        }
+        for (OrderDetl orderDetl : detlList) {
+            if (MatCompareUtils.compare(orderDetl, wrkDetl)) {
+                return this.baseMapper.increaseQtyById(orderDetl.getId(), qty) > 0;
+            }
+        }
+        return false;
     }
 
+
     /**
      * 鍏ュ嚭搴撲换鍔$敓鎴愭椂锛屾洿鏂板崟鎹〃涓綔涓氭暟閲�
      *

--
Gitblit v1.9.1