From c2053d7017625f270577bc0f6c523d04f52db6ea Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 24 七月 2026 14:20:29 +0800
Subject: [PATCH] refactor(crm): 重构文件上传功能，替换原有的fileUrls字段为统一的StorageAttachmentApi
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderProcessController.java | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 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 f9260ad..398cda6 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
@@ -6,14 +6,17 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.route.vo.process.MesProProcessBomItemVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.process.MesProWorkOrderProcessPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.process.MesProWorkOrderProcessRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.process.MesProWorkOrderProcessSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderBomDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderProcessDO;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService;
+import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderBomService;
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderProcessService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@@ -37,6 +40,8 @@
@Resource
private MesProWorkOrderProcessService workOrderProcessService;
+ @Resource
+ private MesProWorkOrderBomService workOrderBomService;
@Resource
private MesProProcessService processService;
@Resource
@@ -135,8 +140,32 @@
Map<Long, MesMdItemDO> itemMap = CollUtil.isNotEmpty(outputItemIds)
? itemService.getItemMap(outputItemIds) : Collections.emptyMap();
- // 2. 鎷兼帴 VO
- return BeanUtils.toBean(list, MesProWorkOrderProcessRespVO.class, vo -> {
+ // 2. 鏌ヨ鎶曟枡BOM锛堟寜宸ュ簭鍒嗙粍锛�
+ Set<Long> workOrderIds = convertSet(list, MesProWorkOrderProcessDO::getWorkOrderId);
+ workOrderIds.removeAll(Collections.singleton(null));
+ Map<Long, List<MesProProcessBomItemVO>> bomItemsByProcessId = new HashMap<>();
+ Set<Long> allBomItemIds = new HashSet<>();
+ for (Long woId : workOrderIds) {
+ List<MesProWorkOrderBomDO> bomList = workOrderBomService.getWorkOrderBomListByWorkOrderId(woId);
+ if (CollUtil.isNotEmpty(bomList)) {
+ allBomItemIds.addAll(convertSet(bomList, MesProWorkOrderBomDO::getItemId));
+ for (MesProWorkOrderBomDO bom : bomList) {
+ bomItemsByProcessId.computeIfAbsent(bom.getProcessId(), k -> new ArrayList<>())
+ .add(BeanUtils.toBean(bom, MesProProcessBomItemVO.class));
+ }
+ }
+ }
+ // 濉厖鎶曟枡鐗╂枡缂栫爜鍜屽悕绉�
+ Map<Long, MesMdItemDO> bomItemMap = CollUtil.isNotEmpty(allBomItemIds)
+ ? itemService.getItemMap(allBomItemIds) : Collections.emptyMap();
+ bomItemsByProcessId.values().forEach(vos -> vos.forEach(vo -> {
+ MapUtils.findAndThen(bomItemMap, vo.getItemId(), item -> {
+ vo.setItemCode(item.getCode()).setItemName(item.getName());
+ });
+ }));
+
+ // 3. 鎷兼帴 VO
+ List<MesProWorkOrderProcessRespVO> result = BeanUtils.toBean(list, MesProWorkOrderProcessRespVO.class, vo -> {
MapUtils.findAndThen(processMap, vo.getProcessId(), process -> {
vo.setProcessCode(process.getCode()).setProcessName(process.getName());
});
@@ -147,6 +176,9 @@
vo.setOutputItemCode(item.getCode()).setOutputItemName(item.getName());
});
});
+ // 璁剧疆姣忎釜宸ュ簭鍚勮嚜鐨勬姇鏂橞OM
+ result.forEach(vo -> vo.setBomItems(bomItemsByProcessId.getOrDefault(vo.getProcessId(), Collections.emptyList())));
+ return result;
}
}
\ No newline at end of file
--
Gitblit v1.9.3