From be5783c8a7e13bbc76d33c95643d75779cce21db Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 18 七月 2026 15:39:05 +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 | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 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..8c8d2fd 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
@@ -7,8 +7,10 @@
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
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.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;
@@ -40,6 +42,8 @@
private MesProRouteProcessService routeProcessService;
@Resource
private MesProProcessService processService;
+ @Resource
+ private MesMdItemService mdItemService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓宸ヨ壓璺嚎宸ュ簭")
@@ -116,12 +120,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