Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml

@@ -2030,7 +2030,7 @@
     </select>
     <select id="selectSignforByDeliveryId"
             resultType="com.logpm.distribution.entity.DistributionSignforEntity">
-        SELECT * FROM logpm_distribution_signfor AS lds  LEFT JOIN  logpm_distribution_reservation AS ldr
+        SELECT * FROM logpm_distribution_signfor AS lds  LEFT JOIN  logpm_distribution_reservation AS ldr ON lds.reservation_id = ldr.id
         WHERE lds.delivery_id = #{deliveryId} AND (ldr.reservation_num + ldr.reservation_stock_list_num) > 0
     </select>
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml

@@ -257,7 +257,7 @@
 
     <select id="getLoadCountNum" resultType="int">
         SELECT
-        count( ldl.id )
+        IFNULL(sum(ldl.loaded_nub),0)
         FROM
         logpm_distribution_loadscan  ldl
         right JOIN logpm_distribution_reservation ldr on ldr.id= ldl.reservation_id and ldr.reservation_status !='40'

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@@ -763,7 +763,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			log.error("预约查询签收信息错误");
 			return R.fail("请联系管理员!!!");
 		}
-		if (signforEntity.getReceivedQuantity() <= 0) {
+		if ((signforEntity.getReceivedQuantity()+signforEntity.getReceivedinQuantity()) <= 0) {
 			log.error("signforack############未进行签收上传图片");
 			return R.fail("无签收数据");
 		}
@@ -2522,7 +2522,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			log.error("预约查询签收信息错误");
 			return R.fail("请联系管理员!!!");
 		}
-		if (signforEntity.getReceivedQuantity() <= 0) {
+		if ((signforEntity.getReceivedQuantity() + signforEntity.getReceivedinQuantity()) <= 0) {
 			log.error("signforack############未进行签收上传图片");
 			return Resp.scanFail(12000, "请先进行签收扫描后上传图片", "请先进行签收扫描后上传图片", null);
 		}