diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/vo/MesQcDefectRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/vo/MesQcDefectRespVO.java index c46d755..37cb917 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/vo/MesQcDefectRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/vo/MesQcDefectRespVO.java @@ -29,7 +29,7 @@ public class MesQcDefectRespVO { @Schema(description = "检测项类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "APPEARANCE") @ExcelProperty(value = "检测项类型", converter = DictConvert.class) - @DictFormat(DictTypeConstants.MES_INDICATOR_TYPE) + @DictFormat(DictTypeConstants.MES_DEFECT_TYPE) private String type; @Schema(description = "缺陷等级", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defectrecord/vo/MesQcDefectRecordSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defectrecord/vo/MesQcDefectRecordSaveReqVO.java index 27d0329..2856c8f 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defectrecord/vo/MesQcDefectRecordSaveReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defectrecord/vo/MesQcDefectRecordSaveReqVO.java @@ -37,7 +37,8 @@ public class MesQcDefectRecordSaveReqVO { @InEnum(MesQcDefectLevelEnum.class) private Integer level; - @Schema(description = "缺陷数量", example = "1") + @Schema(description = "缺陷数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "缺陷数量不能为空") private Integer quantity; @Schema(description = "备注", example = "备注") diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/defect/MesQcDefectDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/defect/MesQcDefectDO.java index 5dd840a..ee835c7 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/defect/MesQcDefectDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/defect/MesQcDefectDO.java @@ -34,12 +34,10 @@ public class MesQcDefectDO extends BaseDO { * 缺陷描述 */ private String name; - // TODO @AI:改成 mes_defect_type;字典 sql 变更;另外,dict constants 里也写下 - // TODO @AI:枚举类; /** * 检测项类型 * - * 字典类型 mes_index_type + * 字典类型 {@link cn.iocoder.yudao.module.mes.enums.DictTypeConstants#MES_DEFECT_TYPE} */ private String type; /** 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 3032cb6..cc28487 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 @@ -21,6 +21,7 @@ public interface DictTypeConstants { String MES_DV_SUBJECT_TYPE = "mes_dv_subject_type"; // MES 点检保养项目类型 String MES_INDICATOR_TYPE = "mes_indicator_type"; // MES 检测项类型 String MES_QC_RESULT_TYPE = "mes_qc_result_type"; // MES 质检结果值类型 + String MES_DEFECT_TYPE = "mes_defect_type"; // MES 缺陷检测项类型 String MES_DEFECT_LEVEL = "mes_defect_level"; // MES 缺陷等级 String MES_PRO_WORK_ORDER_STATUS = "mes_pro_work_order_status"; // MES 生产工单状态 String MES_PRO_WORK_ORDER_SOURCE_TYPE = "mes_pro_work_order_source_type"; // 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 fabd288..ab56fea 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 @@ -246,6 +246,8 @@ public interface ErrorCodeConstants { // ========== MES 生产管理-生产任务(1-040-503-000) ========== ErrorCode PRO_TASK_NOT_EXISTS = new ErrorCode(1_040_503_000, "生产任务不存在"); ErrorCode PRO_TASK_ALREADY_FINISHED = new ErrorCode(1_040_503_001, "生产任务已完成或已取消,不能继续操作"); + // ========== MES 生产管理-生产任务投料(1-040-503-100) ========== + ErrorCode PRO_TASK_ISSUE_NOT_EXISTS = new ErrorCode(1_040_503_100, "生产任务投料记录不存在"); // ========== MES 生产管理-安灯呼叫配置(1-040-504-000) ========== ErrorCode PRO_ANDON_CONFIG_NOT_EXISTS = new ErrorCode(1_040_504_000, "安灯呼叫配置不存在"); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/md/autocode/MesMdAutoCodeRuleCodeEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/md/autocode/MesMdAutoCodeRuleCodeEnum.java index 8d2f6ae..c8241a4 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/md/autocode/MesMdAutoCodeRuleCodeEnum.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/md/autocode/MesMdAutoCodeRuleCodeEnum.java @@ -47,7 +47,9 @@ public enum MesMdAutoCodeRuleCodeEnum { WM_MISC_ISSUE_CODE("WM_MISC_ISSUE_CODE", "杂项出库单编码"), PRO_ROUTE_CODE("PRO_ROUTE_CODE", "工艺路线编码"), PRO_FEEDBACK_CODE("PRO_FEEDBACK_CODE", "生产报工单编码"), - PRO_WORK_ORDER_CODE("PRO_WORK_ORDER_CODE", "生产工单编码"); + PRO_WORK_ORDER_CODE("PRO_WORK_ORDER_CODE", "生产工单编码"), + PRO_CARD_CODE("PRO_CARD_CODE", "流转卡编码"), + QC_DEFECT_CODE("QC_DEFECT_CODE", "缺陷类型编码"); /** * 规则代码 diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/process/MesProProcessServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/process/MesProProcessServiceImpl.java index 5af834b..838d4b4 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/process/MesProProcessServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/process/MesProProcessServiceImpl.java @@ -42,11 +42,8 @@ public class MesProProcessServiceImpl implements MesProProcessService { @Override public Long createProcess(MesProProcessSaveReqVO createReqVO) { - // TODO @AI:validateXXXSaveData,传入 vo; - // 1.1 校验工序编码唯一性 - validateProcessCodeUnique(null, createReqVO.getCode()); - // 1.2 校验工序名称唯一性 - validateProcessNameUnique(null, createReqVO.getName()); + // 1. 校验编码、名称唯一 + validateProcessSaveData(createReqVO); // 2. 插入工序 MesProProcessDO process = BeanUtils.toBean(createReqVO, MesProProcessDO.class); @@ -58,11 +55,8 @@ public class MesProProcessServiceImpl implements MesProProcessService { public void updateProcess(MesProProcessSaveReqVO updateReqVO) { // 1.1 校验存在 validateProcessExists(updateReqVO.getId()); - // TODO @AI:validateXXXSaveData,传入 vo; - // 1.2 校验工序编码唯一性 - validateProcessCodeUnique(updateReqVO.getId(), updateReqVO.getCode()); - // 1.3 校验工序名称唯一性 - validateProcessNameUnique(updateReqVO.getId(), updateReqVO.getName()); + // 1.2 校验编码、名称唯一 + validateProcessSaveData(updateReqVO); // 2. 更新工序 MesProProcessDO updateObj = BeanUtils.toBean(updateReqVO, MesProProcessDO.class); @@ -118,6 +112,13 @@ public class MesProProcessServiceImpl implements MesProProcessService { } } + private void validateProcessSaveData(MesProProcessSaveReqVO saveReqVO) { + // 1. 校验编码唯一 + validateProcessCodeUnique(saveReqVO.getId(), saveReqVO.getCode()); + // 2. 校验名称唯一 + validateProcessNameUnique(saveReqVO.getId(), saveReqVO.getName()); + } + @Override public MesProProcessDO getProcess(Long id) { return processMapper.selectById(id); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskIssueServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskIssueServiceImpl.java index 7dc5668..713ca65 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskIssueServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskIssueServiceImpl.java @@ -64,6 +64,7 @@ public class MesProTaskIssueServiceImpl implements MesProTaskIssueService { public void deleteTaskIssue(Long id) { // 1. 校验存在 validateTaskIssueExists(id); + // 2. 删除 taskIssueMapper.deleteById(id); } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/defect/MesQcDefectServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/defect/MesQcDefectServiceImpl.java index a084b2a..feb85e3 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/defect/MesQcDefectServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/defect/MesQcDefectServiceImpl.java @@ -33,10 +33,8 @@ public class MesQcDefectServiceImpl implements MesQcDefectService { @Override public Long createDefect(MesQcDefectSaveReqVO createReqVO) { - // 校验编码唯一 - validateDefectCodeUnique(null, createReqVO.getCode()); - // 校验名称唯一 - validateDefectNameUnique(null, createReqVO.getName()); + // 校验编码、名称唯一 + validateDefectSaveData(null, createReqVO); // 插入 MesQcDefectDO defect = BeanUtils.toBean(createReqVO, MesQcDefectDO.class); @@ -48,10 +46,8 @@ public class MesQcDefectServiceImpl implements MesQcDefectService { public void updateDefect(MesQcDefectSaveReqVO updateReqVO) { // 校验存在 validateDefectExists(updateReqVO.getId()); - // 校验编码唯一 - validateDefectCodeUnique(updateReqVO.getId(), updateReqVO.getCode()); - // 校验名称唯一 - validateDefectNameUnique(updateReqVO.getId(), updateReqVO.getName()); + // 校验编码、名称唯一 + validateDefectSaveData(updateReqVO.getId(), updateReqVO); // 更新 MesQcDefectDO updateObj = BeanUtils.toBean(updateReqVO, MesQcDefectDO.class); @@ -72,6 +68,11 @@ public class MesQcDefectServiceImpl implements MesQcDefectService { } } + private void validateDefectSaveData(Long id, MesQcDefectSaveReqVO reqVO) { + validateDefectCodeUnique(id, reqVO.getCode()); + validateDefectNameUnique(id, reqVO.getName()); + } + private void validateDefectCodeUnique(Long id, String code) { MesQcDefectDO defect = defectMapper.selectByCode(code); if (defect == null) {