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