Merge remote-tracking branch 'origin/dev' into dev

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)) {
+		if(Objects.isNull(brandId)){
-//			waybillEntity.setBrandId(basicdataBrandEntity.getId());
+			BasicdataBrandEntity basicdataBrandEntity = basicdataBrandClient.findEntityByName(brand);
-//		}
+			if (!Objects.isNull(basicdataBrandEntity)) {
-
+				waybillEntity.setBrandId(basicdataBrandEntity.getId());
+			}
+		}else{
 			waybillEntity.setBrandId(brandId);
+		}
+
 		waybillEntity.setBrand(brand);
 		waybillEntity.setOrderNo(openOrderDTO.getOrderCode());
 		waybillEntity.setDepartureWarehouseId(departureWarehouseId);