From 450320f28d8db37264d7fc448c01fb32f64610b2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 13 十一月 2025 16:53:06 +0800
Subject: [PATCH] 波次出库修改
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java | 43 +++++++++++++++++++++++++++++++++++--------
1 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
index 42fe873..ebe1571 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
@@ -279,21 +279,48 @@
@Synchronized
@Transactional(rollbackFor = Exception.class)
public void generateOutTask(List<OrderOutItemDto> itemParams, Long loginUserId, Wave wave) throws Exception {
- for (OrderOutItemDto itemDto : itemParams) {
+ Map<Long, List<OrderOutItemDto>> listMap = itemParams.stream().collect(Collectors.groupingBy(OrderOutItemDto::getLocId));
+ listMap.keySet().forEach(id -> {
+ double sum = listMap.get(id).stream().mapToDouble(OrderOutItemDto::getAnfme).sum();
+ List<LocItem> items = new ArrayList<>();
+ //鐢熸垚鏄庣粏
+ listMap.get(id).forEach(orderOutItemDto -> {
+ items.add(orderOutItemDto.getLocItem());
+ });
+ //鑾峰彇涓嶄负绌虹珯鐐�
+ List<OrderOutItemDto> itemDtos = listMap.get(id).stream().filter(orderOutItemDto -> !Objects.isNull(orderOutItemDto.getSitesNo())).collect(Collectors.toList());
+ OrderOutItemDto itemDto = itemDtos.stream().findFirst().get();
+ itemDto.setAnfme(sum);
LocToTaskParams taskParams = new LocToTaskParams();
Loc loc = locService.getById(itemDto.getLocId());
- if (Objects.isNull(loc)) {
- continue;
- }
- taskParams.setItems(Arrays.asList(itemDto.getLocItem()))
+ taskParams.setItems(items)
.setSiteNo(itemDto.getSitesNo())
.setType(Constants.TASK_TYPE_WAVE_OUT_STOCK)
.setSourceId(wave.getId())
.setTarLoc(loc.getCode());
-
//TODO 鐢熸垚鍑哄簱浠诲姟锛岃幏鍙栨尝娆″崟鎹俊鎭�
- locItemService.generateTask(TaskResouceType.TASK_RESOUCE_WAVE_TYPE.val, taskParams, loginUserId);
- }
+ try {
+ locItemService.generateTask(TaskResouceType.TASK_RESOUCE_WAVE_TYPE.val, taskParams, loginUserId);
+ } catch (Exception e) {
+ throw new CoolException("鍑哄簱浠诲姟鐢熸垚澶辫触锛�");
+ }
+ });
+
+// for (OrderOutItemDto itemDto : itemParams) {
+// LocToTaskParams taskParams = new LocToTaskParams();
+// Loc loc = locService.getById(itemDto.getLocId());
+// if (Objects.isNull(loc)) {
+// continue;
+// }
+// taskParams.setItems(Arrays.asList(itemDto.getLocItem()))
+// .setSiteNo(itemDto.getSitesNo())
+// .setType(Constants.TASK_TYPE_WAVE_OUT_STOCK)
+// .setSourceId(wave.getId())
+// .setTarLoc(loc.getCode());
+//
+// //TODO 鐢熸垚鍑哄簱浠诲姟锛岃幏鍙栨尝娆″崟鎹俊鎭�
+// locItemService.generateTask(TaskResouceType.TASK_RESOUCE_WAVE_TYPE.val, taskParams, loginUserId);
+// }
}
/**
--
Gitblit v1.9.1