From 08ded7c61e99ca8fc666694f79aaf98997d29250 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Mon, 22 Apr 2024 19:31:16 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF-bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/trunkline/service/impl/OpenOrderServiceImpl.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
index 12a2e919e..f923ca288 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
@@ -313,12 +313,11 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		if(Objects.isNull(brandId)){
 			BasicdataBrandEntity basicdataBrandEntity = basicdataBrandClient.findEntityByName(brand);
 			if (!Objects.isNull(basicdataBrandEntity)) {
-				waybillEntity.setBrandId(basicdataBrandEntity.getId());
+				brandId = basicdataBrandEntity.getId();
 			}
-		}else{
-			waybillEntity.setBrandId(brandId);
 		}
 
+		waybillEntity.setBrandId(brandId);
 		waybillEntity.setBrand(brand);
 		waybillEntity.setOrderNo(openOrderDTO.getOrderCode());
 		waybillEntity.setDepartureWarehouseId(departureWarehouseId);