From 7a23c450f3ac85de7dca1b908de273ff636ce218 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 23 七月 2026 17:48:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProcessController.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 46 insertions(+), 4 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..e02cb8a 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;
@@ -25,6 +29,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+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 +45,8 @@
private MesProRouteProcessService routeProcessService;
@Resource
private MesProProcessService processService;
+ @Resource
+ private MesMdItemService mdItemService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓宸ヨ壓璺嚎宸ュ簭")
@@ -74,14 +81,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,12 +150,20 @@
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
+ // 2. 鎵归噺鑾峰彇浜у嚭浜у搧鐗╂枡淇℃伅
+ Set<Long> outputItemIds = convertSet(list, MesProRouteProcessDO::getOutputItemId);
+ outputItemIds.remove(null);
+ Map<Long, MesMdItemDO> outputItemMap = outputItemIds.isEmpty()
+ ? Collections.emptyMap()
+ : mdItemService.getItemMap(outputItemIds);
+ // 3. 鎷兼帴 VO
return BeanUtils.toBean(list, MesProRouteProcessRespVO.class, vo -> {
MapUtils.findAndThen(processMap, vo.getProcessId(),
process -> vo.setProcessCode(process.getCode()).setProcessName(process.getName()));
MapUtils.findAndThen(processMap, vo.getNextProcessId(),
nextProcess -> vo.setNextProcessName(nextProcess.getName()));
+ MapUtils.findAndThen(outputItemMap, vo.getOutputItemId(),
+ item -> vo.setOutputItemCode(item.getCode()).setOutputItemName(item.getName()));
});
}
--
Gitblit v1.9.3