From 0f8b747f992bfd238a54d3161b20cc99c8a59d59 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 21 Jun 2024 11:30:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BB=9E=E7=95=99=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/mapper/DistributionDeliveryInfoMapper.xml  | 4 +++-
 .../service/impl/DistributionDeliveryListServiceImpl.java   | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
index 327d6a2ef..5d41b9868 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
@@ -394,7 +394,9 @@
                      ldrs.stock_article_status stockArticleState,
                      (   select  sum(loaded_nub) FROM
                         logpm_distribution_loadscan AS ldl
-                        WHERE  ldl.order_id=ldrs.stock_article_id and ldl.scan_status != 1 and ldl.reservation_id = lds.reservation_id
+                        WHERE  ldl.order_id=ldrs.stock_article_id
+                                 and ldl.scan_status != 1
+                                 and ldl.reservation_id = lds.reservation_id
                       ) AS loadingNumber,
                       (   select  count(*) FROM
                         logpm_distribution_stock AS lstock
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 00898edcd..55e08473b 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
@@ -4068,7 +4068,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			return null;
 		}
 		IPage<DistributionParcelListVO> parcelListVOIPage = new Page<>();
-		List<DistributionLoadscanEntity> loadscanEntities = distributionLoadscanMapper.selectList(Wrappers.<DistributionLoadscanEntity>query().lambda().eq(DistributionLoadscanEntity::getDeliveryId, deliveryId).ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()));
+		List<DistributionLoadscanEntity> loadscanEntities = distributionLoadscanMapper.selectList(Wrappers.<DistributionLoadscanEntity>query().lambda()
+			.eq(DistributionLoadscanEntity::getDeliveryId, deliveryId)
+			.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()));
 		Map<Long, DistributionLoadscanEntity> loadingDataMap = null;
 		if (Func.isNotEmpty(loadscanEntities)) {
 			loadingDataMap = loadscanEntities.stream().collect(Collectors.toMap(DistributionLoadscanEntity::getPackageId, Function.identity(), (k1, k2) -> k2));
@@ -6050,7 +6052,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				aaa.add(js);
 
 				//对滞留包件进行签收信息数量减少
-				distributionSignforMapper.deductionLoadingPacjageNum(reservationId,deliveryId,1);
+//				distributionSignforMapper.deductionLoadingPacjageNum(reservationId,deliveryId,1);
 
 			}
 			if (!aaa.isEmpty()) {