Merge branch 'dev' into pre-production

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

@@ -621,7 +621,7 @@
             COALESCE(ldr.reservation_num + ldr.reservation_stock_list_num, 0)  reservationNum
         FROM
             logpm_distribution_signfor lds
-                JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id
+            JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id
         WHERE  lds.is_deleted = 0 AND lds.delivery_id = #{id}
     </select>
     <select id="selectord" resultType="com.logpm.distribution.vo.app.DistributionAppStockArticleVO">

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

@@ -2596,7 +2596,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			return Resp.scanFail("请签收扫描", "请签收扫描!!");
 		}
 		StringBuilder str = new StringBuilder();
-		str.append("计划" + reservationEntity.getReservationNum() + "件");
+		str.append("计划" + (reservationEntity.getReservationNum()+reservationEntity.getReservationStockListNum()) + "件");
 		AtomicInteger signingTotalNum = new AtomicInteger();
 		if (Func.isNotEmpty(packageNum)) {
 			//统计签收数量