From 71e1f0729e61bbe88dfd8793d13cb07ed264f019 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Sat, 18 Jan 2025 17:57:22 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=8A=A5=E9=94=99bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CarsLoadAsyncServiceImpl.java        |  8 ++-
 .../impl/TrunklineAdvanceServiceImpl.java     | 66 ++++++++++---------
 2 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java
index 40cdc4598..1f4401dd1 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java
@@ -289,9 +289,11 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 				trunklineCostShareRecordEntity.setLoadingWarehouseId(warehouseId);
 				trunklineCostShareRecordEntity.setLoadingWarehouseName(warehouseName);
 				trunklineCostShareRecordEntity.setPlanUnloadWarehouseId(finalNodeId);
-				BasicdataWarehouseEntity finalWarehouse = warehouseClient.getEntityWarehouseId(finalNodeId);
-				if (!Objects.isNull(finalWarehouse)) {
-					trunklineCostShareRecordEntity.setPlanUnloadWarehouseName(finalWarehouse.getName());
+				if(Objects.isNull(finalNodeId)){
+					BasicdataWarehouseEntity finalWarehouse = warehouseClient.getEntityWarehouseId(finalNodeId);
+					if (!Objects.isNull(finalWarehouse)) {
+						trunklineCostShareRecordEntity.setPlanUnloadWarehouseName(finalWarehouse.getName());
+					}
 				}
 				trunklineCostShareRecordEntity.setRealUnloadWarehouseId(unloadNodeId);
 				trunklineCostShareRecordEntity.setRealUnloadWarehouseName(unloadNodeName);
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java
index 631f6e4cd..bab6b7217 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java
@@ -884,42 +884,48 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 						}
 					} else {
 						Long clientId = basicdataTripartiteMallClient.getClientIdByNameAndBrand(dealerName, advanceEntity.getBrand());
-						BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(clientId);
-						if (!Objects.isNull(basicdataClientEntity)) {
-							String clientType = basicdataClientEntity.getClientType();
-							if ("5".equals(clientType)) {
-								stockArticleEntity.setStoreId(basicdataClientEntity.getId());
-								stockArticleEntity.setStoreCode(basicdataClientEntity.getClientCode());
-								stockArticleEntity.setStoreName(basicdataClientEntity.getClientName());
-								//查询门店的父级商场
-								Long pid = basicdataClientEntity.getPid();
-								BasicdataClientEntity pidEntity = basicdataClientClient.findEntityById(pid);
-								if (!Objects.isNull(pidEntity)) {
-									String pidEntityClientType = pidEntity.getClientType();
-									if ("2".equals(pidEntityClientType)) {
-										//商城
-										stockArticleEntity.setMallId(pidEntity.getId());
-										stockArticleEntity.setMallName(pidEntity.getClientName());
-										stockArticleEntity.setMallCode(pidEntity.getClientCode());
-
-										BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(pidEntity.getId(), 3);
-										if (!Objects.isNull(basicdataStoreBusinessEntity)) {
-											stockArticleEntity.setTypeService(basicdataStoreBusinessEntity.getMold());
+						if(!Objects.isNull(clientId)){
+							BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(clientId);
+							if (!Objects.isNull(basicdataClientEntity)) {
+								String clientType = basicdataClientEntity.getClientType();
+								if ("5".equals(clientType)) {
+									stockArticleEntity.setStoreId(basicdataClientEntity.getId());
+									stockArticleEntity.setStoreCode(basicdataClientEntity.getClientCode());
+									stockArticleEntity.setStoreName(basicdataClientEntity.getClientName());
+									//查询门店的父级商场
+									Long pid = basicdataClientEntity.getPid();
+									if(!Objects.isNull(pid)){
+										BasicdataClientEntity pidEntity = basicdataClientClient.findEntityById(pid);
+										if (!Objects.isNull(pidEntity)) {
+											String pidEntityClientType = pidEntity.getClientType();
+											if ("2".equals(pidEntityClientType)) {
+												//商城
+												stockArticleEntity.setMallId(pidEntity.getId());
+												stockArticleEntity.setMallName(pidEntity.getClientName());
+												stockArticleEntity.setMallCode(pidEntity.getClientCode());
+
+												BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(pidEntity.getId(), 3);
+												if (!Objects.isNull(basicdataStoreBusinessEntity)) {
+													stockArticleEntity.setTypeService(basicdataStoreBusinessEntity.getMold());
+												}
+											}
 										}
 									}
-								}
-							} else if ("2".equals(clientType)) {
-								//商城
-								stockArticleEntity.setMallId(basicdataClientEntity.getId());
-								stockArticleEntity.setMallName(basicdataClientEntity.getClientName());
-								stockArticleEntity.setMallCode(basicdataClientEntity.getClientCode());
 
-								BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(basicdataClientEntity.getId(), 3);
-								if (!Objects.isNull(basicdataStoreBusinessEntity)) {
-									stockArticleEntity.setTypeService(basicdataStoreBusinessEntity.getMold());
+								} else if ("2".equals(clientType)) {
+									//商城
+									stockArticleEntity.setMallId(basicdataClientEntity.getId());
+									stockArticleEntity.setMallName(basicdataClientEntity.getClientName());
+									stockArticleEntity.setMallCode(basicdataClientEntity.getClientCode());
+
+									BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(basicdataClientEntity.getId(), 3);
+									if (!Objects.isNull(basicdataStoreBusinessEntity)) {
+										stockArticleEntity.setTypeService(basicdataStoreBusinessEntity.getMold());
+									}
 								}
 							}
 						}
+
 					}
 					stockArticleEntity.setCustomerName(advanceEntity.getCustomerName());
 					stockArticleEntity.setCustomerTelephone(advanceEntity.getCustomerPhone());