From 7f26b2134c56cb3fdf5aaabddbd02fdbe6e09b10 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <zhaoqiaobo@163.com>
Date: Fri, 19 Apr 2024 11:46:36 +0800
Subject: [PATCH] =?UTF-8?q?fix(service):=20=E5=A2=9E=E5=8A=A0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=85=B1=E4=BA=AB=E5=95=86=E5=AE=B6=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E8=B4=A7=E7=89=A9=E4=BF=A1=E6=81=AF=E9=9B=B6=E6=8B=85=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=9A=84sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datasharing/mapper/MerchantMapeer.java    |  3 +++
 .../datasharing/mapper/MerchantMapper.xml     | 25 +++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/mapper/MerchantMapeer.java b/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/mapper/MerchantMapeer.java
index aef953bb5..77abcffab 100644
--- a/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/mapper/MerchantMapeer.java
+++ b/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/mapper/MerchantMapeer.java
@@ -3,6 +3,7 @@ package com.logpm.datasharing.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.logpm.datasharing.dto.MerchantOrderDTO;
 import com.logpm.datasharing.vo.MerchantPackageVO;
+import com.logpm.datasharing.vo.MerchantZeroDispatchVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -41,4 +42,6 @@ public interface MerchantMapeer extends BaseMapper {
 	 */
 	List<MerchantPackageVO> findPackage(@Param("contractNumber") String contractNumber);
 
+	List<MerchantZeroDispatchVO> findZeroPackage(@Param("contractNumber") String contractNumber);
+
 }
diff --git a/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/mapper/MerchantMapper.xml b/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/mapper/MerchantMapper.xml
index 8119797af..925854e8e 100644
--- a/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/mapper/MerchantMapper.xml
+++ b/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/mapper/MerchantMapper.xml
@@ -54,5 +54,30 @@
             group by lddl.id order by null) driver on driver.id = lddl.id
         where t.order_code = #{contractNumber}
     </select>
+    <select id="findZeroPackage" resultType="com.logpm.datasharing.vo.MerchantZeroDispatchVO">
+        select lww.shipper_address,
+               t.waybill_number,
+               lds.received_quantity,
+               ifnull(driver.lname, driver.ltname)   distributionName,
+               ifnull(driver.lphone, driver.ltphone) distributionPhone
+        from logpm_distribution_stock_article t
+                 left join logpm_distribution_reservation_stockarticle ldrs
+                           on ldrs.stock_article_id = t.id and ldrs.stock_article_status != 2
+         left join logpm_distribution_reservation ldr
+        on ldr.id = ldrs.reservation_id and ldr.reservation_status != 40
+            left join logpm_warehouse_waybill lww on lww.waybill_no = t.waybill_number
+            left join logpm_distribution_signfor lds on lds.reservation_id = ldr.id
+            left join logpm_distribution_delivery_list lddl on lddl.id = lds.delivery_id
+            left join (select lddl.id,
+            group_concat(ldd.driver_name) lname,
+            group_concat(lddt.driver_name) ltname,
+            group_concat(ldd.driver_phone) lphone,
+            group_concat(lddt.driver_phone) ltphone
+            from logpm_distribution_delivery_list lddl
+            left join logpm_distribution_delivery_self ldd on ldd.delivery_id = lddl.id
+            left join logpm_distribution_delivery_tripartite lddt on lddt.delivery_id = lddl.id
+            group by lddl.id) driver on driver.id = lddl.id
+        where t.order_code = #{contractNumber}
+    </select>
 
 </mapper>