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 1d1ed70..33e7822 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 @@ -84,9 +84,7 @@ public class MesDvMachineryController { if (machinery == null) { return success(null); } - // 复用 buildMachineryRespVOList 拼接设备类型名称和车间名称 - List list = buildMachineryRespVOList(Collections.singletonList(machinery)); - return success(list.get(0)); + return success(buildMachineryRespVOList(Collections.singletonList(machinery)).get(0)); } @GetMapping("/page") diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachinerySaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachinerySaveReqVO.java index b8e9e67..995e6f4 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachinerySaveReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachinerySaveReqVO.java @@ -5,6 +5,8 @@ import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.Data; +import java.time.LocalDateTime; + @Schema(description = "管理后台 - MES 设备台账新增/修改 Request VO") @Data public class MesDvMachinerySaveReqVO { @@ -38,6 +40,12 @@ public class MesDvMachinerySaveReqVO { @NotNull(message = "设备状态不能为空") private Integer status; + @Schema(description = "最近保养时间") + private LocalDateTime lastMaintenTime; + + @Schema(description = "最近点检时间") + private LocalDateTime lastCheckTime; + @Schema(description = "备注", example = "备注") private String remark; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java index 33475b4..64de731 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java @@ -17,5 +17,7 @@ public interface DictTypeConstants { String MES_CAL_CALENDAR_TYPE = "mes_cal_calendar_type"; // MES 班组类型 String MES_CAL_PLAN_STATUS = "mes_cal_plan_status"; // MES 排班计划状态 String MES_DV_MACHINERY_STATUS = "mes_dv_machinery_status"; // MES 设备状态 + String MES_INDEX_TYPE = "mes_index_type"; // MES 检测项类型 + String MES_DEFECT_LEVEL = "mes_defect_level"; // MES 缺陷等级 } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java index 3295a5e..274ec06 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java @@ -152,6 +152,8 @@ public interface ErrorCodeConstants { // ========== MES 质量管理-缺陷类型(1-040-602-000) ========== ErrorCode QC_DEFECT_NOT_EXISTS = new ErrorCode(1_040_602_000, "缺陷类型不存在"); + ErrorCode QC_DEFECT_CODE_DUPLICATE = new ErrorCode(1_040_602_001, "缺陷类型编码已存在"); + ErrorCode QC_DEFECT_NAME_DUPLICATE = new ErrorCode(1_040_602_002, "缺陷类型名称已存在"); // ========== MES 仓库管理-仓库(1-040-700-000) ========== ErrorCode WM_WAREHOUSE_NOT_EXISTS = new ErrorCode(1_040_700_000, "仓库不存在"); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/dv/MesDvMachineryStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/dv/MesDvMachineryStatusEnum.java index f2bfc7f..4a1568a 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/dv/MesDvMachineryStatusEnum.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/dv/MesDvMachineryStatusEnum.java @@ -15,9 +15,9 @@ import java.util.Arrays; @AllArgsConstructor public enum MesDvMachineryStatusEnum implements ArrayValuable { - RUNNING(1, "运行中"), - STOP(2, "停机"), - FAULT(3, "故障"); + STOP(1, "停机"), + PRODUCING(2, "生产中"), + MAINTENANCE(3, "维护中"); public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesDvMachineryStatusEnum::getStatus).toArray(Integer[]::new);