diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdPlanInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdPlanInfo.java index d5235e92..3466b653 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdPlanInfo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdPlanInfo.java @@ -145,7 +145,7 @@ public class ProdPlanInfo extends TenantEntity { private String attachId; /** - * 工单计划状态(0未下发 1已下发 2已开始 3已完成) + * 工单计划状态(0未下发 1已下发 2已开始 3已完成 4已撤回) */ private String planStatus; diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdPlanInfoBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdPlanInfoBo.java index d62b7b34..646c940e 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdPlanInfoBo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdPlanInfoBo.java @@ -64,12 +64,12 @@ public class ProdPlanInfoBo extends BaseEntity { /** * 物料BOM_ID */ - @NotNull(message = "物料BOM不能为空", groups = { AddGroup.class, EditGroup.class }) private Long materialBomId; /** * 物料bom版本 */ + @NotNull(message = "物料BOM版本不能为空", groups = { AddGroup.class, EditGroup.class }) private String materialBomVersion; @@ -151,7 +151,7 @@ public class ProdPlanInfoBo extends BaseEntity { private String attachId; /** - * 工单计划状态(0未下发 1已下发 2已开始 3已完成) + * 工单计划状态(0未下发 1已下发 2已开始 3已完成 4已撤回) */ private String planStatus; diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdPlanInfoVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdPlanInfoVo.java index 15e501fb..597a1bbf 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdPlanInfoVo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdPlanInfoVo.java @@ -178,7 +178,7 @@ public class ProdPlanInfoVo implements Serializable { private String attachId; /** - * 工单计划状态(0未下发 1已下发 2已开始 3已完成) + * 工单计划状态(0未下发 1已下发 2已开始 3已完成 4已撤回) */ @ExcelProperty(value = "工单计划状态", converter = ExcelDictConvert.class) @ExcelDictFormat(dictType = "mes_plan_status")