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

blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IWayBillClient.java

@@ -39,6 +39,9 @@ public interface IWayBillClient {
 	@GetMapping(API_PREFIX + "/getByWaybillNo")
 	WayBillEntity getByWaybillNo(@RequestParam String waybillNo);
 
+	@GetMapping(API_PREFIX + "/getByWaybillId")
+	WayBillEntity getByWaybillId(@RequestParam Integer waybilId);
+
 	@GetMapping(API_PREFIX + "/getByWayBillByAdvanceId")
 	WayBillEntity getByWayBillByAdvanceId(@RequestParam("advId") Integer  advId);
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java

@@ -27,11 +27,9 @@ import com.logpm.basicdata.excel.BasicdataClientExcel;
 import com.logpm.basicdata.mapper.BasicdataClientMapper;
 import com.logpm.basicdata.service.*;
 import com.logpm.basicdata.vo.BasicdataClientVO;
-import com.sun.xml.internal.ws.developer.ServerSideException;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.DictBizConstant;
-import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;

blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java

@@ -447,6 +447,8 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 					// todo  这里需要去查询门店 和新系统的门店ID 进行绑定
 
 					String peisongType = getPeisongTypeByClientId(basicdataClientEntity.getId());
+					logger.info("订单同步peisongType{} ", peisongType);
+
 					if (StringUtil.isNoneBlank(peisongType)) {
 						distributionStockArticleEntity.setTypeService(peisongType);
 					}
@@ -596,9 +598,12 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 		}
 		//通过运单号先去查询新系统是否存在这个运单号
 		WarehouseWaybillEntity warehouseWaybill = warehouseWaybillClient.findByWaybillNo(waybillNo);
+		logger.info("#################handleDataToPlatform.warehouseWaybill: {}", warehouseWaybill);
+
 		if (Objects.isNull(warehouseWaybill)) {
 			//如果新系统中不存在这个运单，那么就去查询老系统的运单数据
 			WayBillEntity wayBillEntity = wayBillClient.getByWaybillNo(waybillNo);
+			logger.info("#################handleDataToPlatform.wayBillEntity: {}", wayBillEntity);
 			if (Objects.isNull(wayBillEntity)) {
 				logger.warn("##############saveWaybillEntity: 老系统中未找到对应运单waybillNo={}", waybillNo);
 				throw new CustomerException("老系统中未找到对应运单");

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/WayBillClient.java

@@ -43,6 +43,12 @@ public class WayBillClient implements IWayBillClient {
 		return wayBillService.getByWaybillNo(waybillNo);
 	}
 
+	@Override
+	@GetMapping(API_PREFIX + "/getByWaybillId")
+	public WayBillEntity getByWaybillId(Integer waybilId) {
+		return wayBillService.getByWaybillId(waybilId);
+	}
+
 	@Override
 	@GetMapping(API_PREFIX + "/getByWayBillByAdvanceId")
 	public WayBillEntity getByWayBillByAdvanceId(Integer advId) {

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IWayBillService.java

@@ -9,6 +9,9 @@ public interface IWayBillService {
 	WayBillEntity getByWaybillNo(String waybillNo);
 
 
+	WayBillEntity getByWaybillId(Integer id);
+
+
 	WayBillEntity getByWayBillByAdvanceId(Integer  advId);
 
 

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/WayBillServiceImpl.java

@@ -24,6 +24,11 @@ public class WayBillServiceImpl implements IWayBillService {
 		return wayBillMapper.selectOne(queryWrapper);
 	}
 
+	@Override
+	public WayBillEntity getByWaybillId(Integer id) {
+		return wayBillMapper.selectById(id);
+	}
+
 	@Override
 	public WayBillEntity getByWayBillByAdvanceId(Integer advId) {
 

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WaybillDTO.java

@@ -7,6 +7,12 @@ import java.io.Serializable;
 @Data
 public class WaybillDTO implements Serializable {
 
+
+	/**
+	 * 运单号ID
+	 */
+	private Integer id;
+
 	/**
 	 * 运单号
 	 */

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java

@@ -3,6 +3,7 @@ package com.logpm.warehouse.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.logpm.basicdata.entity.BasicdataClientEntity;
 import com.logpm.basicdata.entity.BasicdataStoreBusinessEntity;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
@@ -71,7 +72,9 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void waybillDataHandler(WaybillDTO waybillDTO) {
-		String waybillNo = waybillDTO.getWaybillNo();
+//		String waybillNo = waybillDTO.getWaybillNo();
+		// 通过ID 获取老系统的订单数据
+		Integer wayBillId = waybillDTO.getId();
 		Integer allNum = waybillDTO.getNumber();
 		Date date = new Date();
 		Long waybillId = null;
@@ -80,19 +83,27 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 //			Integer num = productDTO.getNum();
 //			allNum = allNum + num;
 //		}
-		log.info("###############waybillDataHandler: 处理数据开始 waybillNo={}", waybillNo);
+		log.info("###############waybillDataHandler: 处理数据开始 waybillDTO={}", waybillDTO);
 
+		WayBillEntity wayBillEntity = wayBillClient.getByWaybillId(wayBillId);
+
+		if(ObjectUtils.isNull(wayBillEntity)){
+			log.warn("##############waybillDataHandler: 老系统中未找到对应运单waybillId={}", waybillDTO.getId());
+			throw new CustomerException("老系统中未找到对应运单");
+		}
+
+		String waybillNo =wayBillEntity.getWaybillNo();
 		//通过运单号先去查询新系统是否存在这个运单号
 		QueryWrapper<WarehouseWaybillEntity> waybillQueryWrapper = new QueryWrapper<>();
 		waybillQueryWrapper.eq("waybill_no", waybillNo);
 		WarehouseWaybillEntity warehouseWaybill = warehouseWaybillMapper.selectOne(waybillQueryWrapper);
 		if (Objects.isNull(warehouseWaybill)) {
 			//如果新系统中不存在这个运单，那么就去查询老系统的运单数据
-			WayBillEntity wayBillEntity = wayBillClient.getByWaybillNo(waybillNo);
-			if (Objects.isNull(wayBillEntity)) {
-				log.warn("##############waybillDataHandler: 老系统中未找到对应运单waybillNo={}", waybillNo);
-				throw new CustomerException("老系统中未找到对应运单");
-			}
+//			WayBillEntity wayBillEntity = wayBillClient.getByWaybillNo(waybillNo);
+//			if (Objects.isNull(wayBillEntity)) {
+//				log.warn("##############waybillDataHandler: 老系统中未找到对应运单waybillNo={}", waybillNo);
+//				throw new CustomerException("老系统中未找到对应运单");
+//			}
 			warehouseWaybill = saveWayBillData(wayBillEntity, allNum);
 			waybillId = warehouseWaybill.getId();