From e418f64a7ca0d6ec76096c46a2b543dab8495119 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 14 八月 2026 10:33:51 +0800
Subject: [PATCH] refactor(mes): 调整物料状态控制逻辑
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderProcessController.java | 83 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 72 insertions(+), 11 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..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
@@ -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;
@@ -25,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;
@@ -37,6 +41,8 @@
@Resource
private MesProWorkOrderProcessService workOrderProcessService;
+ @Resource
+ private MesProWorkOrderBomService workOrderBomService;
@Resource
private MesProProcessService processService;
@Resource
@@ -129,24 +135,79 @@
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. 鎷兼帴 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);
+ 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;
}
}
\ No newline at end of file
--
Gitblit v1.9.3