From dfd7b341726236cc9578962fbf8b6a164e30afef Mon Sep 17 00:00:00 2001 From: hjx <577364224@qq.com> Date: Thu, 15 Jan 2026 07:38:34 +0800 Subject: [PATCH] =?UTF-8?q?nc=E5=88=A4=E6=96=AD=E7=A7=91=E7=9B=AE=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E6=98=AF=E5=90=A6=E5=A4=A7=E4=BA=8E0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/ReconciliationImpl.java | 67 ++++++++++--------- 1 file changed, 34 insertions(+), 33 deletions(-) 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 7939586e9..cb24131bb 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 @@ -650,40 +650,41 @@ public class ReconciliationImpl extends ServiceImpl0){ for (ReconciliationAccount reconciliationAccount:reconciliationAccountList){ - Ysitem item=new Ysitem(); - item.setSo_deptid("NG0408"); - item.setPk_deptid("NG0408"); - item.setPk_psndoc(salesmanCodeNc); - item.setCustomer(customerCodeNc); - item.setObjtype("0"); - item.setDirection("1"); - item.setScomment("业务部：应收"+appointShipper+reconciliationAccount.getSubjectName()+invoiceNumber); - // item.setPk_currtype("CNY"); - item.setPk_currtype(settlementCurrency); - item.setPurchaseorder(""); - item.setTaxrate("0"); - item.setQuantity_de("0"); - item.setMoney_de(String.valueOf(reconciliationAccount.getAmount())); - item.setMoney_bal(String.valueOf(reconciliationAccount.getAmount())); - if(reconciliationAccount.getRate().compareTo(BigDecimal.ZERO)>0){ - 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); - item.setNotax_de(String.valueOf(notax_de)); - item.setLocal_tax_de(String.valueOf(notax_de)); - item.setTax_de(String.valueOf(tax_de)); - }else{ - BigDecimal tax_de=BigDecimal.ZERO; - BigDecimal notax_de=reconciliationAccount.getAmount().subtract(tax_de); - item.setNotax_de(String.valueOf(notax_de)); - item.setLocal_tax_de(String.valueOf(notax_de)); - item.setTax_de(String.valueOf(tax_de)); + if(reconciliationAccount.getAmount().compareTo(BigDecimal.ZERO)>0){ + Ysitem item=new Ysitem(); + item.setSo_deptid("NG0408"); + item.setPk_deptid("NG0408"); + item.setPk_psndoc(salesmanCodeNc); + item.setCustomer(customerCodeNc); + item.setObjtype("0"); + item.setDirection("1"); + item.setScomment("业务部：应收"+appointShipper+reconciliationAccount.getSubjectName()+invoiceNumber); + // item.setPk_currtype("CNY"); + item.setPk_currtype(settlementCurrency); + item.setPurchaseorder(""); + item.setTaxrate("0"); + item.setQuantity_de("0"); + item.setMoney_de(String.valueOf(reconciliationAccount.getAmount())); + item.setMoney_bal(String.valueOf(reconciliationAccount.getAmount())); + if(reconciliationAccount.getRate().compareTo(BigDecimal.ZERO)>0){ + 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); + item.setNotax_de(String.valueOf(notax_de)); + item.setLocal_tax_de(String.valueOf(notax_de)); + item.setTax_de(String.valueOf(tax_de)); + }else{ + BigDecimal tax_de=BigDecimal.ZERO; + BigDecimal notax_de=reconciliationAccount.getAmount().subtract(tax_de); + item.setNotax_de(String.valueOf(notax_de)); + item.setLocal_tax_de(String.valueOf(notax_de)); + item.setTax_de(String.valueOf(tax_de)); + } + item.setPrice(String.valueOf(reconciliationAccount.getAmount())); + item.setTaxprice(String.valueOf(reconciliationAccount.getAmount())); + item.setDef75("T10"); + item.setInvoiceno(invoiceNumber); + ysitemList.add(item); } - - item.setPrice(String.valueOf(reconciliationAccount.getAmount())); - item.setTaxprice(String.valueOf(reconciliationAccount.getAmount())); - item.setDef75("T10"); - item.setInvoiceno(invoiceNumber); - ysitemList.add(item); } }else{ throw new ServiceException("未查询到账单的费用科目信息， 请核对");