diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseEqualMaterialInfoServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseEqualMaterialInfoServiceImpl.java
index cb14def..c4a12e0 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseEqualMaterialInfoServiceImpl.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseEqualMaterialInfoServiceImpl.java
@@ -55,7 +55,7 @@ public class BaseEqualMaterialInfoServiceImpl implements IBaseEqualMaterialInfoS
 
             // 关联等同物料名称
             BaseMaterialInfo EqualMaterialInfo = baseMaterialInfoMapper.selectOne(Wrappers.lambdaQuery(BaseMaterialInfo.class)
-                .eq(BaseMaterialInfo::getMaterialId, baseEqualMaterialInfoVo.getMaterialId()));
+                .eq(BaseMaterialInfo::getMaterialId, baseEqualMaterialInfoVo.getEqualMaterialId()));
             if (!ObjectUtils.isEmpty(EqualMaterialInfo)) {
                 baseEqualMaterialInfoVo.setEqualMaterialName(EqualMaterialInfo.getMaterialName());
             }
@@ -93,16 +93,17 @@ public class BaseEqualMaterialInfoServiceImpl implements IBaseEqualMaterialInfoS
     private MPJLambdaWrapper<BaseEqualMaterialInfo> buildQueryWrapper(BaseEqualMaterialInfoBo bo) {
         Map<String, Object> params = bo.getParams();
         MPJLambdaWrapper<BaseEqualMaterialInfo> lqw = JoinWrappers.lambda(BaseEqualMaterialInfo.class)
-        .selectAll(BaseEqualMaterialInfo.class)
+            .selectAll(BaseEqualMaterialInfo.class)
 
-            //关联查询物料名称
-            .select(BaseMaterialInfo::getMaterialName)
-            .leftJoin(BaseMaterialInfo.class, BaseMaterialInfo::getMaterialId, BaseEqualMaterialInfo::getMaterialId)
+            // 关联查询物料名称
+            .select("material.material_name as material_name")
+            .leftJoin(BaseMaterialInfo.class, "material", on -> on
+                .eq(BaseMaterialInfo::getMaterialId, BaseEqualMaterialInfo::getMaterialId))
 
-
-            //关联查询等同物料名称
-            .selectAs(BaseMaterialInfo::getMaterialName,BaseEqualMaterialInfo::getEqualMaterialName)
-            .leftJoin(BaseMaterialInfo.class, BaseMaterialInfo::getMaterialId, BaseEqualMaterialInfo::getMaterialId)
+            // 关联查询等同物料名称
+            .select("equal_material.material_name as equal_material_name")
+            .leftJoin(BaseMaterialInfo.class, "equal_material", on -> on
+                .eq(BaseMaterialInfo::getMaterialId, BaseEqualMaterialInfo::getEqualMaterialId))
 
         .eq(bo.getEqualMaterialInfoId() != null, BaseEqualMaterialInfo::getEqualMaterialInfoId, bo.getEqualMaterialInfoId())
         .eq(bo.getMaterialId() != null, BaseEqualMaterialInfo::getMaterialId, bo.getMaterialId())