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 5321d2172..ca7877173 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
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.basic.entity.BasicMaterialEntity;
 import com.logpm.basic.feign.IBasicMaterialClient;
 import com.logpm.basicdata.entity.BasicdataClientEntity;
+import com.logpm.basicdata.entity.BasicdataStoreBusinessEntity;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataClientClient;
 import com.logpm.basicdata.feign.IBasicdataStoreBusinessClient;
@@ -49,6 +50,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 	private final IBasicMaterialClient basicMaterialClient;
 	private final IBasicdataTripartiteMallClient tripartiteMallClient;
 	private final IWarehouseWaybillClient warehouseWaybillClient;
+	private final IBasicdataTripartiteMallClient basicdataTripartiteMallClient;
 
 
 	@Override
@@ -106,44 +108,44 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 			stockArticleEntity.setDealerName(advanceEntity.getDealerName());
 
 			stockArticleEntity.setTypeService("1");//默认商配
-//			BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findByName(dealerName);
-//			log.info("############saveOrderAndPackage: 订单同步出现的客户编号{} 匹配的客户", basicdataClientEntity);
-//			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());
-//							}
-//						}
-//					}
-//				}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());
-//					}
-//				}
-//			}
+
+			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());
+							}
+						}
+					}
+				}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());
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 3bbb7f040..b02334c76 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
@@ -75,6 +75,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 	private final IBasicdataDriverArteryClient basicdataDriverArteryClient;
 	private final ITrunklineCarsSignLogService trunklineCarsSignLogService;
 	private final RabbitTemplate rabbitTemplate;
+	private final IInComingService inComingService;
 
 	@Override
 	public IPage<TrunklineCarsLoadVO> loadCarsPageList(LoadCarsDTO loadCarsDTO) {
@@ -3681,6 +3682,17 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByOrderPackageCodeAndStatus(orderPackageCode);
 			if(Objects.isNull(parcelListEntity)){
 				//没有包件数据
+
+				InComingDTO inComingDTO = new InComingDTO();
+				inComingDTO.setOrderPackageCode(orderPackageCode);
+				inComingDTO.setWarehouseId(warehouseId);
+				R r = inComingService.incomingPackage(inComingDTO);
+				int code = r.getCode();
+				if(code != 200){
+					log.warn("##############unloadPackage: 包件入库失败");
+					return R.fail(405,"包件入库失败");
+				}
+
 				//需要补装车扫记录
 				TrunklineCarsLoadScanEntity trunklineCarsLoadScanEntity = new TrunklineCarsLoadScanEntity();
 				trunklineCarsLoadScanEntity.setWarehouseId(warehouseId);