fix(service): 增加数据共享商家获取货物信息零担数据的sql

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);
+
 }

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>