From 76493c816852b768c8c63e6a2177550455c9e99e Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 17 Jan 2024 17:35:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=9C=BAPDA=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=93=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionStockListServiceImpl.java       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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<Distributi
 				//存在有无库位无托盘的库存品
 				//对无库位无托盘进行汇总
 				int sum = distributionMerchantStockListVOS.stream().filter(m -> m.getAllocation() == null && m.getTrayName() == null).mapToInt(DistributionMerchantStockListVO::getNum).sum();
-				List<DistributionMerchantStockListVO> 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);
+
 			}
 
 		}