From 6101458b6d0bef491c3efc73a38842edd3c137d9 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Sat, 2 Nov 2024 03:12:02 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionStockupServiceImpl.java          | 3 +--
 .../trunkline/service/impl/TrunklineCarsLoadServiceImpl.java  | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
index 672c4ef5d..dac217022 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
@@ -78,7 +78,6 @@ import org.springblade.common.enums.PackageTypeEnums;
 import org.springblade.common.exception.CustomerException;
 import org.springblade.common.model.NodeFanoutMsg;
 import org.springblade.common.model.PackageData;
-import org.springblade.common.model.ReservationVO;
 import org.springblade.common.model.StockUpVO;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.core.log.exception.ServiceException;
@@ -1230,7 +1229,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			if (Func.isBlank(mallName)) {
 				//预约商场名称为空  查看是否存在商场ID
 				if (Func.isNotEmpty(reservationEntity.getMallId())) {
-					BasicdataClientEntity basicdataClientEntity = basicdataClientClient.getMallById(reservationEntity.getMallId());
+					BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(reservationEntity.getMallId());
 					mallName = basicdataClientEntity.getClientName();
 				} else {
 					log.error("###########预约单无商场信息:{}", reservationId);
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 bce73e977..142fc8851 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
@@ -4991,6 +4991,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					}
 				}
 
+				trunklineAdvanceDetailService.updateById(advanceDetailEntity);
+
 				trunklineAdvanceDetailService.updateSyncUnloadDataStatus(id,1);
 
 			}catch (Exception e){
@@ -5061,7 +5063,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				String consigneeName1 = waybillEntity.getConsignee();
 
 
-				BasicdataClientEntity clientEntity = clientClient.getMallById(consigneeId);
+				BasicdataClientEntity clientEntity = clientClient.findEntityById(consigneeId);
 				// 如果在入库的时候发现客户信息不存在，则不设置客户信息 默认采用商配
 				if (!Objects.isNull(clientEntity)) {
 					stockArticleEntity.setMallId(clientEntity.getId());