From 1c108c2090d36f8e0a6d223cad1f255583258ce6 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 03 九月 2025 08:53:52 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 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..71c2bc7 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
+import com.zy.asrs.entity.AcQuantity;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkDetl;
@@ -28,6 +29,11 @@
page.setRecords(baseMapper.getPakoutPage(page.getCondition()));
page.setTotal(baseMapper.getPakoutPageCount(page.getCondition()));
return page;
+ }
+
+ @Override
+ public List<AcQuantity> loadQuantity(String orderNo){
+ return baseMapper.loadQuantity(orderNo);
}
@Override
@@ -139,6 +145,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 +171,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