BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 0f77a131e22a1ffd08e1e7343ec5cfe2d9fd6244

Authored by YunaiV
1 parent 165cd78f

refactor(mes): 将 enableFlag/enabled/areaEnabled 重构为 status/areaStatus（CommonStatus） 

QC Template: enableFlag(Boolean) -> status(Integer)，使用 CommonStatusEnum
Warehouse Area: enabled(Boolean) -> status(Integer)，使用 CommonStatusEnum
Warehouse Location: areaEnabled(Boolean) -> areaStatus(Integer)，使用 CommonStatusEnum

涉及前端 API 定义、列表页、表单页的字段名和字典类型切换（INFRA_BOOLEAN_STRING -> COMMON_STATUS），
以及后端 DO、RespVO、SaveReqVO、PageReqVO、Mapper 的同步修改。

注意：语义反转，原 true(启用) 对应新 status=0(开启)，原 false(禁用) 对应新 status=1(关闭)。
Inline Side-by-side
Showing 11 changed files with 33 additions and 27 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/MesQcTemplatePageReqVO.java
  View file @0f77a13
@@ -21,7 +21,7 @@ public class MesQcTemplatePageReqVO extends PageParam { @@ -21,7 +21,7 @@ public class MesQcTemplatePageReqVO extends PageParam {
21 @Schema(description = "检测种类", example = "1") 21 @Schema(description = "检测种类", example = "1")
22 private Integer type; 22 private Integer type;
23 23
24 - @Schema(description = "是否启用", example = "true")  
25 - private Boolean enableFlag; 24 + @Schema(description = "状态", example = "0")
  25 + private Integer status;
26 26
27 } 27 }
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/MesQcTemplateRespVO.java
  View file @0f77a13
@@ -29,9 +29,9 @@ public class MesQcTemplateRespVO { @@ -29,9 +29,9 @@ public class MesQcTemplateRespVO {
29 @ExcelProperty("检测种类") 29 @ExcelProperty("检测种类")
30 private List<Integer> types; 30 private List<Integer> types;
31 31
32 - @Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")  
33 - @ExcelProperty("是否启用")  
34 - private Boolean enableFlag; 32 + @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
  33 + @ExcelProperty("状态")
  34 + private Integer status;
35 35
36 @Schema(description = "备注", example = "备注") 36 @Schema(description = "备注", example = "备注")
37 @ExcelProperty("备注") 37 @ExcelProperty("备注")
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/MesQcTemplateSaveReqVO.java
  View file @0f77a13
@@ -28,9 +28,9 @@ public class MesQcTemplateSaveReqVO { @@ -28,9 +28,9 @@ public class MesQcTemplateSaveReqVO {
28 @Size(min = 1, message = "检测种类至少选择一项") 28 @Size(min = 1, message = "检测种类至少选择一项")
29 private List<Integer> types; 29 private List<Integer> types;
30 30
31 - @Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")  
32 - @NotNull(message = "是否启用不能为空")  
33 - private Boolean enableFlag; 31 + @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
  32 + @NotNull(message = "状态不能为空")
  33 + private Integer status;
34 34
35 @Schema(description = "备注", example = "备注") 35 @Schema(description = "备注", example = "备注")
36 private String remark; 36 private String remark;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/area/MesWmWarehouseAreaRespVO.java
  View file @0f77a13
@@ -59,9 +59,9 @@ public class MesWmWarehouseAreaRespVO { @@ -59,9 +59,9 @@ public class MesWmWarehouseAreaRespVO {
59 @ExcelProperty("位置 Z") 59 @ExcelProperty("位置 Z")
60 private Integer positionZ; 60 private Integer positionZ;
61 61
62 - @Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")  
63 - @ExcelProperty("是否启用")  
64 - private Boolean enabled; 62 + @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
  63 + @ExcelProperty("状态")
  64 + private Integer status;
65 65
66 @Schema(description = "是否冻结", requiredMode = Schema.RequiredMode.REQUIRED, example = "false") 66 @Schema(description = "是否冻结", requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
67 @ExcelProperty("是否冻结") 67 @ExcelProperty("是否冻结")
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/area/MesWmWarehouseAreaSaveReqVO.java
  View file @0f77a13
@@ -41,9 +41,9 @@ public class MesWmWarehouseAreaSaveReqVO { @@ -41,9 +41,9 @@ public class MesWmWarehouseAreaSaveReqVO {
41 @Schema(description = "位置 Z", example = "1") 41 @Schema(description = "位置 Z", example = "1")
42 private Integer positionZ; 42 private Integer positionZ;
43 43
44 - @Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")  
45 - @NotNull(message = "是否启用不能为空")  
46 - private Boolean enabled; 44 + @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
  45 + @NotNull(message = "状态不能为空")
  46 + private Integer status;
47 47
48 @Schema(description = "是否冻结", requiredMode = Schema.RequiredMode.REQUIRED, example = "false") 48 @Schema(description = "是否冻结", requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
49 @NotNull(message = "是否冻结不能为空") 49 @NotNull(message = "是否冻结不能为空")
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/location/MesWmWarehouseLocationRespVO.java
  View file @0f77a13
@@ -36,9 +36,9 @@ public class MesWmWarehouseLocationRespVO { @@ -36,9 +36,9 @@ public class MesWmWarehouseLocationRespVO {
36 @ExcelProperty("面积") 36 @ExcelProperty("面积")
37 private BigDecimal area; 37 private BigDecimal area;
38 38
39 - @Schema(description = "是否启用库位管理", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")  
40 - @ExcelProperty("启用库位管理")  
41 - private Boolean areaEnabled; 39 + @Schema(description = "库位管理状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
  40 + @ExcelProperty("库位管理状态")
  41 + private Integer areaStatus;
42 42
43 @Schema(description = "是否冻结", requiredMode = Schema.RequiredMode.REQUIRED, example = "false") 43 @Schema(description = "是否冻结", requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
44 @ExcelProperty("是否冻结") 44 @ExcelProperty("是否冻结")
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/location/MesWmWarehouseLocationSaveReqVO.java
  View file @0f77a13
@@ -29,9 +29,9 @@ public class MesWmWarehouseLocationSaveReqVO { @@ -29,9 +29,9 @@ public class MesWmWarehouseLocationSaveReqVO {
29 @Schema(description = "面积", example = "500.00") 29 @Schema(description = "面积", example = "500.00")
30 private BigDecimal area; 30 private BigDecimal area;
31 31
32 - @Schema(description = "是否启用库位管理", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")  
33 - @NotNull(message = "是否启用库位管理不能为空")  
34 - private Boolean areaEnabled; 32 + @Schema(description = "库位管理状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
  33 + @NotNull(message = "库位管理状态不能为空")
  34 + private Integer areaStatus;
35 35
36 @Schema(description = "是否冻结", requiredMode = Schema.RequiredMode.REQUIRED, example = "false") 36 @Schema(description = "是否冻结", requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
37 @NotNull(message = "是否冻结不能为空") 37 @NotNull(message = "是否冻结不能为空")
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/MesQcTemplateDO.java
  View file @0f77a13
@@ -47,9 +47,11 @@ public class MesQcTemplateDO extends BaseDO { @@ -47,9 +47,11 @@ public class MesQcTemplateDO extends BaseDO {
47 @TableField(typeHandler = IntegerListTypeHandler.class) 47 @TableField(typeHandler = IntegerListTypeHandler.class)
48 private List<Integer> types; 48 private List<Integer> types;
49 /** 49 /**
50 - * 是否启用 50 + * 状态
  51 + *
  52 + * 枚举 {@link cn.iocoder.yudao.framework.common.enums.CommonStatusEnum}
51 */ 53 */
52 - private Boolean enableFlag; 54 + private Integer status;
53 /** 55 /**
54 * 备注 56 * 备注
55 */ 57 */
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/warehouse/MesWmWarehouseAreaDO.java
  View file @0f77a13
@@ -61,9 +61,11 @@ public class MesWmWarehouseAreaDO extends BaseDO { @@ -61,9 +61,11 @@ public class MesWmWarehouseAreaDO extends BaseDO {
61 */ 61 */
62 private Integer positionZ; 62 private Integer positionZ;
63 /** 63 /**
64 - * 是否启用 64 + * 状态
  65 + *
  66 + * 枚举 {@link cn.iocoder.yudao.framework.common.enums.CommonStatusEnum}
65 */ 67 */
66 - private Boolean enabled; 68 + private Integer status;
67 /** 69 /**
68 * 是否冻结 70 * 是否冻结
69 */ 71 */
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/warehouse/MesWmWarehouseLocationDO.java
  View file @0f77a13
@@ -45,9 +45,11 @@ public class MesWmWarehouseLocationDO extends BaseDO { @@ -45,9 +45,11 @@ public class MesWmWarehouseLocationDO extends BaseDO {
45 */ 45 */
46 private BigDecimal area; 46 private BigDecimal area;
47 /** 47 /**
48 - * 是否启用库位管理 48 + * 库位管理状态
  49 + *
  50 + * 枚举 {@link cn.iocoder.yudao.framework.common.enums.CommonStatusEnum}
49 */ 51 */
50 - private Boolean areaEnabled; 52 + private Integer areaStatus;
51 /** 53 /**
52 * 是否冻结 54 * 是否冻结
53 */ 55 */
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/MesQcTemplateMapper.java
  View file @0f77a13
@@ -26,7 +26,7 @@ public interface MesQcTemplateMapper extends BaseMapperX&lt;MesQcTemplateDO&gt; { @@ -26,7 +26,7 @@ public interface MesQcTemplateMapper extends BaseMapperX&lt;MesQcTemplateDO&gt; {
26 if (reqVO.getType() != null) { 26 if (reqVO.getType() != null) {
27 query.apply(MyBatisUtils.findInSet("types", reqVO.getType())); 27 query.apply(MyBatisUtils.findInSet("types", reqVO.getType()));
28 } 28 }
29 - query.eqIfPresent(MesQcTemplateDO::getEnableFlag, reqVO.getEnableFlag()); 29 + query.eqIfPresent(MesQcTemplateDO::getStatus, reqVO.getStatus());
30 return selectPage(reqVO, query); 30 return selectPage(reqVO, query);
31 } 31 }
32 32