diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicator/vo/MesQcIndicatorPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicator/vo/MesQcIndicatorPageReqVO.java index 773814e..ff92db5 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicator/vo/MesQcIndicatorPageReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicator/vo/MesQcIndicatorPageReqVO.java @@ -18,8 +18,8 @@ public class MesQcIndicatorPageReqVO extends PageParam { @Schema(description = "检测项名称", example = "长度") private String name; - @Schema(description = "检测项类型", example = "SIZE") - private String type; + @Schema(description = "检测项类型", example = "1") + private Integer type; @Schema(description = "结果值类型", example = "1") private Integer resultType; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicator/vo/MesQcIndicatorRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicator/vo/MesQcIndicatorRespVO.java index f4b7f9c..f3f5995 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicator/vo/MesQcIndicatorRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicator/vo/MesQcIndicatorRespVO.java @@ -27,10 +27,10 @@ public class MesQcIndicatorRespVO { @ExcelProperty("检测项名称") private String name; - @Schema(description = "检测项类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "SIZE") + @Schema(description = "检测项类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @ExcelProperty(value = "检测项类型", converter = DictConvert.class) @DictFormat(DictTypeConstants.MES_INDICATOR_TYPE) - private String type; + private Integer type; @Schema(description = "检测工具", example = "卡尺") @ExcelProperty("检测工具") diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicator/vo/MesQcIndicatorSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicator/vo/MesQcIndicatorSaveReqVO.java index 6c692ef..d7fa865 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicator/vo/MesQcIndicatorSaveReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicator/vo/MesQcIndicatorSaveReqVO.java @@ -20,9 +20,9 @@ public class MesQcIndicatorSaveReqVO { @NotEmpty(message = "检测项名称不能为空") private String name; - @Schema(description = "检测项类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "SIZE") - @NotEmpty(message = "检测项类型不能为空") - private String type; + @Schema(description = "检测项类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "检测项类型不能为空") + private Integer type; @Schema(description = "检测工具", example = "卡尺") private String tool; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/line/MesQcIpqcLineRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/line/MesQcIpqcLineRespVO.java index dba7020..8fab393 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/line/MesQcIpqcLineRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/line/MesQcIpqcLineRespVO.java @@ -27,8 +27,8 @@ public class MesQcIpqcLineRespVO { @Schema(description = "检测指标名称", example = "外观") private String indicatorName; - @Schema(description = "检测指标类型", example = "QUANTITATIVE") - private String indicatorType; + @Schema(description = "检测指标类型", example = "1") + private Integer indicatorType; @Schema(description = "检测工具", example = "卡尺") private String tool; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/line/MesQcIqcLineRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/line/MesQcIqcLineRespVO.java index d8170ae..508dcbf 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/line/MesQcIqcLineRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/line/MesQcIqcLineRespVO.java @@ -27,8 +27,8 @@ public class MesQcIqcLineRespVO { @Schema(description = "检测指标名称", example = "外观") private String indicatorName; - @Schema(description = "检测指标类型", example = "QUANTITATIVE") - private String indicatorType; + @Schema(description = "检测指标类型", example = "1") + private Integer indicatorType; @Schema(description = "检测工具", example = "卡尺") private String tool; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/line/MesQcOqcLineRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/line/MesQcOqcLineRespVO.java index ae69409..39cf911 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/line/MesQcOqcLineRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/line/MesQcOqcLineRespVO.java @@ -27,8 +27,8 @@ public class MesQcOqcLineRespVO { @Schema(description = "检测指标名称", example = "外观") private String indicatorName; - @Schema(description = "检测指标类型", example = "QUANTITATIVE") - private String indicatorType; + @Schema(description = "检测指标类型", example = "1") + private Integer indicatorType; @Schema(description = "检测工具", example = "卡尺") private String tool; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/line/MesQcRqcLineRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/line/MesQcRqcLineRespVO.java index da38747..2f785ce 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/line/MesQcRqcLineRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/line/MesQcRqcLineRespVO.java @@ -27,8 +27,8 @@ public class MesQcRqcLineRespVO { @Schema(description = "检测指标名称", example = "外观") private String indicatorName; - @Schema(description = "检测指标类型", example = "QUANTITATIVE") - private String indicatorType; + @Schema(description = "检测指标类型", example = "1") + private Integer indicatorType; @Schema(description = "检测工具", example = "卡尺") private String tool; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/indicator/MesQcTemplateIndicatorRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/indicator/MesQcTemplateIndicatorRespVO.java index 67d3838..e32be87 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/indicator/MesQcTemplateIndicatorRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/indicator/MesQcTemplateIndicatorRespVO.java @@ -63,9 +63,9 @@ public class MesQcTemplateIndicatorRespVO { @ExcelProperty("检测项名称") private String indicatorName; - @Schema(description = "检测项类型(字典 mes_index_type)", example = "SIZE") + @Schema(description = "检测项类型", example = "1") @ExcelProperty("检测项类型") - private String indicatorType; + private Integer indicatorType; @Schema(description = "检测工具", example = "卡尺") @ExcelProperty("检测工具") diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/indicator/MesQcIndicatorDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/indicator/MesQcIndicatorDO.java index a338ba3..41777b2 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/indicator/MesQcIndicatorDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/indicator/MesQcIndicatorDO.java @@ -39,7 +39,7 @@ public class MesQcIndicatorDO extends BaseDO { * * 枚举 {@link cn.iocoder.yudao.module.mes.enums.DictTypeConstants#MES_INDICATOR_TYPE} */ - private String type; + private Integer type; /** * 检测工具 */