LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 82833 打包管理--开票的金额大于待确收金额了

Browse Source
This commit is contained in:
mzaxd
2024-03-25 09:30:57 +08:00
parent 3966e2e882
commit b23396c3d6
1 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
+34
View File
@@ -1614,6 +1614,30 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
noTaxAmount = payPaymentRecordService.addPaidAmount(noTaxAmount,oldNoTaxAmount);
tax = payPaymentRecordService.addPaidAmount(tax,oldTax);
break;
// 普通项目
case PayIncomeContractCommon.PROJECT_TYPE8:
PayPackCompany payPackCompany = payPackCompanyService.getById(oldBmp.getProjectId());
amountReceivable = payPackCompany.getReceivableAmount();//应收
needInvoice = payPackCompany.getNeedInvoice();//是否需要发票
//之前开票总额-编辑之前的开票金额
oldInvoiceAmount = payPackCompany.getInvoiceAmount().subtract(oldBmp.getInvoiceAmount()).setScale(2, BigDecimal.ROUND_HALF_UP);
if(oldInvoiceAmount==null){
oldInvoiceAmount= new BigDecimal("0");
}
//原始开票总额+本次开票金额
invoiceAmount = oldInvoiceAmount.add(thisInvoiceAmount).setScale(2, BigDecimal.ROUND_HALF_UP);
//开票总额>应收
if(invoiceAmount.compareTo(payPackCompany.getReceivableAmount()) == 1){
return "开票金额大于当前未开票金额，输入有误！";
}
//之前的税额
oldNoTaxAmount = payPackCompany.getInvoiceNoTaxAmount().subtract(oldBmp.getNoTaxAmount());
oldTax = payPackCompany.getInvoiceTax().subtract(oldBmp.getTax());
//税额
noTaxAmount = payPaymentRecordService.addPaidAmount(noTaxAmount,oldNoTaxAmount);
tax = payPaymentRecordService.addPaidAmount(tax,oldTax);
break;
default:
break;
}
@@ -1702,6 +1726,16 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
newCertificate.setInvoiceTax(tax);
certificatePaymentMapper.updateById(newCertificate);
break;
// 普通项目
case PayIncomeContractCommon.PROJECT_TYPE8:
PayPackCompany newPack = new PayPackCompany();
newPack.setId(oldBmp.getProjectId());
newPack.setMakeInvoice(makeInvoice);
newPack.setInvoiceAmount(invoiceAmount);
newPack.setInvoiceNoTaxAmount(noTaxAmount);
newPack.setInvoiceTax(tax);
payPackCompanyService.updateById(newPack);
break;
default:
break;
}