Merge remote-tracking branch 'origin/dev' into dev

blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/service/impl/ReceiptServiceImpl.java

@@ -27,6 +27,7 @@ import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.logpm.factorydata.base.feign.IFactoryDataBaseClient;
 import com.logpm.factorydata.base.vo.FactoryWarehouseBindVO;
+import com.logpm.factorydata.enums.BrandEnums;
 import com.logpm.factorydata.feign.IFactoryDataClient;
 import com.logpm.factorydata.vo.SendMsg;
 import com.logpm.factorydata.zbom.entity.ZbCategoryContrastEntity;
@@ -88,7 +89,7 @@ public class ReceiptServiceImpl extends BaseServiceImpl<ReceiptMapper, ZbReceipt
 		String startWarehouseName = null;
 		String tenantId = null;
 		// 获取工厂基地绑定的始发仓信息
-		R<FactoryWarehouseBindVO> warehouseByBrandAndSiteName = baseClient.getWarehouseByBrandAndSiteName(zbReceiptDTO.getSenderName(), zbReceiptDTO.getSenderName());
+		R<FactoryWarehouseBindVO> warehouseByBrandAndSiteName = baseClient.getWarehouseByBrandAndSiteName(BrandEnums.ZB.getValue(), zbReceiptDTO.getSenderCity());
 		if (ObjectUtil.equal(HttpConstants.HTTP.HTTP_RESOURCE_CODE.SUCCESS_CODE, warehouseByBrandAndSiteName.getCode())) {
 			FactoryWarehouseBindVO data = warehouseByBrandAndSiteName.getData();
 			if (ObjectUtil.isNotNull(data)) {

blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java

@@ -96,6 +96,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 	private final IAdvanceDetailClient advanceDetailClient;
 	private final IServiceNumClient serviceNumClient;
 	private final IDetailProductClient detailProductClient;
+	private final IFactoryDataBaseClient factoryDataBaseClient;
 	/*  pan */
 	private final IPanFactoryOrderService panFactoryOrderService;
 	private final IPanPackageInfoService panPackageInfoService;
@@ -128,7 +129,6 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 
 	private final OuPaiProperties ouPaiProperties;
 
-	private final IFactoryDataBaseClient factoryDataBaseClient;
 	private final IFactoryDataClient factoryDataClient;
 
 	/**
@@ -1489,10 +1489,16 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 	private AdvanceEntity saveAdvanceInfor(ZbOrderPackageEntity serviceNumEntity, List<ZbOrderPackageEntity> zbOrderPackageEntityList) {
 		Long orderId = serviceNumEntity.getId();
 		log.info("#########handlerDataToHt: 当前处理的订单id={}", orderId);
-
+		Integer warehouseId = 54;
 		// 查询订单对应的发货单
 		ZbReceiptEntity zbReceiptEntity = findZbReceiptEntityUseCacheById(serviceNumEntity.getReceiptId());
-
+		R<FactoryWarehouseBindVO> r = factoryDataBaseClient.getWarehouseByBrandAndSiteName(BrandEnums.ZB.getValue(), zbReceiptEntity.getSenderCity());
+		if(r.isSuccess()){
+			FactoryWarehouseBindVO data = r.getData();
+			if(ObjectUtil.isNotEmpty(data) && ObjectUtil.isNotEmpty(data.getOldWarehouseId())){
+				warehouseId = Convert.toInt(data.getWarehouseId());
+			}
+		}
 		AdvanceEntity advanceEntity = findAdvanceEntityUseCacheByOrderSelfNumAndReceiptId(serviceNumEntity.getReceiptId(), serviceNumEntity.getPlatformOrderCode(), zbReceiptEntity.getDepartCode());
 		if (ObjectUtils.isNotNull(advanceEntity)) {
 			return advanceEntity;
@@ -1541,7 +1547,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 		advanceEntity.setCarsNum(""); //派车单--snm 可以为空
 		advanceEntity.setDeleteTime(0); // 删除时间
 		advanceEntity.setWaybillNo("");//运单号  可以为空
-		Integer warehouseId = 54;
+
 		advanceEntity.setWarehouseId(warehouseId); //导入人仓库id
 
 		advanceEntity.setWaybillStatus(Integer.parseInt("1"));//开单状态：1=未开单，2=已开单