From 217c66023adac46f739932390a2cea854d3db250 Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Tue, 26 Sep 2023 21:04:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E8=A3=85=E8=BD=A6=E5=B8=82?=
 =?UTF-8?q?=E9=85=8Dbug=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionDeliveryListServiceImpl.java | 8 +++-----
 1 file changed, 3 insertions(+), 5 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 80e3cc3d2..88c206691 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
@@ -3620,7 +3620,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					BeanUtils.copyProperties(distributionDeliveryTripartiteEntity, distributionDeliverySelfEntity);
 				}
 			}
-
 			List<DistributionLoadscanAbnormalEntity> loadscanAbnormalEntityList = distributionLoadscanAbnormalService.list(Wrappers.<DistributionLoadscanAbnormalEntity>query().lambda()
 				.eq(DistributionLoadscanAbnormalEntity::getDeliveryListId, distrilbutionloadingscanDTO.getDeliveryId())
 				.eq(DistributionLoadscanAbnormalEntity::getPackageCode, distrilbutionloadingscanDTO.getBarcode())
@@ -3643,7 +3642,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					 reservationEntity = reservationEntityMap.get(stockArticleEntity.getConsigneeUnit());
 					//查询是否已经异常装车了
 					//构建异常装车数据
-
 					//完成对该客户的异常装车数据和数量维护
 					break;
 				case "2":
@@ -3653,9 +3651,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					if (Func.isEmpty(distributionReservationEntity)){
 						return Resp.scanFail("操作失败","配送任务无该客户");
 					}
-					if (distributionReservationEntity.getDeliveryAddress().equals(stockArticleEntity.getCustomerAddress())
-						|| stockArticleEntity.getCustomerTelephone().equals(distributionReservationEntity.getDeliveryPhone())
-						|| distributionReservationEntity.getMallName().equals(stockArticleEntity.getMallName())){
+					if (!distributionReservationEntity.getDeliveryAddress().equals(stockArticleEntity.getCustomerAddress())
+						|| !stockArticleEntity.getCustomerTelephone().equals(distributionReservationEntity.getDeliveryPhone())
+						|| !distributionReservationEntity.getMallName().equals(stockArticleEntity.getMallName())){
 						return Resp.scanFail("操作失败","配送任务无该客户");
 					}
 					reservationEntity = distributionReservationEntity;