diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdRecipeInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdRecipeInfo.java index c14412c3..c05879c6 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdRecipeInfo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdRecipeInfo.java @@ -38,7 +38,7 @@ public class ProdRecipeInfo extends TenantEntity { /** * 物料ID */ - private String materialId; + private Long materialId; /** * 版本号 diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdRecipeWeight.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdRecipeWeight.java index 2dd46f2b..dee4d07c 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdRecipeWeight.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdRecipeWeight.java @@ -76,7 +76,7 @@ public class ProdRecipeWeight extends TenantEntity { /** * 父级编码 */ - private String fatherCode; + private Long fatherCode; /** * 单位 @@ -86,7 +86,7 @@ public class ProdRecipeWeight extends TenantEntity { /** * 子级编码 */ - private String childCode; + private Long childCode; /** * 是否使用批次 diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdRecipeInfoBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdRecipeInfoBo.java index 3be9cef5..871fbb7e 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdRecipeInfoBo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdRecipeInfoBo.java @@ -31,13 +31,12 @@ public class ProdRecipeInfoBo extends BaseEntity { /** * 机台ID */ - @NotNull(message = "机台ID不能为空", groups = { AddGroup.class, EditGroup.class }) private Long machineId; /** * 物料ID */ - private String materialId; + private Long materialId; /** * 版本号 @@ -167,7 +166,6 @@ public class ProdRecipeInfoBo extends BaseEntity { /** * 辊温温差 */ - @NotNull(message = "辊温温差不能为空", groups = { AddGroup.class, EditGroup.class }) private Long rollTempdiff; /** @@ -183,19 +181,16 @@ public class ProdRecipeInfoBo extends BaseEntity { /** * 操作者 */ - @NotBlank(message = "操作者不能为空", groups = { AddGroup.class, EditGroup.class }) private String operCode; /** * 备注 */ - @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class }) private String memNote; /** * 配方编码 */ - @NotBlank(message = "配方编码不能为空", groups = { AddGroup.class, EditGroup.class }) private String recipeCode; /** @@ -266,13 +261,11 @@ public class ProdRecipeInfoBo extends BaseEntity { /** * 审核日期 */ - @NotNull(message = "审核日期不能为空", groups = { AddGroup.class, EditGroup.class }) private Date auditDate; /** * 配方字典 */ - @NotBlank(message = "配方字典不能为空", groups = { AddGroup.class, EditGroup.class }) private String recipeDic; /** diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdRecipeInfoVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdRecipeInfoVo.java index f0503bce..b3985a80 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdRecipeInfoVo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdRecipeInfoVo.java @@ -47,7 +47,7 @@ public class ProdRecipeInfoVo implements Serializable { * 物料ID */ @ExcelProperty(value = "物料ID") - private String materialId; + private Long materialId; /** * 版本号 @@ -401,5 +401,27 @@ public class ProdRecipeInfoVo implements Serializable { @ExcelProperty(value = "排胶控制") private Long pjcontrl; + /** + * 创建人 + */ + @ExcelProperty(value = "创建人") + private Long createBy; + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; + + /** + * 更新人 + */ + @ExcelProperty(value = "更新人") + private Long updateBy; + + /** + * 更新时间 + */ + @ExcelProperty(value = "更新时间") + private Date updateTime; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdRecipeWeightVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdRecipeWeightVo.java index 065691b9..33422ea3 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdRecipeWeightVo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdRecipeWeightVo.java @@ -93,7 +93,7 @@ public class ProdRecipeWeightVo implements Serializable { * 父级编码 */ @ExcelProperty(value = "父级编码") - private String fatherCode; + private Long fatherCode; /** * 单位 @@ -105,7 +105,7 @@ public class ProdRecipeWeightVo implements Serializable { * 子级编码 */ @ExcelProperty(value = "子级编码") - private String childCode; + private Long childCode; /** * 是否使用批次