From b4c0223ffe2621100f0626b8ce4da50832d683b9 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Sun, 17 Mar 2024 10:55:06 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E9=9B=B6=E6=8B=85=E6=97=A0?=
 =?UTF-8?q?=E8=A3=85=E8=BD=A6=E6=95=B0=E6=8D=AE=20=E5=A4=8D=E6=A0=B8?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/mapper/DistributionLoadscanMapper.xml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml
index 0eb7bf552..caecc363d 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml
@@ -287,13 +287,11 @@
         (IF((SELECT sum(loaded_nub) FROM logpm_distribution_loadscaninvn  WHERE delivery_id = #{deliveryId} AND scan_state != 1 AND signfor_state = 2)is null,0,(SELECT sum(loaded_nub) FROM logpm_distribution_loadscaninvn  WHERE delivery_id = #{deliveryId} AND scan_state != 1 )))
     </select>
     <select id="judgmentZeroPackageIsSign" resultType="java.lang.Boolean">
-
         SELECT
-        IF
-        ( received_quantity = #{num}, 1, 0 )
-        FROM
-        logpm_distribution_loadscan AS ldl
+            IF(IFNULL(ldl.received_quantity,0) = 2, 1, 0)
+        FROM logpm_distribution_reservation_zero_package ldrzp
+        left join logpm_distribution_loadscan ldl on ldrzp.reservation_id = ldl.reservation_id and ldrzp.parcel_list_id = ldl.package_id
         WHERE
-        reservation_id = #{reservationId} AND package_id = #{packageId}
+            ldrzp.reservation_id = #{reservationId} AND ldrzp.parcel_list_id = #{packageId}
     </select>
 </mapper>