From 3b75a579a38a59fad3320c978cb240f6628ec5bb Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Tue, 12 Mar 2024 18:28:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E8=B4=A7=E5=AE=9A?=
 =?UTF-8?q?=E5=88=B6=E5=93=81=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
index 8c1fe2a71..9cef7457e 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
@@ -2814,9 +2814,12 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 //				AtomicReference<Integer> s = new AtomicReference<>(0); //已扫数量
 				v.stream().forEach(i -> {
 					DistributionParcelListEntity byId = distributionParcelListService.getById(i.getAssociationId());
-					if (!vo.getStockArticleId().contains(byId.getStockArticleId().toString())) {
-						f.set(false);
+					if(ObjectUtils.isNotNull(byId)){
+						if (!vo.getStockArticleId().contains(byId.getStockArticleId().toString())) {
+							f.set(false);
+						}
 					}
+
 				});
 
 			});