diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpAuxiliaryMaterial.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpAuxiliaryMaterial.java
index 24e6f172..54135df6 100644
--- a/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpAuxiliaryMaterial.java
+++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpAuxiliaryMaterial.java
@@ -44,6 +44,10 @@ public class EqpAuxiliaryMaterial extends BaseEntity {
      * 关联设备ID（可为空，通用辅料）
      */
     private Long equipmentId;
+    /**
+     * 机组（如：1#机组、2#机组、公用机组等）
+     */
+    private String unitTeam;
     /**
      * 当前库存数量
      */
diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpSparePart.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpSparePart.java
index cda1a476..cf457334 100644
--- a/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpSparePart.java
+++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpSparePart.java
@@ -44,6 +44,10 @@ public class EqpSparePart extends BaseEntity {
      * 关联设备ID（可为空，通用备件）
      */
     private Long equipmentId;
+    /**
+     * 机组（如：1#机组、2#机组、公用机组等）
+     */
+    private String unitTeam;
     /**
      * 当前库存数量
      */
diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpAuxiliaryMaterialBo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpAuxiliaryMaterialBo.java
index 280dd82c..3bc50f53 100644
--- a/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpAuxiliaryMaterialBo.java
+++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpAuxiliaryMaterialBo.java
@@ -47,6 +47,11 @@ public class EqpAuxiliaryMaterialBo extends BaseEntity {
      */
     private Long equipmentId;
 
+    /**
+     * 机组（如：1#机组、2#机组、公用机组等）
+     */
+    private String unitTeam;
+
     /**
      * 当前库存数量
      */
diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpSparePartBo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpSparePartBo.java
index 9fb11afb..26c28a0b 100644
--- a/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpSparePartBo.java
+++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpSparePartBo.java
@@ -47,6 +47,11 @@ public class EqpSparePartBo extends BaseEntity {
      */
     private Long equipmentId;
 
+    /**
+     * 机组（如：1#机组、2#机组、公用机组等）
+     */
+    private String unitTeam;
+
     /**
      * 当前库存数量
      */
diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpAuxiliaryMaterialVo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpAuxiliaryMaterialVo.java
index 0c56df6c..9193bdff 100644
--- a/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpAuxiliaryMaterialVo.java
+++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpAuxiliaryMaterialVo.java
@@ -56,6 +56,12 @@ public class EqpAuxiliaryMaterialVo {
     @ExcelDictFormat(readConverterExp = "可=为空，通用辅料")
     private Long equipmentId;
 
+    /**
+     * 机组（如：1#机组、2#机组、公用机组等）
+     */
+    @ExcelProperty(value = "机组")
+    private String unitTeam;
+
     /**
      * 当前库存数量
      */
diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpSparePartVo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpSparePartVo.java
index d1b19c7a..723789ca 100644
--- a/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpSparePartVo.java
+++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpSparePartVo.java
@@ -56,6 +56,12 @@ public class EqpSparePartVo {
     @ExcelDictFormat(readConverterExp = "可=为空，通用备件")
     private Long equipmentId;
 
+    /**
+     * 机组（如：1#机组、2#机组、公用机组等）
+     */
+    @ExcelProperty(value = "机组")
+    private String unitTeam;
+
     /**
      * 当前库存数量
      */
diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpAuxiliaryMaterialServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpAuxiliaryMaterialServiceImpl.java
index d25e500c..5b6aac46 100644
--- a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpAuxiliaryMaterialServiceImpl.java
+++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpAuxiliaryMaterialServiceImpl.java
@@ -66,6 +66,7 @@ public class EqpAuxiliaryMaterialServiceImpl implements IEqpAuxiliaryMaterialSer
         lqw.eq(StringUtils.isNotBlank(bo.getAuxiliaryModel()), EqpAuxiliaryMaterial::getAuxiliaryModel, bo.getAuxiliaryModel());
         lqw.eq(StringUtils.isNotBlank(bo.getUnit()), EqpAuxiliaryMaterial::getUnit, bo.getUnit());
         lqw.eq(bo.getEquipmentId() != null, EqpAuxiliaryMaterial::getEquipmentId, bo.getEquipmentId());
+        lqw.like(StringUtils.isNotBlank(bo.getUnitTeam()), EqpAuxiliaryMaterial::getUnitTeam, bo.getUnitTeam());
         lqw.eq(bo.getQuantity() != null, EqpAuxiliaryMaterial::getQuantity, bo.getQuantity());
         return lqw;
     }
diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpSparePartServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpSparePartServiceImpl.java
index 75e59fae..b7f9001d 100644
--- a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpSparePartServiceImpl.java
+++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpSparePartServiceImpl.java
@@ -58,6 +58,7 @@ public class EqpSparePartServiceImpl implements IEqpSparePartService {
         qw.eq(StringUtils.isNotBlank(bo.getModel()), "sp.model", bo.getModel());
         qw.eq(StringUtils.isNotBlank(bo.getUnit()), "sp.unit", bo.getUnit());
         qw.eq(bo.getEquipmentId() != null, "sp.equipment_id", bo.getEquipmentId());
+        qw.like(StringUtils.isNotBlank(bo.getUnitTeam()), "sp.unit_team", bo.getUnitTeam());
         qw.eq(bo.getQuantity() != null, "sp.quantity", bo.getQuantity());
         //逻辑删除
         qw.eq("sp.del_flag", 0);
@@ -81,6 +82,7 @@ public class EqpSparePartServiceImpl implements IEqpSparePartService {
         lqw.eq(StringUtils.isNotBlank(bo.getModel()), EqpSparePart::getModel, bo.getModel());
         lqw.eq(StringUtils.isNotBlank(bo.getUnit()), EqpSparePart::getUnit, bo.getUnit());
         lqw.eq(bo.getEquipmentId() != null, EqpSparePart::getEquipmentId, bo.getEquipmentId());
+        lqw.like(StringUtils.isNotBlank(bo.getUnitTeam()), EqpSparePart::getUnitTeam, bo.getUnitTeam());
         lqw.eq(bo.getQuantity() != null, EqpSparePart::getQuantity, bo.getQuantity());
         return lqw;
     }
diff --git a/klp-mes/src/main/resources/mapper/eqp/EqpAuxiliaryMaterialMapper.xml b/klp-mes/src/main/resources/mapper/eqp/EqpAuxiliaryMaterialMapper.xml
index b0b0999f..8d3b6743 100644
--- a/klp-mes/src/main/resources/mapper/eqp/EqpAuxiliaryMaterialMapper.xml
+++ b/klp-mes/src/main/resources/mapper/eqp/EqpAuxiliaryMaterialMapper.xml
@@ -11,6 +11,7 @@
         <result property="auxiliaryModel" column="auxiliary_model"/>
         <result property="unit" column="unit"/>
         <result property="equipmentId" column="equipment_id"/>
+        <result property="unitTeam" column="unit_team"/>
         <result property="quantity" column="quantity"/>
         <result property="createBy" column="create_by"/>
         <result property="updateBy" column="update_by"/>
diff --git a/klp-mes/src/main/resources/mapper/eqp/EqpSparePartMapper.xml b/klp-mes/src/main/resources/mapper/eqp/EqpSparePartMapper.xml
index 6db91329..c861085a 100644
--- a/klp-mes/src/main/resources/mapper/eqp/EqpSparePartMapper.xml
+++ b/klp-mes/src/main/resources/mapper/eqp/EqpSparePartMapper.xml
@@ -11,6 +11,7 @@
         <result property="model" column="model"/>
         <result property="unit" column="unit"/>
         <result property="equipmentId" column="equipment_id"/>
+        <result property="unitTeam" column="unit_team"/>
         <result property="quantity" column="quantity"/>
         <result property="createBy" column="create_by"/>
         <result property="updateBy" column="update_by"/>
@@ -27,6 +28,7 @@
             sp.model,
             sp.unit,
             sp.equipment_id,
+            sp.unit_team,
             em.equipment_name AS equipmentName,
             sp.quantity,
             sp.remark