1.0.34 合同物料修改标准物料标识

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/bo/BaseMaterialInfoBo.java

@@ -50,7 +50,6 @@ public class BaseMaterialInfoBo extends BaseEntity {
     /**
      * 单位ID
      */
-    @NotNull(message = "单位ID不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long unitId;
 
     /**

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractMaterial.java

@@ -29,9 +29,9 @@ public class ErpContractMaterial extends TenantEntity {
     private Long contractMaterialId;
 
     /**
-     * 计划标识（1计划内 2计划外）
+     * 标准物料标识（1标准物料 2非标物料）
      */
-    private String planFlag;
+    private String materialFlag;
 
     /**
      * 合同ID

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractMaterialBo.java

@@ -28,9 +28,9 @@ public class ErpContractMaterialBo extends BaseEntity {
     private Long contractMaterialId;
 
     /**
-     * 计划标识（1计划内 2计划外）
+     * 标准物料标识（1标准物料 2非标物料）
      */
-    private String planFlag;
+    private String materialFlag;
 
     /**
      * 合同ID

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractMaterialVo.java

@@ -36,11 +36,11 @@ public class ErpContractMaterialVo implements Serializable {
     private Long contractMaterialId;
 
     /**
-     * 计划标识（1计划内 2计划外）
+     * 标准物料标识（1标准物料 2非标物料）
      */
-    @ExcelProperty(value = "计划标识", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "plan_flag")
-    private String planFlag;
+    @ExcelProperty(value = "标准物料标识", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "material_flag")
+    private String materialFlag;
 
     /**
      * 合同ID

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractMaterialServiceImpl.java

@@ -73,7 +73,7 @@ public class ErpContractMaterialServiceImpl implements IErpContractMaterialServi
         Map<String, Object> params = bo.getParams();
         MPJLambdaWrapper<ErpContractMaterial> lqw = JoinWrappers.lambda(ErpContractMaterial.class)
             .selectAll(ErpContractMaterial.class)
-            .eq(StringUtils.isNotBlank(bo.getPlanFlag()), ErpContractMaterial::getPlanFlag, bo.getPlanFlag())
+            .eq(StringUtils.isNotBlank(bo.getMaterialFlag()), ErpContractMaterial::getMaterialFlag, bo.getMaterialFlag())
             .eq(bo.getContractId() != null, ErpContractMaterial::getContractId, bo.getContractId())
             .like(StringUtils.isNotBlank(bo.getProductName()), ErpContractMaterial::getProductName, bo.getProductName())
             .eq(StringUtils.isNotBlank(bo.getSpecificationDescription()), ErpContractMaterial::getSpecificationDescription, bo.getSpecificationDescription())

ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractMaterialMapper.xml

@@ -9,7 +9,7 @@
     <select id="selectCustomErpContractMaterialVoList" resultMap="ErpContractMaterialResult">
         select t.contract_material_id,
                t.tenant_id,
-               t.plan_flag,
+               t.material_flag,
                t.contract_id,
                t.product_name,
                t.specification_description,