From c4c65fbf55d5a917b73f9a8387047cdb1acbee8c Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Sat, 28 Sep 2024 14:01:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E4=BB=B6=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DistributionDeliveryListServiceImpl.java     | 11 ++++++-----
 .../service/impl/DistributionSignforServiceImpl.java  | 10 +++++++---
 2 files changed, 13 insertions(+), 8 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 10c012615..9cd665bb8 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
@@ -10094,7 +10094,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 						&& r.getConsignee().equals(stockArticleEntity.getCustomerName())
 						&& r.getDeliveryAddress().equals(stockArticleEntity.getCustomerAddress())
 						&& r.getDeliveryPhone().equals(stockArticleEntity.getCustomerTelephone())
-						&& r.getMallName().equals(stockArticleEntity.getMallName())
+						&& r.getMallName().equals(stockArticleEntity.getMallName()
+						&& r.getId().equals(distrilbutionloadingscanDTO.getReservationId()
+						)
 					);
 					//存在多个，操作人指定具体客户即可
 					if (flag) {
@@ -10107,9 +10109,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					if (shangpeiFlag) {
 						//查询是否满足商配异常装车
 						boolean flag = reservationEntityList.stream().anyMatch(r ->
-							r.getReceivingUnit().equals(stockArticleEntity.getConsigneeUnit()) &&
-								r.getMallName().equals(stockArticleEntity.getMallName()) &&
-								r.getId().equals(distrilbutionloadingscanDTO.getReservationId())
+							r.getReceivingUnit().equals(stockArticleEntity.getConsigneeUnit())
+								&& r.getMallName().equals(stockArticleEntity.getMallName())
+								&& r.getId().equals(distrilbutionloadingscanDTO.getReservationId())
 						);
 						if (flag) {
 							List<DistributionReservationEntity> reservationEntities = reservationEntityList.stream().filter(r -> Func.isNotEmpty(r.getConsignee())
@@ -10117,7 +10119,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 								&& r.getDeliveryAddress().equals(stockArticleEntity.getCustomerAddress())
 								&& r.getDeliveryPhone().equals(stockArticleEntity.getCustomerTelephone())
 								&& r.getMallName().equals(stockArticleEntity.getMallName())
-
 							).collect(Collectors.toList());
 							return R.fail(5000, "异常装车");
 						} else {
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 52b055772..0d61eb3d4 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
@@ -3904,7 +3904,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		int reservationNum = reservationEntity.getReservationNum() + reservationEntity.getReservationStockListNum();
 
 		AtomicInteger signingTotal = new AtomicInteger();
-		List<DistributionLoadscanEntity> loadscanEntityList = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda().eq(DistributionLoadscanEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId()).ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()));
+		List<DistributionLoadscanEntity> loadscanEntityList = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda()
+			.eq(DistributionLoadscanEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId())
+			.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
+		);
 		List<DistributionLoadscaninvnEntity> loadscaninvnEntityList = distributionLoadscaninvnService.list(Wrappers.<DistributionLoadscaninvnEntity>query().lambda().eq(DistributionLoadscaninvnEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId()).ne(DistributionLoadscaninvnEntity::getScanState, LoadingStatusConstant.quxiao.getValue()));
 		if (Func.isNotEmpty(loadscanEntityList)) {
 			int packSignTotal = loadscanEntityList.stream().filter(l -> Func.equals(l.getSignforState(), LoadScanSigningStatusConstant.yiqianshou.getValue())).mapToInt(DistributionLoadscanEntity::getReceivedQuantity).sum();
@@ -8216,8 +8219,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			distributionStockArticleService.maintenanceOrderInfo(collect, myCurrentWarehouse.getId());
 		}
 
-		String str = checkSignNum(distrilbutionloadingscanDTO);
-		return Resp.scanSuccess("签收成功", str);
+//		String str = checkSignNum(distrilbutionloadingscanDTO);
+		Integer integer = distributionSignforMapper.signforNum(distrilbutionloadingscanDTO.getReservationId());
+		return Resp.scanSuccess(integer+"件", integer+"件");
 	}
 
 	@Override