From 4da4ddc142507b7094edae42ab6f4c35ee67de3e Mon Sep 17 00:00:00 2001 From: YunaiV Date: Fri, 3 Apr 2026 00:10:35 +0800 Subject: [PATCH] ✨ feat(mes): 新增计划编码、开始时间、结束日期及频率信息字段 --- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/checkrecord/MesDvCheckRecordController.java | 4 +++- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/checkrecord/vo/MesDvCheckRecordRespVO.java | 21 +++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/maintenrecord/MesDvMaintenRecordController.java | 7 ++++++- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/maintenrecord/vo/MesDvMaintenRecordRespVO.java | 21 +++++++++++++++++++++ 4 files changed, 51 insertions(+), 2 deletions(-) diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/checkrecord/MesDvCheckRecordController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/checkrecord/MesDvCheckRecordController.java index 42f455d..d6b5529 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/checkrecord/MesDvCheckRecordController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/checkrecord/MesDvCheckRecordController.java @@ -138,7 +138,9 @@ public class MesDvCheckRecordController { // 2. 拼接 VO return BeanUtils.toBean(list, MesDvCheckRecordRespVO.class, vo -> { MapUtils.findAndThen(planMap, vo.getPlanId(), - plan -> vo.setPlanName(plan.getName())); + plan -> vo.setPlanName(plan.getName()).setPlanCode(plan.getCode()) + .setPlanStartDate(plan.getStartDate()).setPlanEndDate(plan.getEndDate()) + .setPlanCycleType(plan.getCycleType()).setPlanCycleCount(plan.getCycleCount())); MapUtils.findAndThen(machineryMap, vo.getMachineryId(), machinery -> vo .setMachineryCode(machinery.getCode()).setMachineryName(machinery.getName()) .setMachineryBrand(machinery.getBrand()).setMachinerySpec(machinery.getSpec())); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/checkrecord/vo/MesDvCheckRecordRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/checkrecord/vo/MesDvCheckRecordRespVO.java index 7c76c4d..857d9dc 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/checkrecord/vo/MesDvCheckRecordRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/checkrecord/vo/MesDvCheckRecordRespVO.java @@ -26,6 +26,27 @@ public class MesDvCheckRecordRespVO { @ExcelProperty("计划名称") private String planName; + @Schema(description = "计划编码", example = "P001") + @ExcelProperty("计划编码") + private String planCode; + + @Schema(description = "开始时间") + @ExcelProperty("开始时间") + private LocalDateTime planStartDate; + + @Schema(description = "结束日期") + @ExcelProperty("结束日期") + private LocalDateTime planEndDate; + + @Schema(description = "频率类型", example = "1") + @ExcelProperty(value = "频率类型", converter = DictConvert.class) + @DictFormat(DictTypeConstants.MES_DV_CYCLE_TYPE) + private Integer planCycleType; + + @Schema(description = "频率数量", example = "5") + @ExcelProperty(value = "频率数量") + private Integer planCycleCount; + @Schema(description = "设备编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private Long machineryId; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/maintenrecord/MesDvMaintenRecordController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/maintenrecord/MesDvMaintenRecordController.java index c812abc..5a9400c 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/maintenrecord/MesDvMaintenRecordController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/maintenrecord/MesDvMaintenRecordController.java @@ -138,7 +138,12 @@ public class MesDvMaintenRecordController { // 2. 拼接 VO return BeanUtils.toBean(list, MesDvMaintenRecordRespVO.class, vo -> { MapUtils.findAndThen(planMap, vo.getPlanId(), - plan -> vo.setPlanName(plan.getName())); + plan -> vo.setPlanName(plan.getName()) + .setPlanCode(plan.getCode()) + .setPlanStartDate(plan.getStartDate()) + .setPlanEndDate(plan.getEndDate()) + .setPlanCycleType(plan.getCycleType()) + .setPlanCycleCount(plan.getCycleCount())); MapUtils.findAndThen(machineryMap, vo.getMachineryId(), machinery -> vo .setMachineryCode(machinery.getCode()).setMachineryName(machinery.getName()) .setMachineryBrand(machinery.getBrand()).setMachinerySpec(machinery.getSpec())); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/maintenrecord/vo/MesDvMaintenRecordRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/maintenrecord/vo/MesDvMaintenRecordRespVO.java index 103e85d..7b8d962 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/maintenrecord/vo/MesDvMaintenRecordRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/maintenrecord/vo/MesDvMaintenRecordRespVO.java @@ -26,6 +26,27 @@ public class MesDvMaintenRecordRespVO { @ExcelProperty("计划名称") private String planName; + @Schema(description = "计划编码", example = "P001") + @ExcelProperty("计划编码") + private String planCode; + + @Schema(description = "开始时间") + @ExcelProperty("开始时间") + private LocalDateTime planStartDate; + + @Schema(description = "结束日期") + @ExcelProperty("结束日期") + private LocalDateTime planEndDate; + + @Schema(description = "频率类型", example = "1") + @ExcelProperty(value = "频率类型", converter = DictConvert.class) + @DictFormat(DictTypeConstants.MES_DV_CYCLE_TYPE) + private Integer planCycleType; + + @Schema(description = "频率数量", example = "5") + @ExcelProperty(value = "频率数量") + private Integer planCycleCount; + @Schema(description = "设备编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private Long machineryId; -- libgit2 0.21.4