|
|
@ -262,6 +262,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { |
|
|
|
|
|
|
|
|
|
|
|
//收货单位-----根据三方商场找到对应的clientId
|
|
|
|
//收货单位-----根据三方商场找到对应的clientId
|
|
|
|
Long clientId = basicdataTripartiteMallClient.getClientIdByNameAndBrandAndCode(dealerName,StringUtil.isBlank(dealerCode)?"":dealerCode, brand); |
|
|
|
Long clientId = basicdataTripartiteMallClient.getClientIdByNameAndBrandAndCode(dealerName,StringUtil.isBlank(dealerCode)?"":dealerCode, brand); |
|
|
|
|
|
|
|
if(!Objects.isNull(clientId)){ |
|
|
|
BasicdataClientVO basicdataClientEntity = basicdataClientClient.findEntityVoById(clientId); |
|
|
|
BasicdataClientVO basicdataClientEntity = basicdataClientClient.findEntityVoById(clientId); |
|
|
|
if (!Objects.isNull(basicdataClientEntity)) { |
|
|
|
if (!Objects.isNull(basicdataClientEntity)) { |
|
|
|
openOrderVO.setConsigneeClientId(clientId); |
|
|
|
openOrderVO.setConsigneeClientId(clientId); |
|
|
@ -313,6 +314,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { |
|
|
|
openOrderVO.setDestinationWarehouseName(basicdataStorageServicesEntity.getServeWarehouseName()); |
|
|
|
openOrderVO.setDestinationWarehouseName(basicdataStorageServicesEntity.getServeWarehouseName()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//组装货物数据
|
|
|
|
//组装货物数据
|
|
|
|
List<AdvanceDetailGoodsVO> goodsList = new ArrayList<>(); |
|
|
|
List<AdvanceDetailGoodsVO> goodsList = new ArrayList<>(); |
|
|
|