From 6aa6f31faa55a113361f2372284eed2ae1cc3e94 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 22 Apr 2024 15:57:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=AE=A1=E6=A0=B8=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E8=BF=87=E6=BB=A4=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/distribution/mapper/DistributionSignforMapper.xml    | 2 +-
 .../service/impl/DistributionSignforServiceImpl.java           | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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 7e7d54eb4..33141b860 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
@@ -1038,7 +1038,7 @@
             LEFT JOIN logpm_distribution_loadscan AS ldl ON ldla.package_id = ldl.package_id
             LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldla.package_id = ldpl.id
         WHERE
-            ldla.reservation_id = #{reservationId} and ldl.reservation_id = #{reservationId} and ldla.delivery_list_id = #{deliveryListId} AND ldl.scan_status != 1
+            ldla.reservation_id = #{reservationId} and ldl.reservation_id = #{reservationId} and ldla.delivery_list_id = #{deliveryListId} AND ldl.scan_status != 1 AND ldl.is_deleted = 0
     </select>
     <select id="selectSignImgsUrl" resultType="com.logpm.distribution.vo.DistributionSignPrintVO">
         SELECT * FROM logpm_distribution_sign_print WHERE reservation_id = #{reservationId} and is_deleted = 0
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 8b84d5e47..dfc9cb84d 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
@@ -2859,6 +2859,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				if (loadscanEntityList.size() == 1){
 					if (loadscanEntityList.get(0).getReservationId().equals(distrilbutionloadingscanDTO.getReservationId())) {
 						loadscanEntity = loadscanEntityList.get(0);
+					}else {
+						log.error("##############异常签收包件在其他车次进行装车reservationId:{}", loadscanEntityList.stream().map(DistributionLoadscanEntity::getReservationId).map(String::valueOf).collect(Collectors.joining(",")));
+						return Resp.scanFail("操作失败", "包件已出库");
 					}
 				}