From 6bf9185b7391ae518d2e457be69eb5c98a41b58b Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Fri, 18 Oct 2024 22:15:54 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF=E8=A3=85=E8=BD=A6=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=EF=BC=8C=E5=8D=B8=E8=BD=A6=E8=AF=A6=E6=83=85=E9=9B=B6?=
 =?UTF-8?q?=E6=8B=85=E6=94=B6=E8=B4=A7=E5=8D=95=E4=BD=8D=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/logpm/trunkline/vo/LoadZeroListVO.java | 1 +
 .../src/main/java/com/logpm/trunkline/vo/UnloadZeroVO.java   | 1 +
 .../logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml   | 5 ++++-
 .../com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml  | 5 ++++-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/LoadZeroListVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/LoadZeroListVO.java
index d521f7abf..ab272d854 100644
--- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/LoadZeroListVO.java
+++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/LoadZeroListVO.java
@@ -11,6 +11,7 @@ public class LoadZeroListVO implements Serializable {
 
 	private String waybillNo;//运单号
 	private String orderCode;//订单号
+	private String consignee;//收货单位
 	private Integer planNum;//计划装车件数
 	private Integer loadingNum;//已装车件数
 	private Integer unloadingNum;//已卸车件数
diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/UnloadZeroVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/UnloadZeroVO.java
index 4201b5804..27cfa5223 100644
--- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/UnloadZeroVO.java
+++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/UnloadZeroVO.java
@@ -11,6 +11,7 @@ public class UnloadZeroVO implements Serializable {
 
 	private String waybillNo;//运单号
 	private String orderCode;//订单号
+	private String consignee;//收货单位
 	private Integer loadingNum;//装车数量
 	private Integer unloadNum;//卸车件数
 
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml
index a64383cbc..1724be3b5 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml
@@ -855,14 +855,17 @@
     <select id="findUnloadZeroList" resultType="com.logpm.trunkline.vo.UnloadZeroVO">
         select ltcls.waybill_no waybillNo,
                ltcls.order_code orderCode,
+               lww.consignee consignee,
                IFNULL(sum(ltcls.num),0) loadingNum,
                IFNULL(sum(ltcls.unload_num),0) unloadNum
         from logpm_trunkline_cars_load_scan ltcls
+        left join logpm_warehouse_waybill lww on lww.waybill_no = ltcls.waybill_no
         where ltcls.load_id = #{loadId}
         and ltcls.final_node_id = #{warehouseId}
         and ltcls.type = '2'
         group by ltcls.waybill_no,
-               ltcls.order_code
+               ltcls.order_code,
+                 lww.consignee
     </select>
 
     <select id="findUnloadNumAudio" resultType="com.alibaba.fastjson.JSONObject">
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml
index 0e8a7f3e2..3ca1f2301 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml
@@ -52,16 +52,19 @@
         select ltco.waybill_no waybillNo,
                ltco.order_code orderCode,
                ltco.plan_num planNum,
+               lww.consignee consignee,
                IFNULL(sum(ltcls.num),0) loadingNum,
                IFNULL(sum(ltcls.unload_num),0) unloadingNum
         from logpm_trunkline_cars_order ltco
         left join logpm_trunkline_cars_load_scan ltcls on ltcls.waybill_no = ltco.waybill_no and ltco.order_code = ltcls.order_code and ltco.load_id = ltcls.load_id
+        left join logpm_warehouse_waybill lww.waybill_no on ltcls.waybill_no = lww.waybill_no
         where ltco.load_id = #{loadId}
         and ltco.node_id = #{nodeId}
         and ltco.type = 2
         group by ltco.waybill_no,
                  ltco.order_code,
-                 ltco.plan_num
+                 ltco.plan_num,
+                 lww.consignee
     </select>
 
     <select id="findUnloadZeroList" resultType="com.logpm.trunkline.vo.UnloadZeroVO">