nc判断科目金额是否大于0
This commit is contained in:
+34
-33
@@ -650,40 +650,41 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
|||||||
.eq(ReconciliationAccount::getDelFlag,1));
|
.eq(ReconciliationAccount::getDelFlag,1));
|
||||||
if (ObjectUtil.isNotNull(reconciliationAccountList)&&reconciliationAccountList.size()>0){
|
if (ObjectUtil.isNotNull(reconciliationAccountList)&&reconciliationAccountList.size()>0){
|
||||||
for (ReconciliationAccount reconciliationAccount:reconciliationAccountList){
|
for (ReconciliationAccount reconciliationAccount:reconciliationAccountList){
|
||||||
Ysitem item=new Ysitem();
|
if(reconciliationAccount.getAmount().compareTo(BigDecimal.ZERO)>0){
|
||||||
item.setSo_deptid("NG0408");
|
Ysitem item=new Ysitem();
|
||||||
item.setPk_deptid("NG0408");
|
item.setSo_deptid("NG0408");
|
||||||
item.setPk_psndoc(salesmanCodeNc);
|
item.setPk_deptid("NG0408");
|
||||||
item.setCustomer(customerCodeNc);
|
item.setPk_psndoc(salesmanCodeNc);
|
||||||
item.setObjtype("0");
|
item.setCustomer(customerCodeNc);
|
||||||
item.setDirection("1");
|
item.setObjtype("0");
|
||||||
item.setScomment("业务部:应收"+appointShipper+reconciliationAccount.getSubjectName()+invoiceNumber);
|
item.setDirection("1");
|
||||||
// item.setPk_currtype("CNY");
|
item.setScomment("业务部:应收"+appointShipper+reconciliationAccount.getSubjectName()+invoiceNumber);
|
||||||
item.setPk_currtype(settlementCurrency);
|
// item.setPk_currtype("CNY");
|
||||||
item.setPurchaseorder("");
|
item.setPk_currtype(settlementCurrency);
|
||||||
item.setTaxrate("0");
|
item.setPurchaseorder("");
|
||||||
item.setQuantity_de("0");
|
item.setTaxrate("0");
|
||||||
item.setMoney_de(String.valueOf(reconciliationAccount.getAmount()));
|
item.setQuantity_de("0");
|
||||||
item.setMoney_bal(String.valueOf(reconciliationAccount.getAmount()));
|
item.setMoney_de(String.valueOf(reconciliationAccount.getAmount()));
|
||||||
if(reconciliationAccount.getRate().compareTo(BigDecimal.ZERO)>0){
|
item.setMoney_bal(String.valueOf(reconciliationAccount.getAmount()));
|
||||||
BigDecimal tax_de=reconciliationAccount.getAmount().multiply(reconciliationAccount.getRate().divide(BigDecimal.valueOf(100))).setScale(2,BigDecimal.ROUND_HALF_UP);
|
if(reconciliationAccount.getRate().compareTo(BigDecimal.ZERO)>0){
|
||||||
BigDecimal notax_de=reconciliationAccount.getAmount().subtract(tax_de);
|
BigDecimal tax_de=reconciliationAccount.getAmount().multiply(reconciliationAccount.getRate().divide(BigDecimal.valueOf(100))).setScale(2,BigDecimal.ROUND_HALF_UP);
|
||||||
item.setNotax_de(String.valueOf(notax_de));
|
BigDecimal notax_de=reconciliationAccount.getAmount().subtract(tax_de);
|
||||||
item.setLocal_tax_de(String.valueOf(notax_de));
|
item.setNotax_de(String.valueOf(notax_de));
|
||||||
item.setTax_de(String.valueOf(tax_de));
|
item.setLocal_tax_de(String.valueOf(notax_de));
|
||||||
}else{
|
item.setTax_de(String.valueOf(tax_de));
|
||||||
BigDecimal tax_de=BigDecimal.ZERO;
|
}else{
|
||||||
BigDecimal notax_de=reconciliationAccount.getAmount().subtract(tax_de);
|
BigDecimal tax_de=BigDecimal.ZERO;
|
||||||
item.setNotax_de(String.valueOf(notax_de));
|
BigDecimal notax_de=reconciliationAccount.getAmount().subtract(tax_de);
|
||||||
item.setLocal_tax_de(String.valueOf(notax_de));
|
item.setNotax_de(String.valueOf(notax_de));
|
||||||
item.setTax_de(String.valueOf(tax_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{
|
}else{
|
||||||
throw new ServiceException("未查询到账单的费用科目信息, 请核对");
|
throw new ServiceException("未查询到账单的费用科目信息, 请核对");
|
||||||
|
|||||||
Reference in New Issue
Block a user