From 5bce6fa4728a9fb62b95e94828fddf8f3134a409 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 14 八月 2026 15:55:31 +0800
Subject: [PATCH] feat(bpm): 添加业务附件配置功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderProcessController.java | 49 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 39 insertions(+), 10 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderProcessController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderProcessController.java
index 398cda6..1cb8944 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderProcessController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderProcessController.java
@@ -28,6 +28,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.*;
+import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
@@ -134,11 +135,21 @@
processIds.addAll(nextProcessIds);
Map<Long, MesProProcessDO> processMap = CollUtil.isNotEmpty(processIds)
? processService.getProcessMap(processIds) : Collections.emptyMap();
- // 鑾峰彇浜у嚭鐗╂枡
- Set<Long> outputItemIds = convertSet(list, MesProWorkOrderProcessDO::getOutputItemId);
- outputItemIds.removeAll(Collections.singleton(null));
- Map<Long, MesMdItemDO> itemMap = CollUtil.isNotEmpty(outputItemIds)
- ? itemService.getItemMap(outputItemIds) : Collections.emptyMap();
+ // 鑾峰彇浜у嚭鐗╂枡锛堣В鏋愰�楀彿鍒嗛殧鐨勫瓧绗︿覆锛�
+ Set<Long> allOutputItemIds = new HashSet<>();
+ Map<Long, List<Long>> voOutputItemIdsMap = new HashMap<>();
+ for (int i = 0; i < list.size(); i++) {
+ String outputItemIdStr = list.get(i).getOutputItemId();
+ if (outputItemIdStr != null && !outputItemIdStr.isBlank()) {
+ List<Long> ids = Arrays.stream(outputItemIdStr.split(","))
+ .map(String::trim).filter(s -> !s.isEmpty())
+ .map(Long::valueOf).collect(Collectors.toList());
+ voOutputItemIdsMap.put((long) i, ids);
+ allOutputItemIds.addAll(ids);
+ }
+ }
+ Map<Long, MesMdItemDO> itemMap = CollUtil.isNotEmpty(allOutputItemIds)
+ ? itemService.getItemMap(allOutputItemIds) : Collections.emptyMap();
// 2. 鏌ヨ鎶曟枡BOM锛堟寜宸ュ簭鍒嗙粍锛�
Set<Long> workOrderIds = convertSet(list, MesProWorkOrderProcessDO::getWorkOrderId);
@@ -165,17 +176,35 @@
}));
// 3. 鎷兼帴 VO
- List<MesProWorkOrderProcessRespVO> result = BeanUtils.toBean(list, MesProWorkOrderProcessRespVO.class, vo -> {
+ List<MesProWorkOrderProcessRespVO> result = BeanUtils.toBean(list, MesProWorkOrderProcessRespVO.class);
+ for (int i = 0; i < result.size(); i++) {
+ MesProWorkOrderProcessRespVO vo = result.get(i);
MapUtils.findAndThen(processMap, vo.getProcessId(), process -> {
vo.setProcessCode(process.getCode()).setProcessName(process.getName());
});
MapUtils.findAndThen(processMap, vo.getNextProcessId(), process -> {
vo.setNextProcessName(process.getName());
});
- MapUtils.findAndThen(itemMap, vo.getOutputItemId(), item -> {
- vo.setOutputItemCode(item.getCode()).setOutputItemName(item.getName());
- });
- });
+ // 浜у嚭鐗╂枡锛堟敮鎸佸閫夛級
+ List<Long> ids = voOutputItemIdsMap.getOrDefault((long) i, Collections.emptyList());
+ if (!ids.isEmpty()) {
+ vo.setOutputItemIds(ids);
+ List<String> names = ids.stream()
+ .map(id -> {
+ MesMdItemDO item = itemMap.get(id);
+ return item != null ? item.getName() : String.valueOf(id);
+ }).collect(Collectors.toList());
+ vo.setOutputItemNames(String.join(", ", names));
+ // 鍚戝悗鍏煎锛氱涓�涓骇鍑虹墿鏂�
+ Long firstId = ids.get(0);
+ vo.setOutputItemId(firstId);
+ MesMdItemDO firstItem = itemMap.get(firstId);
+ if (firstItem != null) {
+ vo.setOutputItemCode(firstItem.getCode());
+ vo.setOutputItemName(firstItem.getName());
+ }
+ }
+ }
// 璁剧疆姣忎釜宸ュ簭鍚勮嚜鐨勬姇鏂橞OM
result.forEach(vo -> vo.setBomItems(bomItemsByProcessId.getOrDefault(vo.getProcessId(), Collections.emptyList())));
return result;
--
Gitblit v1.9.3