|
|
@ -1718,7 +1718,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord |
|
|
|
} |
|
|
|
if (payPriceTotal.compareTo(exePayPriceTotal) == -1) { |
|
|
|
//借方
|
|
|
|
voucherResultDetailDtoJF.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyEve.getOpenDate()); |
|
|
|
voucherResultDetailDtoJF.setSummary("还" + finPaymentrecord.getCostTitleValue() + DateUtil.formatDate(new Date())); |
|
|
|
voucherResultDetailDtoJF.setSubjectNo("1009.03"); |
|
|
|
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData(); |
|
|
|
voucherResultDetailDtoJF.setDimensionDept(deptVo.getOrgCode()); |
|
|
@ -1727,13 +1727,13 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord |
|
|
|
voucherResultDetailDtoJF.setDebit(finPaymentrecord.getCost().toString()); |
|
|
|
voucherResultDetailDtos.add(voucherResultDetailDtoJF); |
|
|
|
//贷方
|
|
|
|
voucherResultDetailDtoDf.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyEve.getOpenDate()); |
|
|
|
voucherResultDetailDtoDf.setSummary("还" + finPaymentrecord.getCostTitleValue() + DateUtil.formatDate(new Date())); |
|
|
|
voucherResultDetailDtoDf.setBankAccount(finPaymentrecord.getPayBankAccount()); |
|
|
|
voucherResultDetailDtoDf.setCredit(finPaymentrecord.getCost().toString()); |
|
|
|
voucherResultDetailDtos.add(voucherResultDetailDtoDf); |
|
|
|
} else { |
|
|
|
//借方
|
|
|
|
voucherResultDetailDtoJF.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyEve.getOpenDate()); |
|
|
|
voucherResultDetailDtoJF.setSummary("还" + finPaymentrecord.getCostTitleValue() + DateUtil.formatDate(new Date())); |
|
|
|
voucherResultDetailDtoJF.setSubjectNo("2111"); |
|
|
|
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData(); |
|
|
|
voucherResultDetailDtoJF.setDimensionDept(deptVo.getOrgCode()); |
|
|
@ -1742,14 +1742,14 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord |
|
|
|
voucherResultDetailDtoJF.setDebit(exePayPriceTotal.add(bzj).toString()); |
|
|
|
voucherResultDetailDtos.add(voucherResultDetailDtoJF); |
|
|
|
//贷方1
|
|
|
|
voucherResultDetailDtoDf.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyEve.getOpenDate()); |
|
|
|
voucherResultDetailDtoDf.setSummary("还" + finPaymentrecord.getCostTitleValue() + DateUtil.formatDate(new Date())); |
|
|
|
voucherResultDetailDtoDf.setSubjectNo("1009.03"); |
|
|
|
voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode()); |
|
|
|
voucherResultDetailDtoDf.setBank(key); |
|
|
|
voucherResultDetailDtoDf.setCredit(exePayPriceTotal.add(bzj).subtract(finPaymentrecord.getCost()).toString()); |
|
|
|
voucherResultDetailDtos.add(voucherResultDetailDtoDf); |
|
|
|
//贷方2
|
|
|
|
voucherResultDetailDtoDf2.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyEve.getOpenDate()); |
|
|
|
voucherResultDetailDtoDf2.setSummary("还" + finPaymentrecord.getCostTitleValue() + DateUtil.formatDate(new Date())); |
|
|
|
voucherResultDetailDtoDf2.setBankAccount(finPaymentrecord.getPayBankAccount()); |
|
|
|
voucherResultDetailDtoDf2.setCredit(finPaymentrecord.getCost().toString()); |
|
|
|
voucherResultDetailDtos.add(voucherResultDetailDtoDf2); |
|
|
|