Commit cb0514589197b414d5dd4ab4d471f7850a0b696a
1 parent
6e518358
feat(mes): change rqcType from String to Integer and update related fields in RQC classes
Showing
4 changed files
with
12 additions
and
13 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/MesQcRqcPageReqVO.java
| ... | ... | @@ -29,8 +29,8 @@ public class MesQcRqcPageReqVO extends PageParam { |
| 29 | 29 | @Schema(description = "产品物料 ID", example = "20") |
| 30 | 30 | private Long itemId; |
| 31 | 31 | |
| 32 | - @Schema(description = "退货检验类型", example = "1") | |
| 33 | - private String rqcType; | |
| 32 | + @Schema(description = "检验类型", example = "1") | |
| 33 | + private Integer rqcType; | |
| 34 | 34 | |
| 35 | 35 | @Schema(description = "检测结果", example = "1") |
| 36 | 36 | private Integer checkResult; | ... | ... |
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/MesQcRqcRespVO.java
| ... | ... | @@ -42,11 +42,11 @@ public class MesQcRqcRespVO { |
| 42 | 42 | @Schema(description = "来源单据行 ID", example = "300") |
| 43 | 43 | private Long sourceLineId; |
| 44 | 44 | |
| 45 | - // ========== 退货类型 ========== | |
| 45 | + // ========== 检验类型 ========== | |
| 46 | 46 | |
| 47 | - @Schema(description = "退货检验类型", example = "1") | |
| 48 | - @ExcelProperty("退货类型") | |
| 49 | - private String rqcType; | |
| 47 | + @Schema(description = "检验类型", example = "1") | |
| 48 | + @ExcelProperty("检验类型") | |
| 49 | + private Integer rqcType; | |
| 50 | 50 | |
| 51 | 51 | // ========== 物料 ========== |
| 52 | 52 | ... | ... |
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/MesQcRqcSaveReqVO.java
| ... | ... | @@ -41,10 +41,10 @@ public class MesQcRqcSaveReqVO { |
| 41 | 41 | @Schema(description = "来源单据行 ID", example = "300") |
| 42 | 42 | private Long sourceLineId; |
| 43 | 43 | |
| 44 | - // ========== 退货类型 ========== | |
| 44 | + // ========== 检验类型 ========== | |
| 45 | 45 | |
| 46 | - @Schema(description = "退货检验类型", example = "1") | |
| 47 | - private String rqcType; | |
| 46 | + @Schema(description = "检验类型", example = "1") | |
| 47 | + private Integer rqcType; | |
| 48 | 48 | |
| 49 | 49 | // ========== 物料 ========== |
| 50 | 50 | ... | ... |
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/rqc/MesQcRqcDO.java
| ... | ... | @@ -65,15 +65,14 @@ public class MesQcRqcDO extends BaseDO { |
| 65 | 65 | */ |
| 66 | 66 | private Long sourceLineId; |
| 67 | 67 | |
| 68 | - // ========== 退货类型 ========== | |
| 68 | + // ========== 检验类型 ========== | |
| 69 | 69 | |
| 70 | - // TODO @AI:改成 int;然后枚举类在 dict constants 也添加下; | |
| 71 | 70 | /** |
| 72 | - * 退货检验类型 | |
| 71 | + * 检验类型 | |
| 73 | 72 | * |
| 74 | 73 | * 字典 mes_rqc_type |
| 75 | 74 | */ |
| 76 | - private String rqcType; | |
| 75 | + private Integer rqcType; | |
| 77 | 76 | |
| 78 | 77 | // ========== 物料 ========== |
| 79 | 78 | ... | ... |