Merge branch 'dev' into pre-production

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);
 }

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)
+            IF( 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
-            ldrzp.reservation_id = #{reservationId} AND ldrzp.parcel_list_id = #{packageId}
+            reservation_id = #{reservationId} AND package_id = #{packageId}
     </select>
 </mapper>

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;