From a060b732c0fe62f0a237e3e0b0f12d32fa6fd17e Mon Sep 17 00:00:00 2001 From: mashuai Date: Thu, 20 Feb 2025 20:29:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E6=8A=A5=E5=BA=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scrap/service/impl/ScrapApplyDetailsServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/service/impl/ScrapApplyDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/service/impl/ScrapApplyDetailsServiceImpl.java index a1ee5ba5..f51cbf73 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/service/impl/ScrapApplyDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/service/impl/ScrapApplyDetailsServiceImpl.java @@ -21,7 +21,8 @@ import com.bonus.common.security.utils.SecurityUtils; import com.bonus.common.biz.domain.BmFileInfo; import com.bonus.material.basic.mapper.BmFileInfoMapper; import com.bonus.material.ma.domain.Type; -import com.bonus.material.ma.mapper.TypeMapper; +import com.bonus.material.ma.domain.vo.MachineVo; +import com.bonus.material.ma.mapper.MachineMapper; import com.bonus.material.scrap.domain.MaCodeInfo; import com.bonus.material.scrap.domain.vo.ScrapDetailsListVo; import com.bonus.material.scrap.domain.vo.ScrapTaskListVo; @@ -60,6 +61,9 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { @Resource private BmFileInfoMapper fileInfoMapper; + @Resource + private MachineMapper machineMapper; + /** * 查询报废任务详细 * @@ -674,8 +678,10 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { List maCodeList = new ArrayList<>(); if (StringUtils.isNotBlank(applyDetails.getMaIds())) { for (String maId : applyDetails.getMaIds().split(",")) { + MachineVo machineVo = machineMapper.selectMachineByMaId(Long.parseLong(maId)); MaCodeInfo maCodeInfo = new MaCodeInfo(); maCodeInfo.setMaId(Long.valueOf(maId)); + maCodeInfo.setMaCode(machineVo.getMaCode()); maCodeList.add(maCodeInfo); } applyDetails.setMaCodeList(maCodeList);