diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java index 89e6a0cf1..fc0fe9732 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java @@ -486,10 +486,13 @@ public class ReconciliationImpl extends ServiceImpl0){ - BigDecimal tax_de=reconciliationAccount.getAmount().multiply(reconciliationAccount.getRate().divide(BigDecimal.valueOf(100))).setScale(2,BigDecimal.ROUND_HALF_UP); - BigDecimal notax_de=reconciliationAccount.getAmount().subtract(tax_de); + BigDecimal rate=reconciliationAccount.getRate().divide(BigDecimal.valueOf(100)); + BigDecimal taxRate=BigDecimal.ONE.add(rate); + // BigDecimal tax_de=tmsOrder.getDeliveryFreight().multiply(tmsOrder.getTaxRate().divide(BigDecimal.valueOf(100))).setScale(2,BigDecimal.ROUND_HALF_UP); + BigDecimal notax_de=reconciliationAccount.getAmount().divide(taxRate,2,BigDecimal.ROUND_HALF_UP); + BigDecimal tax_de=notax_de.multiply(reconciliationAccount.getRate().divide(BigDecimal.valueOf(100))).setScale(2,BigDecimal.ROUND_HALF_UP); + item.setNotax_de(String.valueOf(notax_de)); - item.setLocal_tax_de(String.valueOf(notax_de)); + item.setLocal_tax_de(String.valueOf(tax_de)); item.setTax_de(String.valueOf(tax_de)); }else{ BigDecimal tax_de=BigDecimal.ZERO;