From b81562a3357a4ef33bcab2f02ebb4a84330f6511 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 06 八月 2025 16:27:10 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 50 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..da36c49 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,10 +165,25 @@
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;
}
+
/**
* 鍏ュ嚭搴撲换鍔＄敓鎴愭椂锛屾洿鏂板崟鎹〃涓綔涓氭暟閲�
@@ -227,4 +247,32 @@
return null;
}
}
+
+ @Override
+ public boolean increaseWorkQtyByOrderNo(String orderNo, OrderDetl orderDetl, Double workQty) {
+ List<OrderDetl> detlList = this.baseMapper.listByOrderNo(orderNo);
+ if (detlList == null || detlList.isEmpty()) {
+ return false;
+ }
+ for (OrderDetl orderDetl1 : detlList) {
+ if (MatCompareUtils.compare(orderDetl1, orderDetl)) {
+ return baseMapper.increaseWorkQty(orderDetl.getId(), workQty) > 0;
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public boolean increaseQtyByOrderNo1(String orderNo, OrderDetl orderDetl, Double qty) {
+ List<OrderDetl> detlList = this.baseMapper.listByOrderNo(orderNo);
+ if (detlList == null || detlList.isEmpty()) {
+ return false;
+ }
+ for (OrderDetl orderDetl1 : detlList) {
+ if (MatCompareUtils.compare(orderDetl1, orderDetl)) {
+ return baseMapper.increaseQtyById(orderDetl.getId(), qty) > 0;
+ }
+ }
+ return false;
+ }
}
--
Gitblit v1.9.1