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 | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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 932db26..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
@@ -52,6 +52,11 @@
private MesDvMachineryTypeService machineryTypeService;
@Resource
private MesMdWorkshopService workshopService;
+ @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 = "鍒涘缓璁惧")
@@ -80,7 +85,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱璁惧")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:dv-machinery:query')")
public CommonResult<MesDvMachineryRespVO> getMachinery(@RequestParam("id") Long id) {
MesDvMachineryDO machinery = machineryService.getMachinery(id);
if (machinery == null) {
@@ -91,7 +95,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱璁惧鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:dv-machinery:query')")
public CommonResult<PageResult<MesDvMachineryRespVO>> getMachineryPage(@Valid MesDvMachineryPageReqVO pageReqVO) {
PageResult<MesDvMachineryDO> pageResult = machineryService.getMachineryPage(pageReqVO);
return success(new PageResult<>(buildMachineryRespVOList(pageResult.getList()), pageResult.getTotal()));
@@ -112,7 +115,6 @@
@GetMapping("/simple-list")
@Operation(summary = "鑾峰緱璁惧绮剧畝鍒楄〃", description = "涓昏鐢ㄤ簬鍓嶇鐨勪笅鎷夐�夐」")
- @PreAuthorize("@ss.hasPermission('mes:dv-machinery:query')")
public CommonResult<List<MesDvMachineryRespVO>> getMachinerySimpleList() {
List<MesDvMachineryDO> list = machineryService.getMachineryList();
return success(BeanUtils.toBean(list, MesDvMachineryRespVO.class));
@@ -151,17 +153,25 @@
if (CollUtil.isEmpty(list)) {
return Collections.emptyList();
}
- // 1. 鎵归噺鑾峰彇璁惧绫诲瀷鍜岃溅闂翠俊鎭�
+ // 1. 鎵归噺鑾峰彇璁惧绫诲瀷銆佽溅闂村拰宸ヤ綔绔欎俊鎭�
Map<Long, MesDvMachineryTypeDO> machineryTypeMap = machineryTypeService.getMachineryTypeMap(
convertSet(list, MesDvMachineryDO::getMachineryTypeId));
Map<Long, MesMdWorkshopDO> workshopMap = workshopService.getWorkshopMap(
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(),
machineryType -> vo.setMachineryTypeName(machineryType.getName()));
MapUtils.findAndThen(workshopMap, vo.getWorkshopId(),
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