|
|
@ -744,22 +744,22 @@ public class OpenOrderServiceImpl implements IOpenOrderService { |
|
|
|
distributionParcelListClient.updateList(parcelListEntities); |
|
|
|
distributionParcelListClient.updateList(parcelListEntities); |
|
|
|
|
|
|
|
|
|
|
|
//根据订单id获取每个订单的运单拼接数据
|
|
|
|
//根据订单id获取每个订单的运单拼接数据
|
|
|
|
|
|
|
|
if(!stockArticleIds.isEmpty()){ |
|
|
|
|
|
|
|
List<DistributionStockArticleEntity> stockArticleEntities = distributionStockArticleClient.findWaybillNoByOrderIds(stockArticleIds); |
|
|
|
|
|
|
|
|
|
|
|
List<DistributionStockArticleEntity> stockArticleEntities = distributionStockArticleClient.findWaybillNoByOrderIds(stockArticleIds); |
|
|
|
stockArticleEntities.forEach(stockArticleEntity -> { |
|
|
|
|
|
|
|
stockArticleEntity.setMallId(consigneeId1); |
|
|
|
stockArticleEntities.forEach(stockArticleEntity -> { |
|
|
|
stockArticleEntity.setMallCode(basicdataClientEntity.getClientCode()); |
|
|
|
stockArticleEntity.setMallId(consigneeId1); |
|
|
|
stockArticleEntity.setMallName(basicdataClientEntity.getClientName()); |
|
|
|
stockArticleEntity.setMallCode(basicdataClientEntity.getClientCode()); |
|
|
|
stockArticleEntity.setTypeService(basicdataClientEntity.getTypeService()+""); |
|
|
|
stockArticleEntity.setMallName(basicdataClientEntity.getClientName()); |
|
|
|
stockArticleEntity.setConsigneePerson(waybillEntity.getConsigneeName()); |
|
|
|
stockArticleEntity.setTypeService(basicdataClientEntity.getTypeService()+""); |
|
|
|
stockArticleEntity.setConsigneeMobile(waybillEntity.getConsigneeMobile()); |
|
|
|
stockArticleEntity.setConsigneePerson(waybillEntity.getConsigneeName()); |
|
|
|
stockArticleEntity.setConsigneeAddress(waybillEntity.getConsigneeAddress()); |
|
|
|
stockArticleEntity.setConsigneeMobile(waybillEntity.getConsigneeMobile()); |
|
|
|
stockArticleEntity.setConsigneeUnit(basicdataClientEntity.getClientName()); |
|
|
|
stockArticleEntity.setConsigneeAddress(waybillEntity.getConsigneeAddress()); |
|
|
|
}); |
|
|
|
stockArticleEntity.setConsigneeUnit(basicdataClientEntity.getClientName()); |
|
|
|
if(CollUtil.isNotEmpty(stockArticleEntities)){ |
|
|
|
}); |
|
|
|
distributionStockArticleClient.updateByBatchId(stockArticleEntities); |
|
|
|
|
|
|
|
} |
|
|
|
if(CollUtil.isNotEmpty(stockArticleEntities)){ |
|
|
|
|
|
|
|
distributionStockArticleClient.updateByBatchId(stockArticleEntities); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|