From d882277dd299b08109c13d517ae8be889d4bd23e Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Sat, 30 Mar 2024 09:54:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81=20?=
 =?UTF-8?q?=E8=87=AA=E6=8F=90=E5=A4=87=E8=B4=A7=E9=A1=B5=E9=9D=A2=20null?=
 =?UTF-8?q?=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionStockupServiceImpl.java      | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 9801f5d5e..b7ddf5bf9 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
@@ -862,22 +862,22 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 
 						if (Func.isNotEmpty(i.getPallet())){
 							//托盘信息
-							if (ObjectUtils.isNotNull(i.getPallet()) && !wu.getPallet().contains(i.getPallet())) {
+							if (ObjectUtils.isNotNull(i.getPallet()) && ObjectUtils.isNotNull(wu.getPallet()) && !wu.getPallet().contains(i.getPallet())) {
 								wu.setPallet(wu.getPallet() + "," + i.getPallet());
 							}
 						}
 						if (Func.isNotEmpty(i.getTrayId())){
 							//托盘信息
-							if (ObjectUtils.isNotNull(i.getTrayId()) && !wu.getTrayId().contains(i.getTrayId())) {
+							if (ObjectUtils.isNotNull(i.getTrayId()) &&  ObjectUtils.isNotNull(wu.getTrayId())&& !wu.getTrayId().contains(i.getTrayId())) {
 								wu.setTrayId(wu.getTrayId() + "," + i.getTrayId());
 							}
 						}
 						//订单自编号信息
-						if (ObjectUtils.isNotNull(i.getOrderCode()) && !wu.getOrderCode().contains(i.getOrderCode())) {
+						if (ObjectUtils.isNotNull(i.getOrderCode()) && ObjectUtils.isNotNull(wu.getOrderCode())&&!wu.getOrderCode().contains(i.getOrderCode())) {
 							wu.setOrderCode(wu.getOrderCode() + "," + i.getOrderCode());
 						}
 						//订单id信息
-						if (ObjectUtils.isNotNull(wu.getStockArticleId()) && !wu.getStockArticleId().contains(i.getStockArticleId())) {
+						if (ObjectUtils.isNotNull(wu.getStockArticleId()) && ObjectUtils.isNotNull(wu.getStockArticleId())&&!wu.getStockArticleId().contains(i.getStockArticleId())) {
 							wu.setStockArticleId(wu.getStockArticleId() + "," + i.getStockArticleId());
 						}
 						if (wu.getPlanNum().equals(wu.getScanNum())) {