From 6d51e2bf952f495c954b651dcb8588293eca4bca Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 20 May 2024 16:19:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=AE=A1=E6=A0=B8=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E5=8E=9F=E8=AE=A1=E5=88=92=E5=8C=85=E4=BB=B6BUG?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/mapper/DistributionSignforMapper.xml     | 8 ++++----
 .../service/impl/DistributionSignforServiceImpl.java      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
index 1e6e413e2..d8d39150e 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
@@ -86,13 +86,13 @@
     <delete id="cancelOld">
         UPDATE logpm_distribution_reservation_package SET packet_bar_status = 2 ,cancel_remark = '异常审核取消原计划' WHERE parce_list_id = #{packageId}  ;
 
-        UPDATE logpm_distribution_reservation_stockarticle SET reservation_num = (SELECT count(id) FROM logpm_distribution_reservation_package WHERE packet_bar_status != 2 AND reservation_id = #{reservaionId} AND stock_article_id = #{stockArticleId} AND is_deleted = 0)  WHERE reservation_id =  #{reservaionId}  AND stock_article_id = #{stockArticleId};
+        UPDATE logpm_distribution_reservation_stockarticle SET reservation_num = (SELECT count(id) FROM logpm_distribution_reservation_package WHERE packet_bar_status != 2 AND reservation_id = #{reservationId} AND stock_article_id = #{stockArticleId} AND is_deleted = 0)  WHERE reservation_id =  #{reservationId}  AND stock_article_id = #{stockArticleId};
 
-        UPDATE logpm_distribution_reservation_stockarticle SET stock_article_status = 2  WHERE reservation_num = 0 AND reservation_id = #{reservaionId}  AND stock_article_id = #{stockArticleId};
+        UPDATE logpm_distribution_reservation_stockarticle SET stock_article_status = 2  WHERE reservation_num = 0 AND reservation_id = #{reservationId}  AND stock_article_id = #{stockArticleId};
 
-        UPDATE logpm_distribution_reservation SET  reservation_num = (SELECT count(id) FROM logpm_distribution_reservation_package WHERE packet_bar_status != 2 AND reservation_id = #{reservaionId} AND is_deleted =0 ) WHERE id = #{reservaionId};
+        UPDATE logpm_distribution_reservation SET  reservation_num = (SELECT count(id) FROM logpm_distribution_reservation_package WHERE packet_bar_status != 2 AND reservation_id = #{reservationId} AND is_deleted =0 ) WHERE id = #{reservationId};
 
-        UPDATE logpm_distribution_reservation SET reservation_status = '40',cancel_reason = '异常审核判定判定取消预约计划'  WHERE id = #{reservaionId} AND (reservation_num + reservation_stock_list_num) = 0;
+        UPDATE logpm_distribution_reservation SET reservation_status = '40',cancel_reason = '异常审核判定判定取消预约计划'  WHERE id = #{reservationId} AND (reservation_num + reservation_stock_list_num) = 0;
     </delete>
 
 
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 8acad053e..9f7bd538a 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
@@ -5454,11 +5454,11 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			log.error("#############异常包件信息异常:{}", distributionLoadscanAbnormalEntities);
 			return R.fail(3000, "审核失败");
 		}
-		List<Long> packageIds = distributionLoadscanAbnormalEntities.stream().map(DistributionLoadscanAbnormalEntity::getPackageId).distinct().collect(Collectors.toList());
+		List<Long> packageIds = distributionLoadscanAbnormalEntities.stream().filter(f->LoadingAbnormalAuditingStatusConstant.daishenhe.getValue().equals(f.getAuditingStatus())).map(DistributionLoadscanAbnormalEntity::getPackageId).distinct().collect(Collectors.toList());
 
 		//查询审核的是否存在计划
 		List<DistributionReservationPackageEntity> packageEntityList = distributionReservationPackageService.list(Wrappers.<DistributionReservationPackageEntity>query().lambda()
-			.eq(DistributionReservationPackageEntity::getParceListId, packageIds)
+			.in(DistributionReservationPackageEntity::getParceListId, packageIds)
 			.ne(DistributionReservationPackageEntity::getPacketBarStatus, ReservationPackageStatusConstant.quxiao.getValue())
 		);
 		if (!packageEntityList.isEmpty()) {