From 71725ae55cf54fa85be46f748528e2339643945c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 23 六月 2025 14:42:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java |   31 +++++++++++--------------------
 1 files changed, 11 insertions(+), 20 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 46d5648..7068b65 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
@@ -10,11 +10,8 @@
 import com.vincent.rsf.server.common.constant.Constants;
 import com.vincent.rsf.server.manager.controller.dto.ExistDto;
 import com.vincent.rsf.server.manager.controller.dto.OrderOutItemDto;
-import com.vincent.rsf.server.manager.controller.params.LocToTaskParams;
-import com.vincent.rsf.server.manager.controller.params.OrderOutTaskParam;
-import com.vincent.rsf.server.manager.controller.params.OutStockToTaskParams;
+import com.vincent.rsf.server.manager.controller.params.*;
 import com.vincent.rsf.server.manager.enums.*;
-import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
 import com.vincent.rsf.server.manager.entity.*;
 import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
 import com.vincent.rsf.server.manager.service.*;
@@ -32,7 +29,6 @@
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import com.vincent.rsf.server.manager.enums.WaveRuleType;
 
@@ -275,11 +271,11 @@
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public R generateWaves(List<Long> ids) {
-        if (Objects.isNull(ids) || ids.isEmpty()) {
+    public R generateWaves(GenWaveParams params) {
+        if (Objects.isNull(params.getIds()) || params.getIds().isEmpty()) {
             throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
         }
-        List<AsnOrder> orders = this.list(new LambdaQueryWrapper<AsnOrder>().in(AsnOrder::getId, ids));
+        List<AsnOrder> orders = this.list(new LambdaQueryWrapper<AsnOrder>().in(AsnOrder::getId, params.getIds()));
         if (orders.isEmpty()) {
             throw new CoolException("褰撳墠鍗曟嵁鐘舵�佷笉鑳芥墽琛屾尝娆$敓鎴愭搷浣滐紒锛�");
         }
@@ -288,10 +284,10 @@
         Double anfme = Math.round((sum - workQty) * 10000) / 10000.0;
         Wave wave = new Wave();
         String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_WAVE_TYPE, null);
-        if (Objects.isNull(ruleCode) || StringUtils.isBlank(ruleCode)) {
+        if (StringUtils.isBlank(ruleCode)) {
             throw new CoolException("缂栫爜瑙勫垯閿欒锛氳瑕佹煡鐪嬨�孲YS_WAVE_TYPE銆嶆槸鍚﹁缃垚鍔燂紒锛�");
         }
-        wave.setOrderNum(ids.size())
+        wave.setOrderNum(params.getIds().size())
                 .setType(Short.parseShort("1"))
                 .setCode(ruleCode)
                 .setExceStatus(WaveExceStatus.WAVE_EXCE_STATUS_INIT.val)
@@ -299,10 +295,11 @@
         if (!waveService.save(wave)) {
             throw new CoolException("娉㈡淇濆瓨澶辫触锛侊紒");
         }
+
         List<Long> list = orders.stream().map(AsnOrder::getId).collect(Collectors.toList());
         List<AsnOrderItem> orderItems = asnOrderItemService
                 .list(new LambdaQueryWrapper<AsnOrderItem>()
-                        .in(AsnOrderItem::getAsnId, list));
+                        .in(AsnOrderItem::getAsnId, list).apply("anfme > work_qty"));
         if (orderItems.isEmpty()) {
             throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
         }
@@ -316,22 +313,19 @@
         if (!waveService.saveOrUpdate(wave)) {
             throw new CoolException("涓诲崟淇敼澶辫触锛侊紒");
         }
-
         for (int i = 0; i < orderItems.size(); i++) {
             orderItems.get(i).setWorkQty(orderItems.get(i).getAnfme());
         }
-
         if (!asnOrderItemService.saveOrUpdateBatch(orderItems)) {
             throw new CoolException("鍑哄簱鍗曟墽琛屾暟閲忎慨鏀瑰け璐ワ紒锛�");
         }
-
         for (AsnOrder order : orders) {
             Double wkQty = Math.round((order.getWorkQty() + order.getAnfme()) * 10000) / 10000.0;
             if (!this.update(new LambdaUpdateWrapper<AsnOrder>()
                     .set(AsnOrder::getWaveId, wave.getId())
                     .set(AsnOrder::getWorkQty, wkQty)
                     .set(AsnOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_WAVE.val)
-                    .in(AsnOrder::getId, ids))) {
+                    .eq(AsnOrder::getId, order.getId()))) {
                 throw new CoolException("鎵ц鐘舵�佷慨鏀逛慨鏀瑰け璐ワ紒锛�");
             }
         }
@@ -353,15 +347,12 @@
             throw new CoolException("涓诲崟淇℃伅涓嶈兘涓虹┖");
         }
         AsnOrder orders = params.getOrders();
-        if (Objects.isNull(orders)) {
-            throw new CoolException("鍗曟嵁涓嶈兘涓虹┖锛侊紒");
-        }
         if (StringUtils.isBlank(orders.getWkType())) {
             throw new CoolException("涓氬姟绫诲瀷涓嶈兘涓虹┖锛侊紒");
         }
 
         String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_OUT_STOCK_CODE, orders);
-        if (Objects.isNull(ruleCode) || StringUtils.isBlank(ruleCode)) {
+        if (StringUtils.isBlank(ruleCode)) {
             throw new CoolException("缂栫爜瑙勫垯閿欒锛氳妫�鏌ャ�孲YS_OUT_STOCK_CODE銆嶆槸鍚﹁缃纭紒锛�");
         }
         orders.setCode(ruleCode)
@@ -739,7 +730,7 @@
                         p1.getUpdateBy(),
                         p1.getMemo()
                 ),
-                WaveItem::getSplrBatch, WaveItem::getMatnrId, WaveItem::getFieldsIndex
+                WaveItem::getSplrBatch, WaveItem::getMatnrCode, WaveItem::getFieldsIndex
         );
 
         return waveItems;

--
Gitblit v1.9.1