1.bug修复

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

@@ -42,4 +42,7 @@ public interface IOrderDetailClient {
 
 	@GetMapping(API_PREFIX + "/findByOrderCode")
     List<OrderDetailEntity> findByOrderCode(@RequestParam String orderCode,@RequestParam Integer oldWarehouseId);
+
+	@GetMapping(API_PREFIX + "/findEntityByUnitNoAndOldWarehosueId")
+	OrderDetailEntity findEntityByUnitNoAndOldWarehosueId(@RequestParam String unitNo, @RequestParam Integer oldWarehouseId);
 }

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

@@ -112,6 +112,8 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 	private final ITrunklineDetailProductClient trunklineDetailProductClient;
 	private final ITrunklineAdvanceDetailClient trunklineAdvanceDetailClient;
 
+	private final IOrderCountClient orderCountClient;
+
 //	@Override
 //	public FactoryTokenVO getToken(String corpId, String appKey, String appSecret) throws NoSuchAlgorithmException {
 //
@@ -381,6 +383,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 				total = total + ad.getTotal();
 			}
 
+
 			Map<String, String> supplyData = advanceDetailClient.getSupplyData(unitNo);
 			String destinationWarehouse= "";
 			String takeCompany= "";
@@ -396,6 +399,14 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 				throw new CustomerException(405, "仓库信息不存在");
 			}
 			Long warehouseId = basicdataWarehouseEntity.getId();
+			Integer oldId = basicdataWarehouseEntity.getOldId();
+
+			OrderCountEntity orderCountEntity = orderCountClient.getEntityByOrderCode(orderSelfNum,oldId);
+			if(Objects.isNull(orderCountEntity)){
+				log.warn("#################handleDataToPlatform: 未查询单订单信息 orderCode={}",orderSelfNum);
+				throw new CustomerException(403,"未查询单订单信息");
+			}
+
 			//判断新系统是否有这条订单数据
 			DistributionStockArticleEntity distributionStockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderSelfNum,warehouseId);
 
@@ -416,7 +427,8 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 				distributionStockArticleEntity.setMallName(takeCompany);
 
 
-				distributionStockArticleEntity.setWarehouseEntryTime(date);
+				distributionStockArticleEntity.setWarehouseEntryTime(orderCountEntity.getCreateTime());
+				distributionStockArticleEntity.setWarehouseEntryTimeEnd(orderCountEntity.getLatestInTime());
 				distributionStockArticleEntity.setTotalNumber(total);
 				distributionStockArticleEntity.setHandQuantity(0);
 				distributionStockArticleEntity.setTenantId(TenantNum.HUITONGCODE);// 对应租户ID
@@ -541,7 +553,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 
 			}
 			//保存包件信息
-			saveOrderPackage(unitNo, distributionStockArticleEntity, basicdataWarehouseEntity, waybillNoNum,operationTime);
+			saveOrderPackage(unitNo, distributionStockArticleEntity, basicdataWarehouseEntity, waybillNoNum,operationTime,oldId);
 
 			logger.info("#################handleDataToPlatform: 数据处理完成");
 		} else {
@@ -645,7 +657,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 	 * @param distributionStockArticleEntity 订单对象
 	 * @param basicdataWarehouseEntity 仓库对象
 	 */
-	private void saveOrderPackage(String unitNo, DistributionStockArticleEntity distributionStockArticleEntity,  BasicdataWarehouseEntity basicdataWarehouseEntity, String waybillNo,String operationTime) {
+	private void saveOrderPackage(String unitNo, DistributionStockArticleEntity distributionStockArticleEntity,  BasicdataWarehouseEntity basicdataWarehouseEntity, String waybillNo,String operationTime,Integer oldWarehouseId) {
 
 		DistributionParcelListEntityVO vo = advanceDetailClient.getByUnitNo(unitNo);;
 		// 判断当前查询包件不是否为皮阿落
@@ -663,6 +675,9 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 		if(Objects.isNull(vo)){
 			logger.warn("##############saveOrderPackage: 未在老系统查询到包件数据 unitNo={}",unitNo);
 		}else{
+
+			OrderDetailEntity orderDetailEntity = orderDetailClient.findEntityByUnitNoAndOldWarehosueId(unitNo,oldWarehouseId);
+
 			DistributionParcelListEntity entity = new DistributionParcelListEntity();
 			BeanUtil.copyProperties(vo, entity);
 			entity.setQuantity(1);
@@ -695,7 +710,10 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 			//进销售
 			entity.setDealerCode(distributionStockArticleEntity.getDealerCode());
 			entity.setDealerName(distributionStockArticleEntity.getDealerName());
-			entity.setWarehouseEntryTimeEnd(CommonUtil.StringToDate(operationTime));
+
+			if(!Objects.isNull(orderDetailEntity)){
+				entity.setWarehouseEntryTimeEnd(orderDetailEntity.getCreateTime());
+			}
 
 			// 绑定部门--仓库
 			if (!Objects.isNull(basicdataWarehouseEntity)) {

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

@@ -48,4 +48,9 @@ public class OrderDetailClient implements IOrderDetailClient {
 	public List<OrderDetailEntity> findByOrderCode(String orderCode,Integer oldWarehouseId) {
 		return orderDetailService.findByOrderCode(orderCode,oldWarehouseId);
 	}
+
+	@Override
+	public OrderDetailEntity findEntityByUnitNoAndOldWarehosueId(String unitNo, Integer oldWarehouseId) {
+		return orderDetailService.findEntityByUnitNoAndOldWarehosueId(unitNo,oldWarehouseId);
+	}
 }

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

@@ -9,4 +9,6 @@ public interface IOrderDetailService {
 	OrderDetailEntity findByUnitNo(String unitNo);
 
     List<OrderDetailEntity> findByOrderCode(String orderCode,Integer oldWarehouseId);
+
+    OrderDetailEntity findEntityByUnitNoAndOldWarehosueId(String unitNo, Integer oldWarehouseId);
 }

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

@@ -58,4 +58,14 @@ public class OrderDetailServiceImpl implements IOrderDetailService {
 			.eq("delete_time",0);
 		return orderDetailMapper.selectList(queryWrapper);
 	}
+
+	@Override
+	public OrderDetailEntity findEntityByUnitNoAndOldWarehosueId(String unitNo, Integer oldWarehouseId) {
+		QueryWrapper<OrderDetailEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("unitNo",unitNo)
+			.eq("now_warehouse_id",oldWarehouseId)
+			.eq("delete_time",0);
+
+		return orderDetailMapper.selectOne(queryWrapper);
+	}
 }

blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java

@@ -1357,7 +1357,7 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 			distributionStockArticleEntity.setStockupStatus(OrderStockupStatusConstant.daibeihuo.getValue()); //备货状态
 			distributionStockArticleEntity.setGroundingStatus(OrderGroundingStatusConstant.daishangjia.getValue()); //上架状态
 
-			distributionStockArticleEntity.setWarehouseEntryTime(date);
+//			distributionStockArticleEntity.setWarehouseEntryTime(date);
 
 			id = distributionStockArticleClient.addData(distributionStockArticleEntity);
 			distributionStockArticleEntity.setId(id);