From f9007e08a8f82e9172d07293cc96dd1113010991 Mon Sep 17 00:00:00 2001 From: zch Date: Wed, 5 Mar 2025 21:14:48 +0800 Subject: [PATCH] =?UTF-8?q?fix(mes):=20=E4=BF=AE=E5=A4=8D=E7=AD=89?= =?UTF-8?q?=E5=90=8C=E7=89=A9=E6=96=99=E5=85=B3=E8=81=94=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修正等同物料名称查询逻辑，使用正确的字段进行关联查询 -优化 SQL 查询语句，提高查询效率 --- .../BaseEqualMaterialInfoServiceImpl.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) 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 cb14def7..c4a12e07 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 buildQueryWrapper(BaseEqualMaterialInfoBo bo) { Map params = bo.getParams(); MPJLambdaWrapper 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())