diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforVO.java
index 2f6ed1e13..260dab40a 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforVO.java
@@ -50,6 +50,11 @@ public class DistributionSignforVO extends DistributionSignforEntity {
 	 */
 	@ApiModelProperty(value = "客户电话")
 	private String deliveryPhone;
+	/**
+	 * 定位打卡位置
+	 */
+	@ApiModelProperty(value = "定位打卡位置")
+	private String positioningAdr;
 	/**
 	 * 客户地址
 	 */
@@ -90,7 +95,7 @@ public class DistributionSignforVO extends DistributionSignforEntity {
 	 * 计划总数
 	 */
 	@ApiModelProperty(value = "计划总数")
-	private Integer totalNum;
+	private Integer planNum;
 	/**
 	 * 装车件数
 	 */
@@ -340,6 +345,7 @@ public class DistributionSignforVO extends DistributionSignforEntity {
 	@ApiModelProperty(value = "商城ID")
 	private List<Long> clientIds;
 
+
 	/**
 	 * 签收图片路径，多个
 	 */
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 4f9a976eb..5407946b4 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
@@ -743,15 +743,20 @@
         lds.clerk_sign_pictures clerkSignPictures,
         lds.delivery_sign_pictures deliverySignPictures,
         ldr.reservation_date reservationDate,
-        lds.positioning_adr positioningAdr,
+        (ldr.reservation_num + ldr.reservation_stock_list_num) AS planNum,
         (lds.loaded_number + lds.loadedin_number) loadingNum,
         (lds.received_quantity + lds.receivedin_quantity) signingNum,
         lddl.train_number trainNumber,
         lddl.vehicle_name vehicleName,
         lddl.driver_name driverName,
-
         lddl.loading_team_name loadingTeamName,
         lddl.unloading_team_name unLoadingTeamName,
+        lds.signee_name AS signeeName,
+        lds.examine_user_name AS examineUserName,
+        lds.sjsigning_time AS sjsigningTime,
+        lds.signing_time AS signingTime,
+        lddl.task_time AS taskTime,
+        GROUP_CONCAT(DISTINCT ldp.latitude_and_longitude) AS  positioningAdr,
         CASE
         WHEN ldr.delivery_type = '1' THEN
         '商配'
@@ -773,7 +778,8 @@
         FROM
         logpm_distribution_signfor lds
         JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id
-        JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id
+        JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id AND ldr.reservation_status != 40
+        LEFT JOIN logpm_distribution_positioning AS ldp ON lds.reservation_id = lds.reservation_id AND ldp.is_deleted = 0
         where lds.is_deleted = 0 and lds.id = #{id}
     </select>
 
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 c6fc16c05..5c46c3898 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
@@ -3706,13 +3706,14 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 
 	@Override
 	public DistributionSignforVO getOneCustom(Long id) {
-		DistributionSignforVO distributionSignforVO = baseMapper.selectOneCustom(id);
 		//查询客户下的订单列表信息
 		DistributionSignforEntity signforEntity = this.getById(id);
 		if (Func.isEmpty(signforEntity)) {
 			log.error("###########查询签收信息异常，id:{}", id);
 			return null;
 		}
+		DistributionSignforVO distributionSignforVO = baseMapper.selectOneCustom(id);
+
 		List<DistributionReservationStockarticleEntity> reservationStockarticleEntityList = distributionReservationStockarticleService.list(Wrappers.<DistributionReservationStockarticleEntity>query().lambda()
 			.eq(DistributionReservationStockarticleEntity::getReservationId, signforEntity.getReservationId())
 			.ne(DistributionReservationStockarticleEntity::getStockArticleStatus, ReservationOrderStatusConstant.quxiao.getValue()));