From 5d664c223f61e5075ce7d0035a9f2e4e9048cf8f Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Fri, 13 Dec 2024 12:00:07 +0800
Subject: [PATCH] =?UTF-8?q?1.bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/logpm/report/mapper/ReportIncomingMapper.xml | 2 +-
 .../com/logpm/trunkline/mq/waybil/StatusLogListener.java  | 5 -----
 .../service/impl/TrunklineCarsLoadServiceImpl.java        | 8 +++++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportIncomingMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportIncomingMapper.xml
index 2a406b676..efe3279a8 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportIncomingMapper.xml
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportIncomingMapper.xml
@@ -243,7 +243,7 @@
         MONTH(lww.document_making_time)
     </select>
 
-    <select id="ReportConsigneeIncomingExportVO" resultType="com.logpm.report.vo.ReportConsigneeIncomingExportVO">
+    <select id="consigneeIncomingExport" resultType="com.logpm.report.vo.ReportConsigneeIncomingExportVO">
         select 	waw.business_line businessLine,
         lww.departure_warehouse_name departureWarehouseName,
         lww.destination_warehouse_name destinationWarehouseName,
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/waybil/StatusLogListener.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/waybil/StatusLogListener.java
index d77fd3a88..e4127b8f2 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/waybil/StatusLogListener.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/waybil/StatusLogListener.java
@@ -5,9 +5,6 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.logpm.trunkline.dto.WaybillLogDTO;
-import com.logpm.trunkline.feign.ITrunklineWaybillTrackClient;
-import com.logpm.trunkline.mapper.TrunklineWaybillPackageMapper;
-import com.logpm.trunkline.service.ITrunklineWaybillPackageService;
 import com.logpm.trunkline.service.ITrunklineWaybillTrackService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -23,7 +20,6 @@ import org.springframework.amqp.rabbit.annotation.Queue;
 import org.springframework.amqp.rabbit.annotation.QueueBinding;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -110,7 +106,6 @@ public class StatusLogListener {
 		value = @Queue(name = FanoutConstants.distribution.DeliveryAndrecheck.QUEUE.waybillStatusLog, durable = "true"),
 		exchange = @Exchange(name = FanoutConstants.distribution.DeliveryAndrecheck.EXCHANGE, type = ExchangeTypes.FANOUT)
 	))
-	@Transactional(rollbackFor = Exception.class)
 	public void statusDekiveryLog(String msg) {
 
 		log.info("商/市配送 复核处理运单日志和状态: {}", msg);
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
index 531b61c9e..5234b7a03 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
@@ -5527,9 +5527,11 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				trunklineCostShareRecordEntity.setLoadingWarehouseId(warehouseId);
 				trunklineCostShareRecordEntity.setLoadingWarehouseName(warehouseName);
 				trunklineCostShareRecordEntity.setPlanUnloadWarehouseId(finalNodeId);
-				BasicdataWarehouseEntity finalWarehouse = basicdataWarehouseClient.getEntityWarehouseId(finalNodeId);
-				if (!Objects.isNull(finalWarehouse)) {
-					trunklineCostShareRecordEntity.setPlanUnloadWarehouseName(finalWarehouse.getName());
+				if(!Objects.isNull(finalNodeId)){
+					BasicdataWarehouseEntity finalWarehouse = basicdataWarehouseClient.getEntityWarehouseId(finalNodeId);
+					if (!Objects.isNull(finalWarehouse)) {
+						trunklineCostShareRecordEntity.setPlanUnloadWarehouseName(finalWarehouse.getName());
+					}
 				}
 				trunklineCostShareRecordEntity.setRealUnloadWarehouseId(unloadNodeId);
 				trunklineCostShareRecordEntity.setRealUnloadWarehouseName(unloadNodeName);