From 1110a4558199ee166865991e09493b98633b6adc Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Fri, 10 Nov 2023 12:12:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E6=89=98=E8=A3=85=E8=BD=A6=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionDeliveryListServiceImpl.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index 7c473b4ab..830338417 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -625,7 +625,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					}
 					//判断该货物都属于同一客户才能进行装车
 					List<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.selectPackageListByReservationId(distrilbutionloadingscanDTO.getReservationId());
-					boolean isBelongToReservation = parcelListEntityList.stream().allMatch(tp -> parcelListEntityList.stream().map(DistributionParcelListEntity::getId).collect(Collectors.toList()).contains(tp.getId()));
+					boolean isBelongToReservation = parcelListEntities.stream().allMatch(tp -> parcelListEntityList.stream().map(DistributionParcelListEntity::getId).collect(Collectors.toList()).contains(tp.getId()));
 					if (isBelongToReservation) {
 						List<DistributionLoadscanEntity> loadscanEntityList = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda()
 							.eq(DistributionLoadscanEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId())
@@ -703,8 +703,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 								return Resp.scanFail("整托装车失败", "存在其他客户货物");
 							}
 						}
+					}else {
+						return Resp.scanFail("整托装车失败", "存在其他客户货物");
 					}
 				}
+			}else {
+				return Resp.scanFail("查询托盘货物失败", "查询托盘货物失败");
 			}
 		}
 		//查询已装车件数