diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java index 39f7dcf9b..c7a246eaf 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java @@ -667,10 +667,11 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl m.getAllocation() == null && m.getTrayName() == null).mapToInt(DistributionMerchantStockListVO::getNum).sum(); - List collected = distributionMerchantStockListVOS.stream().filter(m -> m.getAllocation() == null && m.getTrayName() == null).collect(Collectors.toList()); DistributionMerchantStockListVO distributionMerchantStockListVO = new DistributionMerchantStockListVO(); distributionMerchantStockListVO.setNum(sum); - distributionMerchantStockListVOS = collected; + distributionMerchantStockListVOS = distributionMerchantStockListVOS.stream().filter(m -> m.getAllocation() != null || m.getTrayName() != null).collect(Collectors.toList()); + distributionMerchantStockListVOS.add(distributionMerchantStockListVO); + } }