From 855ca8b9eae29f68e4737cc474c9e7b0165c713d Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Fri, 8 Sep 2023 09:34:21 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionDeliveryListServiceImpl.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 872e66124..2c08632c7 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
@@ -1242,7 +1242,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			//	if (distrilbutionloadingscanDTO.getStockType() == 1) {
 			//查询该包条是否属于该配送任务
 			List<DistributionLoadscanEntity> distributionLoadscanEntities = baseMapper.selectdeliverywork(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId());
-			if (distributionLoadscanEntities.isEmpty()) {
+			if ( null == distributionLoadscanEntities || distributionLoadscanEntities.isEmpty() ) {
 				return R.fail(3001, "窜货");
 			}
 // 串货后 下面的代码执行的意义不存在
@@ -1256,7 +1256,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			//TODO 托盘扫描
 			//查询该包条是否属于该配送任务
 			List<DistributionLoadscanEntity> distributionLoadscanEntities = baseMapper.selectdeliverypallet(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId());
-			if (distributionLoadscanEntities.isEmpty()) {
+			if (null == distributionLoadscanEntities || distributionLoadscanEntities.isEmpty()) {
 				return R.fail(3001, "窜货");
 			}
 			for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) {
@@ -1273,7 +1273,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			if (distributionReservationStockarticleEntity.getIsHaveData() == 1) {
 				//查询订单是否属于该配送任务
 				List<DistributionLoadscanEntity> distributionLoadscanEntities = baseMapper.selectOrderpallet(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId());
-				if (distributionLoadscanEntities.isEmpty()) {
+				if (null == distributionLoadscanEntities || distributionLoadscanEntities.isEmpty()) {
 					return R.fail(3001, "窜货");
 				}
 				for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) {
@@ -1544,7 +1544,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			.eq(DistributionLoadscanEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId())
 			.eq(DistributionLoadscanEntity::getOrderPackageCode, distrilbutionloadingscanDTO.getBarcode())
 		);
-		if (distributionLoadscanEntities.isEmpty()) {
+		if (null == distributionLoadscanEntities || distributionLoadscanEntities.isEmpty()) {
 			return R.fail(3005, "该货物未装车");
 		}
 		boolean b = false;