Merge branch 'dev' into pre-production

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java

@@ -289,10 +289,12 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 				trunklineCostShareRecordEntity.setLoadingWarehouseId(warehouseId);
 				trunklineCostShareRecordEntity.setLoadingWarehouseName(warehouseName);
 				trunklineCostShareRecordEntity.setPlanUnloadWarehouseId(finalNodeId);
+				if(Objects.isNull(finalNodeId)){
 					BasicdataWarehouseEntity finalWarehouse = warehouseClient.getEntityWarehouseId(finalNodeId);
 					if (!Objects.isNull(finalWarehouse)) {
 						trunklineCostShareRecordEntity.setPlanUnloadWarehouseName(finalWarehouse.getName());
 					}
+				}
 				trunklineCostShareRecordEntity.setRealUnloadWarehouseId(unloadNodeId);
 				trunklineCostShareRecordEntity.setRealUnloadWarehouseName(unloadNodeName);
 				trunklineCostShareRecordEntity.setWaybillStartWarehouseId(departureWarehouseId);

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java

@@ -884,6 +884,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 						}
 					} else {
 						Long clientId = basicdataTripartiteMallClient.getClientIdByNameAndBrand(dealerName, advanceEntity.getBrand());
+						if(!Objects.isNull(clientId)){
 							BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(clientId);
 							if (!Objects.isNull(basicdataClientEntity)) {
 								String clientType = basicdataClientEntity.getClientType();
@@ -893,6 +894,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 									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();
@@ -908,6 +910,8 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 												}
 											}
 										}
+									}
+
 								} else if ("2".equals(clientType)) {
 									//商城
 									stockArticleEntity.setMallId(basicdataClientEntity.getId());
@@ -921,6 +925,8 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 								}
 							}
 						}
+
+					}
 					stockArticleEntity.setCustomerName(advanceEntity.getCustomerName());
 					stockArticleEntity.setCustomerTelephone(advanceEntity.getCustomerPhone());
 					stockArticleEntity.setCustomerAddress(advanceEntity.getCustomerAddress());