1.干线bug修复

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);

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());