From ced80c8dc7920a7ae2f877bf73ba46ef44ae707b Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <zhaoqiaobo@163.com>
Date: Tue, 9 Apr 2024 11:07:54 +0800
Subject: [PATCH] =?UTF-8?q?fix(service):=20=E4=BF=AE=E6=94=B9=E5=BF=97?=
 =?UTF-8?q?=E9=82=A6=E5=9C=A8=E9=80=94=E8=8A=82=E7=82=B9=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E4=B8=BA=E4=BB=93=E5=BA=93=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionAsyncServiceImpl.java          | 2 +-
 .../service/impl/TrunklineCarsLoadServiceImpl.java          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
index eca0751ee..279418bdd 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
@@ -1539,7 +1539,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 	@Transactional(rollbackFor = Exception.class)
 	@Async
 	public void sendReviewFactory(Long signingId, String warehouseName, Long warehouseId) {
-		String brands = "梦天,欧派";//可追加 ,志邦
+		String brands = "梦天,欧派,志邦";//可追加
 		log.info(">>>>>>>>>>> 签收推送 对象 {}", "signingId：=" + signingId + "warehouseName：=" + warehouseName + "warehouseId：=" + warehouseId);
 		//查询签收信息
 		DistributionSignforEntity distributionSignforEntity = distributionSignforMapper.selectById(signingId);
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 4e17a723c..c811a54ed 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
@@ -380,7 +380,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(nowWarehouseId);
 			String warehouseAddress = null;
 			if (ObjectUtil.isNotEmpty(warehouseEntity)) {
-				warehouseAddress = warehouseEntity.getWarehouseAddress();
+				warehouseAddress = warehouseEntity.getName();
 			}
 			sendFactoryData(brands, node, warehouseAddress);
 		} catch (Exception e) {
@@ -942,7 +942,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(nowWarehouseId);
 			String warehouseAddress = null;
 			if (ObjectUtil.isNotEmpty(warehouseEntity)) {
-				warehouseAddress = warehouseEntity.getWarehouseAddress();
+				warehouseAddress = warehouseEntity.getName();
 			}
 			sendFactoryData(brands, node, warehouseAddress);
 		} catch (Exception e) {
@@ -1709,7 +1709,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(nowWarehouseId);
 			String warehouseAddress = null;
 			if (ObjectUtil.isNotEmpty(warehouseEntity)) {
-				warehouseAddress = warehouseEntity.getWarehouseAddress();
+				warehouseAddress = warehouseEntity.getName();
 			}
 			this.sendFactoryData(brands, NodeEnums.TRIPARTITE_TRANSFER_DEPART, warehouseAddress);
 		} catch (Exception e) {