Merge branch 'dev' into pre-production

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
+            IF(IFNULL(ldl.received_quantity,0) = 2, 1, 0)
-        ( received_quantity = #{num}, 1, 0 )
+        FROM logpm_distribution_reservation_zero_package ldrzp
-        FROM
+        left join logpm_distribution_loadscan ldl on ldrzp.reservation_id = ldl.reservation_id and ldrzp.parcel_list_id = ldl.package_id
-        logpm_distribution_loadscan AS ldl
         WHERE
-        reservation_id = #{reservationId} AND package_id = #{packageId}
+            ldrzp.reservation_id = #{reservationId} AND ldrzp.parcel_list_id = #{packageId}
     </select>
 </mapper>