update 配方信息字段添加

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;
 
     /**
      * 版本号

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;
 
     /**
      * 是否使用批次

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;
 
     /**

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;
 }

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;
 
     /**
      * 是否使用批次