|
|
@ -473,8 +473,8 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe |
|
|
|
String finalSummaryTag = summaryTag; |
|
|
|
String[] split = finalSummaryTag.split("年"); |
|
|
|
String y1 = split[0]; //预提申请标题年份
|
|
|
|
map.forEach((k, v) -> { |
|
|
|
List<ScmSpecialRebate> rebates = v; |
|
|
|
for (Map.Entry<String, List<ScmSpecialRebate>> entry : map.entrySet()) { |
|
|
|
List<ScmSpecialRebate> v = entry.getValue(); |
|
|
|
GeneralVoucher generalVoucher = new GeneralVoucher(); |
|
|
|
generalVoucher.setBussDate(format); |
|
|
|
List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>(); |
|
|
@ -634,7 +634,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe |
|
|
|
BigDecimal daizhifuchaMoney = BigDecimal.ZERO;//待支付差额
|
|
|
|
BigDecimal yingshouMoney = BigDecimal.ZERO;//应收返利
|
|
|
|
if (StringUtils.isNotBlank(rebate.getAdjustmentMoney())) { |
|
|
|
adMoney = new BigDecimal(rebate.getAdjustmentMoney()); |
|
|
|
adMoney = new BigDecimal(rebate.getAdjustmentMoney()); |
|
|
|
} |
|
|
|
if (null != rebate.getOnceTreatCost()) { |
|
|
|
daizhifuchaMoney = daizhifuchaMoney.add(rebate.getOnceTreatCost()); |
|
|
@ -878,7 +878,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe |
|
|
|
finKingDeeFeign.saveRebateSpecialReviewVoucher(generalVoucher); |
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|