From c5895edd77b653ec348434dbc41072c03617175b Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Mon, 22 Apr 2024 19:29:53 +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

---
 .../service/impl/OpenOrderServiceImpl.java         | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 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 93378b671..12a2e919e 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
@@ -306,15 +306,19 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 
 		String brand = openOrderDTO.getBrand();
 		Long brandId = openOrderDTO.getBrandId();
-//		BasicdataBrandEntity basicdataBrandEntity = basicdataBrandClient.findEntityByName(brand);
+
 
 		WarehouseWaybillEntity waybillEntity = new WarehouseWaybillEntity();
 		waybillEntity.setWaybillNo(waybillNo);
-//		if (!Objects.isNull(basicdataBrandEntity)) {
-//			waybillEntity.setBrandId(basicdataBrandEntity.getId());
-//		}
+		if(Objects.isNull(brandId)){
+			BasicdataBrandEntity basicdataBrandEntity = basicdataBrandClient.findEntityByName(brand);
+			if (!Objects.isNull(basicdataBrandEntity)) {
+				waybillEntity.setBrandId(basicdataBrandEntity.getId());
+			}
+		}else{
+			waybillEntity.setBrandId(brandId);
+		}
 
-		waybillEntity.setBrandId(brandId);
 		waybillEntity.setBrand(brand);
 		waybillEntity.setOrderNo(openOrderDTO.getOrderCode());
 		waybillEntity.setDepartureWarehouseId(departureWarehouseId);