|
|
@ -313,12 +313,11 @@ public class OpenOrderServiceImpl implements IOpenOrderService { |
|
|
|
if(Objects.isNull(brandId)){ |
|
|
|
if(Objects.isNull(brandId)){ |
|
|
|
BasicdataBrandEntity basicdataBrandEntity = basicdataBrandClient.findEntityByName(brand); |
|
|
|
BasicdataBrandEntity basicdataBrandEntity = basicdataBrandClient.findEntityByName(brand); |
|
|
|
if (!Objects.isNull(basicdataBrandEntity)) { |
|
|
|
if (!Objects.isNull(basicdataBrandEntity)) { |
|
|
|
waybillEntity.setBrandId(basicdataBrandEntity.getId()); |
|
|
|
brandId = basicdataBrandEntity.getId(); |
|
|
|
} |
|
|
|
} |
|
|
|
}else{ |
|
|
|
|
|
|
|
waybillEntity.setBrandId(brandId); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
waybillEntity.setBrandId(brandId); |
|
|
|
waybillEntity.setBrand(brand); |
|
|
|
waybillEntity.setBrand(brand); |
|
|
|
waybillEntity.setOrderNo(openOrderDTO.getOrderCode()); |
|
|
|
waybillEntity.setOrderNo(openOrderDTO.getOrderCode()); |
|
|
|
waybillEntity.setDepartureWarehouseId(departureWarehouseId); |
|
|
|
waybillEntity.setDepartureWarehouseId(departureWarehouseId); |
|
|
|