From 4c26cd0c02f896597add4cda3089dec6cc35abf3 Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Sun, 12 Nov 2023 00:03:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E8=AF=AD=E9=9F=B3=E6=92=AD?=
 =?UTF-8?q?=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/logpm/distribution/mapper/DistributionSignforMapper.xml | 2 +-
 .../service/impl/DistributionSignforServiceImpl.java            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
index 6d633e40d..f396e9327 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
+++ b/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">
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 f0a121910..b1aa2e728 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
@@ -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)) {
 			//统计签收数量