diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/MesQcDefectRecordController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/MesQcDefectRecordController.java index e10b39e..94bd359 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/MesQcDefectRecordController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/MesQcDefectRecordController.java @@ -3,9 +3,9 @@ package cn.iocoder.yudao.module.mes.controller.admin.qc.defect; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.MesQcDefectRecordPageReqVO; -import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.MesQcDefectRecordRespVO; -import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.MesQcDefectRecordSaveReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.record.MesQcDefectRecordPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.record.MesQcDefectRecordRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.record.MesQcDefectRecordSaveReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defect.MesQcDefectRecordDO; import cn.iocoder.yudao.module.mes.service.qc.defect.MesQcDefectRecordService; import io.swagger.v3.oas.annotations.Operation; @@ -31,14 +31,14 @@ public class MesQcDefectRecordController { // TODO @芋艿:说下 mes:qc-record 这个权限标识的情况 @PostMapping("/create") @Operation(summary = "创建质检缺陷记录") - @PreAuthorize("@ss.hasPermission('mes:qc-record:create')") + @PreAuthorize("@ss.hasPermission('mes:qc-defect:create')") public CommonResult createDefectRecord(@Valid @RequestBody MesQcDefectRecordSaveReqVO createReqVO) { return success(defectRecordService.createDefectRecord(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新质检缺陷记录") - @PreAuthorize("@ss.hasPermission('mes:qc-record:update')") + @PreAuthorize("@ss.hasPermission('mes:qc-defect:update')") public CommonResult updateDefectRecord(@Valid @RequestBody MesQcDefectRecordSaveReqVO updateReqVO) { defectRecordService.updateDefectRecord(updateReqVO); return success(true); @@ -47,7 +47,7 @@ public class MesQcDefectRecordController { @DeleteMapping("/delete") @Operation(summary = "删除质检缺陷记录") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:qc-record:update')") + @PreAuthorize("@ss.hasPermission('mes:qc-defect:update')") public CommonResult deleteDefectRecord(@RequestParam("id") Long id) { defectRecordService.deleteDefectRecord(id); return success(true); @@ -55,7 +55,7 @@ public class MesQcDefectRecordController { @GetMapping("/page") @Operation(summary = "获得质检缺陷记录分页") - @PreAuthorize("@ss.hasPermission('mes:qc-record:query')") + @PreAuthorize("@ss.hasPermission('mes:qc-defect:query')") public CommonResult> getDefectRecordPage(@Valid MesQcDefectRecordPageReqVO pageReqVO) { PageResult pageResult = defectRecordService.getDefectRecordPage(pageReqVO); return success(BeanUtils.toBean(pageResult, MesQcDefectRecordRespVO.class)); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/vo/MesQcDefectPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/vo/MesQcDefectPageReqVO.java index 388b02a..7f2638c 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/vo/MesQcDefectPageReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/vo/MesQcDefectPageReqVO.java @@ -21,7 +21,7 @@ public class MesQcDefectPageReqVO extends PageParam { @Schema(description = "检测项类型", example = "APPEARANCE") private String type; - @Schema(description = "缺陷等级", example = "MIN") - private String level; + @Schema(description = "缺陷等级", example = "1") + private Integer level; } 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 df80490..f8485f0 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 @@ -32,10 +32,10 @@ public class MesQcDefectRespVO { @DictFormat(DictTypeConstants.MES_INDEX_TYPE) private String type; - @Schema(description = "缺陷等级", requiredMode = Schema.RequiredMode.REQUIRED, example = "MIN") + @Schema(description = "缺陷等级", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @ExcelProperty(value = "缺陷等级", converter = DictConvert.class) @DictFormat(DictTypeConstants.MES_DEFECT_LEVEL) - private String level; + private Integer level; @Schema(description = "备注", example = "备注") @ExcelProperty("备注") diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/vo/MesQcDefectSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/vo/MesQcDefectSaveReqVO.java index eac79f6..3af78fe 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/vo/MesQcDefectSaveReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/vo/MesQcDefectSaveReqVO.java @@ -1,7 +1,10 @@ package cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo; +import cn.iocoder.yudao.framework.common.validation.InEnum; +import cn.iocoder.yudao.module.mes.enums.qc.MesQcDefectLevelEnum; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.Data; @Schema(description = "管理后台 - MES 缺陷类型新增/修改 Request VO") @@ -23,9 +26,10 @@ public class MesQcDefectSaveReqVO { @NotEmpty(message = "检测项类型不能为空") private String type; - @Schema(description = "缺陷等级", requiredMode = Schema.RequiredMode.REQUIRED, example = "MIN") - @NotEmpty(message = "缺陷等级不能为空") - private String level; + @Schema(description = "缺陷等级", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "缺陷等级不能为空") + @InEnum(MesQcDefectLevelEnum.class) + private Integer level; @Schema(description = "备注", example = "备注") private String remark; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/vo/MesQcDefectRecordPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/vo/record/MesQcDefectRecordPageReqVO.java index dab7f07..2e26771 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/vo/MesQcDefectRecordPageReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/vo/record/MesQcDefectRecordPageReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo; +package cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.record; import cn.iocoder.yudao.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/vo/MesQcDefectRecordRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/vo/record/MesQcDefectRecordRespVO.java index 664b39e..af8f8a9 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/vo/MesQcDefectRecordRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/vo/record/MesQcDefectRecordRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo; +package cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.record; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/vo/MesQcDefectRecordSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/vo/record/MesQcDefectRecordSaveReqVO.java index c5f4717..c221011 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/vo/MesQcDefectRecordSaveReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/vo/record/MesQcDefectRecordSaveReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo; +package cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.record; import cn.iocoder.yudao.framework.common.validation.InEnum; import cn.iocoder.yudao.module.mes.enums.qc.MesQcDefectLevelEnum; 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 af46e46..dd5f077 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 @@ -42,14 +42,12 @@ public class MesQcDefectDO extends BaseDO { * 字典类型 mes_index_type */ private String type; - // TODO @AI:改成 mes_defect_level;另外,dict constants 里也写下 - // TODO @AI:枚举类; /** * 缺陷等级 * - * 字典类型 mes_defect_level + * 枚举 {@link cn.iocoder.yudao.module.mes.enums.qc.MesQcDefectLevelEnum} */ - private String level; + private Integer level; /** * 备注 */ diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/defect/MesQcDefectRecordMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/defect/MesQcDefectRecordMapper.java index 34c2773..ffb78ab 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/defect/MesQcDefectRecordMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/defect/MesQcDefectRecordMapper.java @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.mes.dal.mysql.qc.defect; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.MesQcDefectRecordPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.record.MesQcDefectRecordPageReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defect.MesQcDefectRecordDO; import org.apache.ibatis.annotations.Mapper; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/defect/MesQcDefectRecordService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/defect/MesQcDefectRecordService.java index 5fc5174..10a2e72 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/defect/MesQcDefectRecordService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/defect/MesQcDefectRecordService.java @@ -1,8 +1,8 @@ package cn.iocoder.yudao.module.mes.service.qc.defect; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.MesQcDefectRecordPageReqVO; -import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.MesQcDefectRecordSaveReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.record.MesQcDefectRecordPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.record.MesQcDefectRecordSaveReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defect.MesQcDefectRecordDO; import jakarta.validation.Valid; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/defect/MesQcDefectRecordServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/defect/MesQcDefectRecordServiceImpl.java index b7276b3..e4db73f 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/defect/MesQcDefectRecordServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/defect/MesQcDefectRecordServiceImpl.java @@ -2,8 +2,8 @@ package cn.iocoder.yudao.module.mes.service.qc.defect; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.MesQcDefectRecordPageReqVO; -import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.MesQcDefectRecordSaveReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.record.MesQcDefectRecordPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.record.MesQcDefectRecordSaveReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defect.MesQcDefectRecordDO; import cn.iocoder.yudao.module.mes.dal.mysql.qc.defect.MesQcDefectRecordMapper; import cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum;