Просмотр исходного кода

销项发票添加明细数据bug修改

纪新园 2 месяцев назад
Родитель
Сommit
426880d31e

+ 4 - 4
blade-service/blade-los/src/main/java/org/springblade/los/finance/invoices/service/impl/FinInvoicesServiceImpl.java

@@ -1428,14 +1428,14 @@ public class FinInvoicesServiceImpl extends ServiceImpl<FinInvoicesMapper, FinIn
 					if (exrateType.equals(item.getCurCode())) {
 						if ("C".equals(finAccBills.getAccountDc())) {
 							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) {
 									throw new RuntimeException("本次开票金额大于未开票金额");
 								}
 							}
 						} else {
 							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) {
 									throw new RuntimeException("本次开票金额大于未开票金额");
 								}
@@ -1448,14 +1448,14 @@ public class FinInvoicesServiceImpl extends ServiceImpl<FinInvoicesMapper, FinIn
 					} else {
 						if ("C".equals(finAccBills.getAccountDc())) {
 							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) {
 									throw new RuntimeException("本次开票金额大于未开票金额");
 								}
 							}
 						} else {
 							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) {
 									throw new RuntimeException("本次开票金额大于未开票金额");
 								}