From 7bd10d34e8a8dc2437ec8551eb511e37634d7306 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 02 十一月 2026 16:51:52 +0800
Subject: [PATCH] feat(mes): 生产计划审批改走协同办公，修复工单领料与产成品入库校验
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/MesDvMachineryController.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/MesDvMachineryController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/MesDvMachineryController.java
index a44e8ac..b363e3d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/MesDvMachineryController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/MesDvMachineryController.java
@@ -55,6 +55,9 @@
@Resource
private cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService workstationService;
+ @Resource
+ private cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService processService;
+
@PostMapping("/create")
@Operation(summary = "鍒涘缓璁惧")
@PreAuthorize("@ss.hasPermission('mes:dv-machinery:create')")
@@ -157,6 +160,8 @@
convertSet(list, MesDvMachineryDO::getWorkshopId));
Map<Long, cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO> workstationMap =
workstationService.getWorkstationMap(convertSet(list, MesDvMachineryDO::getWorkstationId));
+ Map<Long, cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO> processMap =
+ processService.getProcessMap(convertSet(list, MesDvMachineryDO::getProcessId));
// 2. 鎷兼帴 VO
return BeanUtils.toBean(list, MesDvMachineryRespVO.class, vo -> {
MapUtils.findAndThen(machineryTypeMap, vo.getMachineryTypeId(),
@@ -165,6 +170,8 @@
workshop -> vo.setWorkshopName(workshop.getName()));
MapUtils.findAndThen(workstationMap, vo.getWorkstationId(),
workstation -> vo.setWorkstationName(workstation.getName()));
+ MapUtils.findAndThen(processMap, vo.getProcessId(),
+ process -> vo.setProcessName(process.getName()));
});
}
--
Gitblit v1.9.3