包活产品存储时添加三个字段

ruoyi-pay/src/main/java/com/ruoyi/pay/domain/PayBaohuoProduct.java

@@ -68,5 +68,17 @@ public class PayBaohuoProduct extends BaseEntity {
      * 单位-字典
      */
     private String unit;
+    /**
+     * 工序
+     */
+    private String process;
+    /**
+     * 原材料
+     */
+    private String productMaterial;
+    /**
+     * 产品规格
+     */
+    private String productSpecification;
 
 }

ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayBaohuoProductBo.java

@@ -25,7 +25,7 @@ public class PayBaohuoProductBo extends BaseEntity {
     /**
      * 主键ID
      */
-    @NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
+   // @NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
@@ -37,7 +37,7 @@ public class PayBaohuoProductBo extends BaseEntity {
     /**
      * 产品ID
      */
-    @NotNull(message = "产品ID不能为空", groups = { AddGroup.class, EditGroup.class })
+   // @NotNull(message = "产品ID不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long productId;
 
     /**
@@ -55,7 +55,7 @@ public class PayBaohuoProductBo extends BaseEntity {
     /**
      * 加工数量
      */
-    @NotNull(message = "加工数量不能为空", groups = { AddGroup.class, EditGroup.class })
+   // @NotNull(message = "加工数量不能为空", groups = { AddGroup.class, EditGroup.class })
     private BigDecimal productNum;
 
     /**
@@ -73,20 +73,37 @@ public class PayBaohuoProductBo extends BaseEntity {
     /**
      * 总金额
      */
-    @NotNull(message = "总金额不能为空", groups = { AddGroup.class, EditGroup.class })
+   // @NotNull(message = "总金额不能为空", groups = { AddGroup.class, EditGroup.class })
     private BigDecimal amount;
 
     /**
      * 单价
      */
-    @NotNull(message = "单价不能为空", groups = { AddGroup.class, EditGroup.class })
+   // @NotNull(message = "单价不能为空", groups = { AddGroup.class, EditGroup.class })
     private BigDecimal price;
 
     /**
      * 单位-字典
      */
-    @NotBlank(message = "单位-字典不能为空", groups = { AddGroup.class, EditGroup.class })
+   // @NotBlank(message = "单位-字典不能为空", groups = { AddGroup.class, EditGroup.class })
     private String unit;
 
+    /**
+     * 工序
+     */
+   // @NotBlank(message = "工序不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String process;
+
+    /**
+     * 原材料
+     */
+   // @NotBlank(message = "原材料不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String productMaterial;
+
+    /**
+     * 产品规格
+     */
+   // @NotBlank(message = "产品规格不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String productSpecification;
 
 }

ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayBaohuoProductVo.java

@@ -88,5 +88,21 @@ public class PayBaohuoProductVo {
     @ExcelProperty(value = "单位-字典")
     private String unit;
 
+    /**
+     * 工序
+     */
+    @ExcelProperty(value = "工序")
+    private String process;
 
+    /**
+     * 原材料
+     */
+    @ExcelProperty(value = "原材料")
+    private String productMaterial;
+
+    /**
+     * 产品规格
+     */
+    @ExcelProperty(value = "产品规格")
+    private String productSpecification;
 }

ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayBaohuoProductServiceImpl.java

@@ -71,6 +71,9 @@ public class PayBaohuoProductServiceImpl implements IPayBaohuoProductService {
         lqw.eq(bo.getAmount() != null, PayBaohuoProduct::getAmount, bo.getAmount());
         lqw.eq(bo.getPrice() != null, PayBaohuoProduct::getPrice, bo.getPrice());
         lqw.eq(StringUtils.isNotBlank(bo.getUnit()), PayBaohuoProduct::getUnit, bo.getUnit());
+        lqw.eq(StringUtils.isNotBlank(bo.getProcess()), PayBaohuoProduct::getProcess, bo.getProcess());
+        lqw.eq(StringUtils.isNotBlank(bo.getProductMaterial()), PayBaohuoProduct::getProductMaterial, bo.getProductMaterial());
+        lqw.eq(StringUtils.isNotBlank(bo.getProductSpecification()), PayBaohuoProduct::getProductSpecification, bo.getProductSpecification());
         return lqw;
     }