1.干线装车详情，卸车详情零担收货单位添加

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;//已卸车件数

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;//卸车件数
 

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">

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">