diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java index 0c244d2f7..14be064d3 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java @@ -401,11 +401,11 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { 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,"未查询单订单信息"); - } +// 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); @@ -427,8 +427,8 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { distributionStockArticleEntity.setMallName(takeCompany); - distributionStockArticleEntity.setWarehouseEntryTime(orderCountEntity.getCreateTime()); - distributionStockArticleEntity.setWarehouseEntryTimeEnd(orderCountEntity.getLatestInTime()); + distributionStockArticleEntity.setWarehouseEntryTime(date); + distributionStockArticleEntity.setWarehouseEntryTimeEnd(date); distributionStockArticleEntity.setTotalNumber(total); distributionStockArticleEntity.setHandQuantity(0); distributionStockArticleEntity.setTenantId(TenantNum.HUITONGCODE);// 对应租户ID @@ -712,7 +712,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { entity.setDealerName(distributionStockArticleEntity.getDealerName()); if(!Objects.isNull(orderDetailEntity)){ - entity.setWarehouseEntryTimeEnd(orderDetailEntity.getCreateTime()); + entity.setWarehouseEntryTimeEnd(orderDetailEntity.getUpdateTime()); } // 绑定部门--仓库