From b8c6fc02f0203ae4841889d8588b25d2292d978c Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Wed, 27 Dec 2023 16:38:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AD=BE=E6=94=B6=E5=A4=8D?=
 =?UTF-8?q?=E5=90=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/DistributionDeliveryInfoVO.java        |  8 +++
 .../mapper/DistributionDeliveryInfoMapper.xml |  2 +
 .../mapper/DistributionSignforMapper.java     |  1 -
 .../mapper/DistributionSignforMapper.xml      | 55 +------------------
 .../impl/DistributionSignforServiceImpl.java  |  2 +-
 5 files changed, 12 insertions(+), 56 deletions(-)

diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java
index 0b4ac5f7c..8357c3b0e 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java
@@ -43,6 +43,11 @@ public class DistributionDeliveryInfoVO extends DistributionDeliveryInfoEntity {
 	@ApiModelProperty(value = "仓库")
 	private String warehouse;
 
+
+	/**
+	 * 签收ID
+	 */
+	private Long signId;
 	/**
 	 * 运单号
 	 */
@@ -344,6 +349,9 @@ public class DistributionDeliveryInfoVO extends DistributionDeliveryInfoEntity {
 	 * 签收时间
 	 */
 	private String signingTime;
+
+
+
 //	/**
 //	 * 配送方式
 //	 */
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
index f4463ad16..c6f206e14 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
@@ -65,6 +65,7 @@
         SELECT
         ldr.reservation_num,
         ldr.id id,
+        lds.id signId,
         ldr.is_urgent isUrgent,
         ldr.mall_name mallName,
         ldr.reservation_code reservationCode,
@@ -561,6 +562,7 @@ FROM
         SELECT
         ldr.reservation_num,
         ldr.id id,
+        lds.id signId,
         ldr.is_urgent isUrgent,
         ldr.mall_name mallName,
         ldr.reservation_code reservationCode,
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java
index 7c36f4079..8d6629a93 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java
@@ -124,7 +124,6 @@ public interface DistributionSignforMapper extends BaseMapper<DistributionSignfo
 	 * @return
 	 */
     DistributionSignforVO selectOneCustom(@Param("id")Long id);
-    DistributionSignforVO selectOneCustomByReservationId(@Param("id")Long id);
 	/**
 	 * 查询车次装车件数
 	 *
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 4268f736f..8936fab47 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
@@ -663,60 +663,7 @@
     </select>
 
 
-    <select id="selectOneCustomByReservationId" resultType="com.logpm.distribution.vo.DistributionSignforVO">
-        SELECT
-        CASE
-        WHEN
-        ldr.is_urgent = '1' THEN '否'
-        WHEN ldr.is_urgent = '2' THEN '是'
-        ELSE ''
-        END isUrgent,
-        ldr.reservation_code reservationCode,
-        ldr.mall_name mallName,
-        ldr.consignee consignee,
-        ldr.remarks remarks,
-        ldr.delivery_address deliveryAddress,
-        ldr.delivery_phone deliveryPhone,
-        lds.clerk_sign_remarks clerkSignRemarks,
-        lds.driver_remarks driverRemarks,
-        lds.signing_status AS wenyuanSigningStatus,
-        lds.driver_signing AS sijiSigningStatus,
-        lds.reservation_id reservationId,
-        lds.signing_type signingType,
-        lds.clerk_sign_pictures clerkSignPictures,
-        lds.delivery_sign_pictures deliverySignPictures,
-        ldr.reservation_date reservationDate,
-        lds.positioning_adr positioningAdr,
-        lddl.train_number trainNumber,
-        lddl.vehicle_name vehicleName,
-        lddl.driver_name driverName,
-        lddl.driver_name driverName,
-        lddl.loading_team_name loadingTeamName,
-        lddl.unloading_team_name unLoadingTeamName,
-        CASE
-        WHEN ldr.delivery_type = '1' THEN
-        '商配'
-        WHEN ldr.delivery_type = '2' THEN
-        '市配'
-        END deliveryType,
-        CASE
-        WHEN lds.signing_status = '1' THEN
-        '文员待审核'
-        WHEN lds.signing_status = '2' THEN
-        '文员已审核'
-        END signingStatusName,
-        CASE
-        WHEN lds.driver_signing = '1' THEN
-        '司机待审核'
-        WHEN lds.driver_signing = '2' THEN
-        '司机已签收'
-        END driverSigningName
-        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
-        where lds.is_deleted = 0 and ldr.id = #{id}
-    </select>
+    
     <select id="selectloadNub" resultType="java.lang.Integer">
         SELECT COALESCE(sum(lds.loaded_number), 0)  FROM logpm_distribution_signfor lds WHERE lds.delivery_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 5e12749af..49a18b8af 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
@@ -1050,7 +1050,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 	@Override
 	public DistributionSignforVO getOneCustom(Long id) {
 		// todo  这里需要配TJJ 来进行修改 传入的参数未预约单DI
-		DistributionSignforVO distributionSignforVO = baseMapper.selectOneCustomByReservationId(id);
+		DistributionSignforVO distributionSignforVO = baseMapper.selectOneCustom(id);
 		//查询客户下的订单列表信息
 		DistributionSignforEntity signforEntity = this.getById(id);
 		if (Func.isEmpty(signforEntity)) {