From 5bde072afefecce9b7b2e05d3fb5a8c4bb052b37 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 26 Sep 2024 22:20:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E7=AD=BE=E6=94=B6=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionDeliveryListServiceImpl.java      | 3 ++-
 .../service/impl/DistributionSignforServiceImpl.java           | 3 +--
 2 files changed, 3 insertions(+), 3 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 725046f25..3f3b09881 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
@@ -10088,7 +10088,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				shangpeiFlag = reservationEntityList.stream().allMatch(r -> r.getDeliveryType().equals(DistributionTypeConstant.shangpei.getValue()));
 				if (shangpeiFlag) {
 					//查询是否满足商配异常装车
-					boolean flag = reservationEntityList.stream().anyMatch(r -> r.getReceivingUnit().equals(stockArticleEntity.getConsigneeUnit()) && r.getMallName().equals(stockArticleEntity.getMallName()));
+					boolean flag = reservationEntityList.stream().anyMatch(r -> r.getReceivingUnit().equals(stockArticleEntity.getConsigneeUnit())
+						&& r.getMallName().equals(stockArticleEntity.getMallName()));
 					if (flag) {
 						List<DistributionReservationEntity> reservationEntities = reservationEntityList.stream().filter(r -> Func.isNotEmpty(r.getConsignee())
 							&& r.getConsignee().equals(stockArticleEntity.getCustomerName())
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
index 6492b7202..48694f3bf 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
@@ -8649,8 +8649,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 	public void maintainIsHaveAbnormalPackage(Long reservationId) {
 		long count = distributionLoadscanAbnormalService.count(Wrappers.<DistributionLoadscanAbnormalEntity>query().lambda()
 			.eq(DistributionLoadscanAbnormalEntity::getReservationId, reservationId)
-			.eq(DistributionLoadscanAbnormalEntity::getAuditingStatus, LoadingAbnormalAuditingStatusConstant.daishenhe.getValue())
-			.eq(DistributionLoadscanAbnormalEntity::getComplete, Integer.parseInt(IsOrNoConstant.yes.getValue()))
+			.eq(DistributionLoadscanAbnormalEntity::getComplete, Integer.parseInt(IsOrNoConstant.no.getValue()))
 		);
 		if (count == 0) {
 			//进行签收的维护