From 7591ba21194595cc8d9a1293dfdbfa945bc9948f Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 17 八月 2026 16:36:54 +0800
Subject: [PATCH] Merge branch 'dev_business' of http://114.132.189.42:9002/r/mom-pro2-after into dev_business
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProcessController.java | 89 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 78 insertions(+), 11 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProcessController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProcessController.java
index 7504915..1bc0813 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProcessController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProcessController.java
@@ -5,10 +5,14 @@
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
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.route.vo.process.MesProRouteProcessRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.route.vo.process.MesProRouteProcessSaveReqVO;
+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.route.MesProRouteProcessDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProductBomDO;
+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.route.MesProRouteProcessService;
import io.swagger.v3.oas.annotations.Operation;
@@ -20,11 +24,8 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+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.convertMap;
@@ -40,6 +41,8 @@
private MesProRouteProcessService routeProcessService;
@Resource
private MesProProcessService processService;
+ @Resource
+ private MesMdItemService mdItemService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓宸ヨ壓璺嚎宸ュ簭")
@@ -74,14 +77,41 @@
return success(buildRouteProcessRespVO(routeProcess));
}
- // TODO @鑺嬭壙锛氬埌搴曞彨 list-by-item 杩樻槸 list-by-product锛�
@GetMapping("/list-by-product")
- @Operation(summary = "鎸変骇鍝佽幏寰楀伐搴忓垪琛�", description = "鏍规嵁浜у搧鏌ユ壘鍏宠仈鐨勫伐鑹鸿矾绾匡紝杩斿洖璇ヨ矾绾跨殑宸ュ簭鍒楄〃")
+ @Operation(summary = "鎸変骇鍝佽幏寰楀伐搴忓垪琛�", description = "鏍规嵁浜у搧鏌ユ壘鍏宠仈鐨勫伐鑹鸿矾绾匡紝杩斿洖璇ヨ矾绾跨殑宸ュ簭鍒楄〃锛堝惈鍚勫伐搴忕殑鎶曟枡BOM锛�")
@Parameter(name = "productId", description = "浜у搧缂栧彿", required = true, example = "1")
@PreAuthorize("@ss.hasPermission('mes:pro-route:query')")
public CommonResult<List<MesProRouteProcessRespVO>> getRouteProcessListByProduct(@RequestParam("productId") Long productId) {
List<MesProRouteProcessDO> list = routeProcessService.getRouteProcessListByProductId(productId);
- return success(buildRouteProcessRespVOList(list));
+ List<MesProRouteProcessRespVO> result = buildRouteProcessRespVOList(list);
+
+ // 鏌ヨ閰嶇疆鎶曟枡骞舵寜宸ュ簭濉厖
+ Map<Long, List<MesProRouteProductBomDO>> bomByProcess = routeProcessService.getRouteProcessBomMapByProductId(productId);
+ if (!bomByProcess.isEmpty()) {
+ Set<Long> itemIds = bomByProcess.values().stream()
+ .flatMap(List::stream)
+ .map(MesProRouteProductBomDO::getItemId)
+ .collect(Collectors.toSet());
+ Map<Long, MesMdItemDO> itemMap = mdItemService.getItemMap(itemIds);
+ for (MesProRouteProcessRespVO vo : result) {
+ List<MesProRouteProductBomDO> processBoms = bomByProcess.get(vo.getProcessId());
+ if (CollUtil.isNotEmpty(processBoms)) {
+ vo.setBomItems(processBoms.stream().map(bom -> {
+ MesProProcessBomItemVO itemVO = new MesProProcessBomItemVO();
+ itemVO.setItemId(bom.getItemId());
+ itemVO.setQuantity(bom.getQuantity());
+ itemVO.setRemark(bom.getRemark());
+ MesMdItemDO item = itemMap.get(bom.getItemId());
+ if (item != null) {
+ itemVO.setItemCode(item.getCode());
+ itemVO.setItemName(item.getName());
+ }
+ return itemVO;
+ }).collect(Collectors.toList()));
+ }
+ }
+ }
+ return success(result);
}
@GetMapping("/list-by-route")
@@ -116,13 +146,50 @@
list.forEach(item -> { if (item.getNextProcessId() != null) processIds.add(item.getNextProcessId()); });
Map<Long, MesProProcessDO> processMap = convertMap(
processService.getProcessList(new ArrayList<>(processIds)), MesProProcessDO::getId);
- // 2. 鎷兼帴 VO
- return BeanUtils.toBean(list, MesProRouteProcessRespVO.class, vo -> {
+ // 2. 鎵归噺鑾峰彇浜у嚭浜у搧鐗╂枡淇℃伅锛堣В鏋愰�楀彿鍒嗛殧鐨勫瓧绗︿覆锛�
+ 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> outputItemMap = allOutputItemIds.isEmpty()
+ ? Collections.emptyMap() : mdItemService.getItemMap(allOutputItemIds);
+ // 3. 鎷兼帴 VO
+ List<MesProRouteProcessRespVO> result = BeanUtils.toBean(list, MesProRouteProcessRespVO.class);
+ for (int i = 0; i < result.size(); i++) {
+ MesProRouteProcessRespVO vo = result.get(i);
MapUtils.findAndThen(processMap, vo.getProcessId(),
process -> vo.setProcessCode(process.getCode()).setProcessName(process.getName()));
MapUtils.findAndThen(processMap, vo.getNextProcessId(),
nextProcess -> vo.setNextProcessName(nextProcess.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 = outputItemMap.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 = outputItemMap.get(firstId);
+ if (firstItem != null) {
+ vo.setOutputItemCode(firstItem.getCode());
+ vo.setOutputItemName(firstItem.getName());
+ }
+ }
+ }
+ return result;
}
private MesProRouteProcessRespVO buildRouteProcessRespVO(MesProRouteProcessDO routeProcess) {
--
Gitblit v1.9.3