1.0.43 销售物料信息添加销售物料型号

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

@@ -42,6 +42,11 @@ public class BaseRelationMaterial extends TenantEntity {
      */
     private String saleMaterialName;
 
+    /**
+     * 销售物料型号
+     */
+    private String saleMaterialModel;
+
     /**
      * 备注
      */

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

@@ -42,6 +42,11 @@ public class BaseRelationMaterialBo extends BaseEntity {
      */
     private String saleMaterialName;
 
+    /**
+     * 销售物料型号
+     */
+    private String saleMaterialModel;
+
     /**
      * 备注
      */

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/vo/BaseRelationMaterialVo.java

@@ -70,6 +70,12 @@ public class BaseRelationMaterialVo implements Serializable {
     @ExcelProperty(value = "销售物料名称")
     private String saleMaterialName;
 
+    /**
+     * 销售物料型号
+     */
+    @ExcelProperty(value = "销售物料型号")
+    private String saleMaterialModel;
+
     /**
      * 备注
      */

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/BaseRelationMaterialServiceImpl.java

@@ -90,6 +90,7 @@ public class BaseRelationMaterialServiceImpl implements IBaseRelationMaterialSer
             .like(StringUtils.isNotBlank(bo.getMaterialName()), BaseMaterialInfo::getMaterialName, bo.getMaterialName())
             .like(StringUtils.isNotBlank(bo.getCustomerName()), CrmCustomerInfo::getCustomerName, bo.getCustomerName())
             .like(StringUtils.isNotBlank(bo.getSaleMaterialName()), BaseRelationMaterial::getSaleMaterialName, bo.getSaleMaterialName())
+            .like(StringUtils.isNotBlank(bo.getSaleMaterialModel()), BaseRelationMaterial::getSaleMaterialModel, bo.getSaleMaterialModel())
             .eq(StringUtils.isNotBlank(bo.getActiveFlag()), BaseRelationMaterial::getActiveFlag, bo.getActiveFlag());
         return lqw;
     }

ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/base/BaseRelationMaterialMapper.xml

@@ -12,6 +12,7 @@
                material_id,
                customer_id,
                sale_material_name,
+               sale_material_model,
                remark,
                active_flag,
                del_flag,