From bffd1aefa4c5acca2678984e0f775d2ae981b1e3 Mon Sep 17 00:00:00 2001 From: zch Date: Thu, 6 Feb 2025 11:05:52 +0800 Subject: [PATCH] =?UTF-8?q?change(hwmom-mes):=E5=9C=A8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=AD=89=E5=90=8C=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=89=A9=E6=96=99=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E7=9A=84=E5=85=B3=E8=81=94=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 通过物料 ID 获取对应的物料名称，并将其设置到等同物料信息对象中 --- .../impl/BaseEqualMaterialInfoServiceImpl.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) 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 8df3baa3..4752ab27 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 @@ -10,6 +10,7 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import org.dromara.mes.domain.BaseMaterialInfo; +import org.dromara.mes.mapper.BaseMaterialInfoMapper; import org.springframework.stereotype.Service; import org.dromara.mes.domain.bo.BaseEqualMaterialInfoBo; import org.dromara.mes.domain.vo.BaseEqualMaterialInfoVo; @@ -21,6 +22,8 @@ import java.util.List; import java.util.Map; import java.util.Collection; +import org.springframework.util.ObjectUtils; + /** * 等同物料信息Service业务层处理 * @@ -32,6 +35,7 @@ import java.util.Collection; public class BaseEqualMaterialInfoServiceImpl implements IBaseEqualMaterialInfoService { private final BaseEqualMaterialInfoMapper baseMapper; + private final BaseMaterialInfoMapper baseMaterialInfoMapper; /** * 查询等同物料信息 @@ -41,7 +45,16 @@ public class BaseEqualMaterialInfoServiceImpl implements IBaseEqualMaterialInfoS */ @Override public BaseEqualMaterialInfoVo queryById(Long equalMaterialInfoId){ - return baseMapper.selectVoById(equalMaterialInfoId); + BaseEqualMaterialInfoVo baseEqualMaterialInfoVo = baseMapper.selectVoById(equalMaterialInfoId); + if (!ObjectUtils.isEmpty(baseEqualMaterialInfoVo)) { + // 关联物料名称 + BaseMaterialInfo baseMaterialInfo = baseMaterialInfoMapper.selectOne(Wrappers.lambdaQuery(BaseMaterialInfo.class) + .eq(BaseMaterialInfo::getMaterialId, baseEqualMaterialInfoVo.getMaterialId())); + if (!ObjectUtils.isEmpty(baseMaterialInfo)) { + baseEqualMaterialInfoVo.setMaterialName(baseMaterialInfo.getMaterialName()); + } + } + return baseEqualMaterialInfoVo; } /**