From 06993827adf87da1ea3d179ebed88caf8cda70dc Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Mon, 8 Apr 2024 21:09:56 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=8C=89=E8=AE=A2=E5=8D=95=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/patch/service/impl/SyncOrderInfoServiceImpl.java    | 4 ++++
 1 file changed, 4 insertions(+)

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);