diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java index 684a11c4b..fbc80607a 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java @@ -1643,7 +1643,11 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService { entity.setOrderPackageStatus(OrderPackageStatusConstant.yiruku.getValue()); if(!Objects.isNull(waybillEntity)){ String warehouseName = waybillEntity.getWarehouseName();//็›ฎ็š„ไป“ + Integer warehouseId1 = waybillEntity.getWarehouseId(); BasicdataWarehouseEntity endhouse = basicdataWarehouseClient.findByName(warehouseName); + if(Objects.isNull(endhouse)){ + endhouse = basicdataWarehouseClient.getWarehouseByOldId(warehouseId1); + } Long endWarehouseId = endhouse.getId(); if(endWarehouseId.equals(warehouseId)){ entity.setIsTransfer(0);