From e4b641e65e49c7854ed11e7822316431f5e0ce1b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 27 六月 2025 08:36:03 +0800
Subject: [PATCH] 出库单生成波次功能优化

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
index 62c4b3e..cc71aeb 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
@@ -276,7 +276,9 @@
         if (Objects.isNull(params.getIds()) || params.getIds().isEmpty()) {
             throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
         }
-        List<AsnOrder> orders = this.list(new LambdaQueryWrapper<AsnOrder>().in(AsnOrder::getId, params.getIds()));
+        List<AsnOrder> orders = this.list(new LambdaQueryWrapper<AsnOrder>()
+                .eq(AsnOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
+                .in(AsnOrder::getId, params.getIds()));
         if (orders.isEmpty()) {
             throw new CoolException("褰撳墠鍗曟嵁鐘舵�佷笉鑳芥墽琛屾尝娆$敓鎴愭搷浣滐紒锛�");
         }
@@ -414,7 +416,8 @@
         if (Cools.isEmpty(param.getOrderId())) {
             throw new CoolException("鍗曟嵁ID涓虹┖");
         }
-        WaveRule waveRule = waveRuleService.getOne(new LambdaQueryWrapper<WaveRule>().eq(WaveRule::getId, param.getWaveId()));
+        WaveRule waveRule = waveRuleService.getOne(new LambdaQueryWrapper<WaveRule>()
+                .eq(WaveRule::getId, param.getWaveId()));
         if (Cools.isEmpty(waveRule)) {
             throw new CoolException("鏈壘鍒板綋鍓嶇瓥鐣�");
         }
@@ -573,7 +576,6 @@
                 .eq(AsnOrderItem::getAsnId, orderId));
         List<OrderOutItemDto> list = new ArrayList<>();
         Set<ExistDto> existDtos = new HashSet<>();
-
         for (AsnOrderItem asnOrderItem : asnOrderItems) {
             BigDecimal issued = new BigDecimal(asnOrderItem.getAnfme().toString())
                     .subtract(new BigDecimal(asnOrderItem.getWorkQty().toString())

--
Gitblit v1.9.1