From e10c196ff7348a4461e8facee10a208779244ece Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期三, 30 九月 2026 15:33:30 +0800
Subject: [PATCH] 宁夏万通需求：出库单行支持主/辅单位录入；考勤节假日配置改为时间段；物料型号维护；设备批量删除；来料检验默认方案解析
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/MesDvMachineryController.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 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..d1fdcab 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,8 @@
private MesDvMachineryTypeService machineryTypeService;
@Resource
private MesMdWorkshopService workshopService;
+ @Resource
+ private cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService workstationService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓璁惧")
@@ -74,6 +76,15 @@
@PreAuthorize("@ss.hasPermission('mes:dv-machinery:delete')")
public CommonResult<Boolean> deleteMachinery(@RequestParam("id") Long id) {
machineryService.deleteMachinery(id);
+ return success(true);
+ }
+
+ @DeleteMapping("/delete-list")
+ @Operation(summary = "鎵归噺鍒犻櫎璁惧")
+ @Parameter(name = "ids", description = "缂栧彿鍒楄〃", required = true, example = "1024,2048")
+ @PreAuthorize("@ss.hasPermission('mes:dv-machinery:delete')")
+ public CommonResult<Boolean> deleteMachineryList(@RequestParam("ids") List<Long> ids) {
+ machineryService.deleteMachineryList(ids);
return success(true);
}
@@ -151,17 +162,21 @@
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));
// 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()));
});
}
--
Gitblit v1.9.3