From a19352f18e5ec794c649d93c6d05db49942445e3 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Fri, 20 Feb 2026 15:25:38 +0800 Subject: [PATCH] feat(mes): 新增设备和点检保养项目精简列表接口及批次号字段 --- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/MesDvMachineryController.java | 8 ++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/subject/MesDvSubjectController.java | 8 ++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkorderController.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkorderPageReqVO.java | 3 +++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkorderRespVO.java | 8 ++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkorderSaveReqVO.java | 3 +++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/workorder/MesProWorkorderDO.java | 4 ++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkorderMapper.java | 1 + yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryService.java | 7 +++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryServiceImpl.java | 5 +++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/subject/MesDvSubjectService.java | 7 +++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/subject/MesDvSubjectServiceImpl.java | 5 +++++ 12 files changed, 60 insertions(+), 1 deletion(-) 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 33e7822..bcf391c 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 @@ -108,6 +108,14 @@ public class MesDvMachineryController { buildMachineryRespVOList(list)); } + @GetMapping("/simple-list") + @Operation(summary = "获得设备精简列表", description = "主要用于前端的下拉选项") + @PreAuthorize("@ss.hasPermission('mes:dv-machinery:query')") + public CommonResult> getMachinerySimpleList() { + List list = machineryService.getMachinerySimpleList(); + return success(BeanUtils.toBean(list, MesDvMachineryRespVO.class)); + } + // ==================== 拼接 VO ==================== private List buildMachineryRespVOList(List list) { diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/subject/MesDvSubjectController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/subject/MesDvSubjectController.java index d1258cf..709de0e 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/subject/MesDvSubjectController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/subject/MesDvSubjectController.java @@ -77,6 +77,14 @@ public class MesDvSubjectController { return success(BeanUtils.toBean(pageResult, MesDvSubjectRespVO.class)); } + @GetMapping("/simple-list") + @Operation(summary = "获得点检保养项目精简列表", description = "主要用于前端的下拉选项") + @PreAuthorize("@ss.hasPermission('mes:dv-subject:query')") + public CommonResult> getSubjectSimpleList() { + List list = subjectService.getSubjectSimpleList(); + return success(BeanUtils.toBean(list, MesDvSubjectRespVO.class)); + } + @GetMapping("/export-excel") @Operation(summary = "导出点检保养项目 Excel") @PreAuthorize("@ss.hasPermission('mes:dv-subject:export')") diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkorderController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkorderController.java index 850cf6c..36de962 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkorderController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkorderController.java @@ -167,7 +167,7 @@ public class MesProWorkOrderController { MapUtils.findAndThen(clientMap, vo.getClientId(), client -> vo.setClientName(client.getName()).setClientCode(client.getCode())); MapUtils.findAndThen(vendorMap, vo.getVendorId(), - vendor -> vo.setVendorName(vendor.getName())); + vendor -> vo.setVendorName(vendor.getName()).setVendorCode(vendor.getCode())); MapUtils.findAndThen(unitMeasureMap, vo.getUnitMeasureId(), unitMeasure -> vo.setUnitMeasureName(unitMeasure.getName())); MapUtils.findAndThen(parentMap, vo.getParentId(), diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkorderPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkorderPageReqVO.java index 0763204..1a97cc1 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkorderPageReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkorderPageReqVO.java @@ -35,6 +35,9 @@ public class MesProWorkOrderPageReqVO extends PageParam { @Schema(description = "客户编号", example = "300") private Long clientId; + @Schema(description = "批次号", example = "BATCH-001") + private String batchCode; + @Schema(description = "工单状态", example = "0") private Integer status; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkorderRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkorderRespVO.java index 275a3d9..3df59b4 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkorderRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkorderRespVO.java @@ -94,10 +94,18 @@ public class MesProWorkOrderRespVO { @Schema(description = "供应商编号", example = "400") private Long vendorId; + @Schema(description = "供应商编码", example = "V-001") + @ExcelProperty("供应商编码") + private String vendorCode; + @Schema(description = "供应商名称", example = "供应商 A") @ExcelProperty("供应商名称") private String vendorName; + @Schema(description = "批次号", example = "BATCH-001") + @ExcelProperty("批次号") + private String batchCode; + @Schema(description = "需求日期") @ExcelProperty("需求日期") private LocalDateTime requestDate; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkorderSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkorderSaveReqVO.java index 79facb6..bcc1671 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkorderSaveReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkorderSaveReqVO.java @@ -61,6 +61,9 @@ public class MesProWorkOrderSaveReqVO { @Schema(description = "供应商编号", example = "400") private Long vendorId; + @Schema(description = "批次号", example = "BATCH-001") + private String batchCode; + @Schema(description = "需求日期", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "需求日期不能为空") private LocalDateTime requestDate; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/workorder/MesProWorkorderDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/workorder/MesProWorkorderDO.java index 39af3cb..68ad55f 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/workorder/MesProWorkorderDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/workorder/MesProWorkorderDO.java @@ -101,6 +101,10 @@ public class MesProWorkOrderDO extends BaseDO { */ private Long vendorId; /** + * 批次号 + */ + private String batchCode; + /** * 需求日期 */ private LocalDateTime requestDate; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkorderMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkorderMapper.java index c4539b6..2af2a1b 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkorderMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkorderMapper.java @@ -23,6 +23,7 @@ public interface MesProWorkOrderMapper extends BaseMapperX { .eqIfPresent(MesProWorkOrderDO::getOrderSourceType, reqVO.getOrderSourceType()) .eqIfPresent(MesProWorkOrderDO::getProductId, reqVO.getProductId()) .eqIfPresent(MesProWorkOrderDO::getClientId, reqVO.getClientId()) + .likeIfPresent(MesProWorkOrderDO::getBatchCode, reqVO.getBatchCode()) .eqIfPresent(MesProWorkOrderDO::getStatus, reqVO.getStatus()) .betweenIfPresent(MesProWorkOrderDO::getRequestDate, reqVO.getRequestDate()) .orderByDesc(MesProWorkOrderDO::getId)); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryService.java index 6d6a993..53a7499 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryService.java @@ -73,6 +73,13 @@ public interface MesDvMachineryService { void validateMachineryExists(Long id); /** + * 获得设备精简列表（下拉选项用） + * + * @return 设备列表 + */ + List getMachinerySimpleList(); + + /** * 获得设备列表 * * @param ids 编号数组 diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryServiceImpl.java index 3581ce5..ef06896 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryServiceImpl.java @@ -118,6 +118,11 @@ public class MesDvMachineryServiceImpl implements MesDvMachineryService { } @Override + public List getMachinerySimpleList() { + return machineryMapper.selectList(); + } + + @Override public List getMachineryList(Collection ids) { if (CollUtil.isEmpty(ids)) { return Collections.emptyList(); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/subject/MesDvSubjectService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/subject/MesDvSubjectService.java index b8655f3..c76db0e 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/subject/MesDvSubjectService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/subject/MesDvSubjectService.java @@ -65,6 +65,13 @@ public interface MesDvSubjectService { void validateSubjectExists(Long id); /** + * 获得点检保养项目精简列表（下拉选项用） + * + * @return 项目列表 + */ + List getSubjectSimpleList(); + + /** * 获得点检保养项目列表 * * @param ids 编号数组 diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/subject/MesDvSubjectServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/subject/MesDvSubjectServiceImpl.java index e39311a..1942bb4 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/subject/MesDvSubjectServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/subject/MesDvSubjectServiceImpl.java @@ -93,6 +93,11 @@ public class MesDvSubjectServiceImpl implements MesDvSubjectService { } @Override + public List getSubjectSimpleList() { + return subjectMapper.selectList(); + } + + @Override public List getSubjectList(Collection ids) { if (CollUtil.isEmpty(ids)) { return Collections.emptyList(); -- libgit2 0.21.4