|
@@ -97,8 +97,11 @@ public class InOutStorageBomServiceImpl extends ServiceImpl<InOutStorageBomMappe
|
|
|
dto.setPageSize(9999999);
|
|
|
Page<InOutStorageBomVo> page = this.getPage(dto);
|
|
|
List<InOutStorageBomVo> list = page.getRecords();
|
|
|
+ // 筛选吊牌、不干胶、彩纸出入库记录
|
|
|
+ List<String> bomCodeList = Arrays.asList("40904003", "409001", "40101010");
|
|
|
+ List<InOutStorageBomVo> inOutStorageBomList = list.stream().filter(item -> !bomCodeList.contains(item.getBomSpecCode())).collect(Collectors.toList());
|
|
|
// 查询详情信息
|
|
|
- Set<Long> inOutStorageIds = list.stream().map(InOutStorageBom::getInOutStorageId).collect(Collectors.toSet());
|
|
|
+ Set<Long> inOutStorageIds = inOutStorageBomList.stream().map(InOutStorageBom::getInOutStorageId).collect(Collectors.toSet());
|
|
|
if (ObjectUtil.isEmpty(inOutStorageIds)) {
|
|
|
inOutStorageIds.add(-1L);
|
|
|
}
|
|
@@ -137,7 +140,7 @@ public class InOutStorageBomServiceImpl extends ServiceImpl<InOutStorageBomMappe
|
|
|
Map<Long, String> map = inOutStorageErpExportVoList.stream()
|
|
|
.collect(Collectors.toMap(InOutStorageErpExportVo::getId, InOutStorageErpExportVo::getCode));
|
|
|
Map<String, Integer> serialNumberMap = new HashMap<>();
|
|
|
- List<InOutStorageBomErpExportVo> inOutStorageBomErpExportVoList = list.stream()
|
|
|
+ List<InOutStorageBomErpExportVo> inOutStorageBomErpExportVoList = inOutStorageBomList.stream()
|
|
|
.map(item -> {
|
|
|
InOutStorageBomErpExportVo inOutStorageBomErpExportVo = new InOutStorageBomErpExportVo();
|
|
|
inOutStorageBomErpExportVo.setCode(map.get(item.getInOutStorageId()));
|