From 91b56a541697d37df442d8cef96127e0c00880b0 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 8 Mar 2024 15:09:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DistributionStockupServiceImpl.java    | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 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 3fa5793c1..8c1fe2a71 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,13 +862,18 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 						if (ObjectUtils.isNotNull(i.getStockId())) {
 							wu.setScanNum(wu.getScanNum() + i2);
 						}
-						//托盘信息
-						if (ObjectUtils.isNotNull(i.getPallet()) && !wu.getPallet().contains(i.getPallet())) {
-							wu.setPallet(wu.getPallet() + "," + i.getPallet());
+
+						if (Func.isNotEmpty(i.getPallet())){
+							//托盘信息
+							if (ObjectUtils.isNotNull(i.getPallet()) && !wu.getPallet().contains(i.getPallet())) {
+								wu.setPallet(wu.getPallet() + "," + i.getPallet());
+							}
 						}
-						//托盘信息
-						if (ObjectUtils.isNotNull(i.getTrayId()) && !wu.getTrayId().contains(i.getTrayId())) {
-							wu.setTrayId(wu.getTrayId() + "," + i.getTrayId());
+						if (Func.isNotEmpty(i.getTrayId())){
+							//托盘信息
+							if (ObjectUtils.isNotNull(i.getTrayId()) && !wu.getTrayId().contains(i.getTrayId())) {
+								wu.setTrayId(wu.getTrayId() + "," + i.getTrayId());
+							}
 						}
 						//订单自编号信息
 						if (ObjectUtils.isNotNull(i.getOrderCode()) && !wu.getOrderCode().contains(i.getOrderCode())) {