diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderItemServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderItemServiceImpl.java index 5e7cfa90..aac14cf4 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderItemServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderItemServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Map; import java.util.Collection; import java.util.Objects; import java.util.ArrayList; +import java.util.stream.Collectors; /** @@ -84,7 +85,26 @@ public class WmsTransferOrderItemServiceImpl implements IWmsTransferOrderItemSer public List queryList(WmsTransferOrderItemBo bo) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); List list = baseMapper.selectVoList(lqw); - if (list != null && !list.isEmpty()) { + String coilIdsStr = list.stream() + .map(WmsTransferOrderItemVo::getCoilId) + .filter(Objects::nonNull) // 过滤 null + .distinct() // 去重 + .map(String::valueOf) // Long 转 String + .collect(Collectors.joining(",")); // 直接拼接成逗号字符串 + if (!coilIdsStr.isEmpty()) { + WmsMaterialCoilBo coilBo = new WmsMaterialCoilBo(); + coilBo.setCoilIds(coilIdsStr); + List coilList = coilService.queryList(coilBo); + Map coilMap = coilList.stream() + .collect(Collectors.toMap(WmsMaterialCoilVo::getCoilId, v -> v)); + for (WmsTransferOrderItemVo vo : list) { + WmsMaterialCoilVo coilVo = coilMap.get(vo.getCoilId()); + if (coilVo != null) { + vo.setCoil(coilVo); + } + } + } + if (!list.isEmpty()) { for (WmsTransferOrderItemVo vo : list) { fillDetailInfo(vo); } @@ -93,14 +113,6 @@ public class WmsTransferOrderItemServiceImpl implements IWmsTransferOrderItemSer } private void fillDetailInfo(WmsTransferOrderItemVo vo) { - // 查询钢卷信息 - if (vo.getCoilId() != null) { - WmsMaterialCoilVo coil = coilService.queryById(vo.getCoilId()); - if (coil != null) { - vo.setCoil(coil); - } - } - // 填充改之前物料信息 fillMaterialInfo(vo, vo.getItemIdBefore(), vo.getMaterialTypeBefore(), "Before");