修改自提签收数据推送

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java

@@ -1329,15 +1329,33 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 
 				}
 			}
+			// 转换仓库ID
+			modifyWarehouseId(delivery);
 
 			Boolean b = oldSystemDataPushClient.pushOldSystemSignInfo(delivery);
 			return b;
 		} catch (Exception e) {
-			log.error(">>>>> 推送老系统签收信息报错", e);
+			log.error(">>>>> 推送老系统自提签收信息报错", e);
 			return false;
 		}
 	}
 
+	/**
+	 * 转换老系统的ID
+	 * @param delivery
+	 */
+	private void modifyWarehouseId(SignPushDataDTO delivery) {
+
+		if(!Objects.isNull(delivery.getWarehouseId())){
+			// 查询老系统的ID
+			BasicdataWarehouseEntity entityWarehouseId = warehouseClient.getEntityWarehouseId(delivery.getWarehouseId());
+			if(Objects.nonNull(entityWarehouseId)){
+				delivery.setWarehouseId(Long.parseLong(entityWarehouseId.getOldId()+""));
+			}
+		}
+
+	}
+
 
 	/**
 	 * 构建名称和电话号码