From d513ed9c271d002bbdb892421055ffc1919ed5e4 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Sun, 17 Mar 2024 11:19:40 +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.java   | 2 +-
 .../distribution/mapper/DistributionLoadscanMapper.xml    | 8 ++++----
 .../service/impl/DistributionSignforServiceImpl.java      | 7 ++++++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.java
index 2a8c3f6fe..5aae0d04f 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.java
@@ -185,5 +185,5 @@ public interface DistributionLoadscanMapper extends BaseMapper<DistributionLoads
 	 * @param reservationNum
 	 * @return
 	 */
-    boolean judgmentZeroPackageIsSign(@Param("reservationId") Long reservationId,@Param("packageId") Long packageId,@Param("num") Integer reservationNum);
+    Boolean judgmentZeroPackageIsSign(@Param("reservationId") Long reservationId,@Param("packageId") Long packageId,@Param("num") Integer reservationNum);
 }
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 caecc363d..3849c2555 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
@@ -288,10 +288,10 @@
     </select>
     <select id="judgmentZeroPackageIsSign" resultType="java.lang.Boolean">
         SELECT
-            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
+            IF( received_quantity = #{num}, 1, 0 )
+        FROM
+            logpm_distribution_loadscan AS ldl
         WHERE
-            ldrzp.reservation_id = #{reservationId} AND ldrzp.parcel_list_id = #{packageId}
+            reservation_id = #{reservationId} AND package_id = #{packageId}
     </select>
 </mapper>
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 692d09cec..86d17a8a2 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
@@ -1498,7 +1498,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		if (Func.isNotEmpty(distributionParcelNumberDTOS)){
 			for (DistributionParcelNumberDTO distributionParcelNumberDTO : distributionParcelNumberDTOS) {
 				//查询是否签收是否和计划保持一致
-				flag = distributionLoadscanMapper.judgmentZeroPackageIsSign(distributionParcelNumberDTO.getReservationId(),distributionParcelNumberDTO.getParcelListId(),distributionParcelNumberDTO.getReservationNum());
+				Boolean aBoolean = distributionLoadscanMapper.judgmentZeroPackageIsSign(distributionParcelNumberDTO.getReservationId(), distributionParcelNumberDTO.getParcelListId(), distributionParcelNumberDTO.getReservationNum());
+				if(Objects.isNull(aBoolean)){
+					return false;
+				}else{
+					flag = aBoolean;
+				}
 			}
 		}
 		return flag;