|
@@ -1428,14 +1428,14 @@ public class FinInvoicesServiceImpl extends ServiceImpl<FinInvoicesMapper, FinIn
|
|
|
if (exrateType.equals(item.getCurCode())) {
|
|
if (exrateType.equals(item.getCurCode())) {
|
|
|
if ("C".equals(finAccBills.getAccountDc())) {
|
|
if ("C".equals(finAccBills.getAccountDc())) {
|
|
|
if (ObjectUtils.isNull(item.getApplySrcId())) {
|
|
if (ObjectUtils.isNull(item.getApplySrcId())) {
|
|
|
- if (item.getCurrentAmount().abs().compareTo(finAccBills.getAmountCrLoc().abs()
|
|
|
|
|
|
|
+ if (item.getCurrentAmount().abs().compareTo(finAccBills.getAmountCr().abs()
|
|
|
.subtract((finAccBills.getAppliedInvoiceAmount().abs().subtract(finAccBills.getAppliedInvoiceAmountStl().abs()))).subtract(finAccBills.getUninvoicedAmount().abs())) > 0) {
|
|
.subtract((finAccBills.getAppliedInvoiceAmount().abs().subtract(finAccBills.getAppliedInvoiceAmountStl().abs()))).subtract(finAccBills.getUninvoicedAmount().abs())) > 0) {
|
|
|
throw new RuntimeException("本次开票金额大于未开票金额");
|
|
throw new RuntimeException("本次开票金额大于未开票金额");
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
if (ObjectUtils.isNull(item.getApplySrcId())) {
|
|
if (ObjectUtils.isNull(item.getApplySrcId())) {
|
|
|
- if (item.getCurrentAmount().abs().compareTo(finAccBills.getAmountDrLoc().abs()
|
|
|
|
|
|
|
+ if (item.getCurrentAmount().abs().compareTo(finAccBills.getAmountDr().abs()
|
|
|
.subtract((finAccBills.getAppliedInvoiceAmount().abs().subtract(finAccBills.getAppliedInvoiceAmountStl().abs()))).subtract(finAccBills.getUninvoicedAmount().abs())) > 0) {
|
|
.subtract((finAccBills.getAppliedInvoiceAmount().abs().subtract(finAccBills.getAppliedInvoiceAmountStl().abs()))).subtract(finAccBills.getUninvoicedAmount().abs())) > 0) {
|
|
|
throw new RuntimeException("本次开票金额大于未开票金额");
|
|
throw new RuntimeException("本次开票金额大于未开票金额");
|
|
|
}
|
|
}
|
|
@@ -1448,14 +1448,14 @@ public class FinInvoicesServiceImpl extends ServiceImpl<FinInvoicesMapper, FinIn
|
|
|
} else {
|
|
} else {
|
|
|
if ("C".equals(finAccBills.getAccountDc())) {
|
|
if ("C".equals(finAccBills.getAccountDc())) {
|
|
|
if (ObjectUtils.isNull(item.getApplySrcId())) {
|
|
if (ObjectUtils.isNull(item.getApplySrcId())) {
|
|
|
- if (item.getCurrentAmount().abs().compareTo(finAccBills.getAmountCrLoc().abs()
|
|
|
|
|
|
|
+ if (item.getCurrentAmount().abs().compareTo(finAccBills.getAmountCr().abs()
|
|
|
.subtract((finAccBills.getAppliedInvoiceAmountUsd().abs().subtract(finAccBills.getAppliedInvoiceAmountStlUsd().abs()))).subtract(finAccBills.getUninvoicedAmountUsd().abs())) > 0) {
|
|
.subtract((finAccBills.getAppliedInvoiceAmountUsd().abs().subtract(finAccBills.getAppliedInvoiceAmountStlUsd().abs()))).subtract(finAccBills.getUninvoicedAmountUsd().abs())) > 0) {
|
|
|
throw new RuntimeException("本次开票金额大于未开票金额");
|
|
throw new RuntimeException("本次开票金额大于未开票金额");
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
if (ObjectUtils.isNull(item.getApplySrcId())) {
|
|
if (ObjectUtils.isNull(item.getApplySrcId())) {
|
|
|
- if (item.getCurrentAmount().abs().compareTo(finAccBills.getAmountDrLoc().abs()
|
|
|
|
|
|
|
+ if (item.getCurrentAmount().abs().compareTo(finAccBills.getAmountDr().abs()
|
|
|
.subtract((finAccBills.getAppliedInvoiceAmountUsd().abs().subtract(finAccBills.getAppliedInvoiceAmountStlUsd().abs()))).subtract(finAccBills.getUninvoicedAmountUsd().abs())) > 0) {
|
|
.subtract((finAccBills.getAppliedInvoiceAmountUsd().abs().subtract(finAccBills.getAppliedInvoiceAmountStlUsd().abs()))).subtract(finAccBills.getUninvoicedAmountUsd().abs())) > 0) {
|
|
|
throw new RuntimeException("本次开票金额大于未开票金额");
|
|
throw new RuntimeException("本次开票金额大于未开票金额");
|
|
|
}
|
|
}
|