From 26954f9bf7b30f9cedbbaeb4887dc7b75f8c7fcd Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Wed, 10 Dec 2025 16:04:32 +0800
Subject: [PATCH] =?UTF-8?q?1.0.43=20=E9=94=80=E5=94=AE=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0=E9=94=80=E5=94=AE=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E5=9E=8B=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/oa/base/domain/BaseRelationMaterial.java    | 5 +++++
 .../dromara/oa/base/domain/bo/BaseRelationMaterialBo.java   | 5 +++++
 .../dromara/oa/base/domain/vo/BaseRelationMaterialVo.java   | 6 ++++++
 .../base/service/impl/BaseRelationMaterialServiceImpl.java  | 1 +
 .../resources/mapper/oa/base/BaseRelationMaterialMapper.xml | 1 +
 5 files changed, 18 insertions(+)

diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/BaseRelationMaterial.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/BaseRelationMaterial.java
index 3ec0848c..65f7fad0 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/BaseRelationMaterial.java
+++ b/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;
+
     /**
      * 备注
      */
diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/bo/BaseRelationMaterialBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/bo/BaseRelationMaterialBo.java
index 83dbd306..109e25f8 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/bo/BaseRelationMaterialBo.java
+++ b/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;
+
     /**
      * 备注
      */
diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/vo/BaseRelationMaterialVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/vo/BaseRelationMaterialVo.java
index 26bd114c..53048dbf 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/vo/BaseRelationMaterialVo.java
+++ b/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;
+
     /**
      * 备注
      */
diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/BaseRelationMaterialServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/BaseRelationMaterialServiceImpl.java
index 314f5387..d96f43f2 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/BaseRelationMaterialServiceImpl.java
+++ b/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;
     }
diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/base/BaseRelationMaterialMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/base/BaseRelationMaterialMapper.xml
index 92d58aa8..376e99a9 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/base/BaseRelationMaterialMapper.xml
+++ b/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,