|
|
@ -115,7 +115,7 @@ public class BirRoiRateServiceImpl extends ServiceImpl<BirRoiRateMapper,BirRoiRa |
|
|
|
|
|
|
|
//发货单
|
|
|
|
List<ErpDispatchSumVo> dispatchSumVos = null; |
|
|
|
if(supplierCodeList.size()>0){ |
|
|
|
if(supplierCodeList!=null&&supplierCodeList.size()>0){ |
|
|
|
dispatchSumVos = dispatchDataMapper.querySumCost(startMonthNum,currMonthNum,supplierCodeList); |
|
|
|
} |
|
|
|
for (BirRoiCostItemVo costItemVo : costItemVoList) { |
|
|
@ -313,6 +313,9 @@ public class BirRoiRateServiceImpl extends ServiceImpl<BirRoiRateMapper,BirRoiRa |
|
|
|
private Float getPercenDateByLoadType(Integer loadType,BirRoiCostDTO oriCostDTO,String supplierId,String userId){ |
|
|
|
BirRoiCostDTO costDTO = CopierUtil.copy(oriCostDTO,new BirRoiCostDTO()); |
|
|
|
List<String> supplierCodeList = getBiRoiCostDTOAndFindSupplierCodes(costDTO, supplierId, loadType, userId); |
|
|
|
if(supplierCodeList==null||supplierCodeList.size()==0){ |
|
|
|
return 0F; |
|
|
|
} |
|
|
|
Float tempPercent = getPercentDate(costDTO,supplierCodeList); |
|
|
|
return tempPercent; |
|
|
|
} |
|
|
|