diff --git a/WebContent/Tenwa/Customer/Lessee/Comm/Invoice/CustomerInvoice.jsp b/WebContent/Tenwa/Customer/Lessee/Comm/Invoice/CustomerInvoice.jsp index f981c5ec9..60974c429 100644 --- a/WebContent/Tenwa/Customer/Lessee/Comm/Invoice/CustomerInvoice.jsp +++ b/WebContent/Tenwa/Customer/Lessee/Comm/Invoice/CustomerInvoice.jsp @@ -94,6 +94,7 @@ function validityCheck(){ //验证纳税人识别号 var tax_no = getItemValue(0,getRow(),"tax_no");//纳税人识别号 + var certid=getItemValue(0,getRow() , "certid");//统一社会信用代码 var id = getItemValue(0,getRow(),"id"); var tax_account = getItemValue(0,getRow(),"tax_account");//开户账号 var tax_status = getItemValue(0,getRow(),"tax_status");//开票状态 @@ -106,7 +107,7 @@ if(typeof(tax_no) != undefined && tax_no != ""){ var sReturnInfo = RunJavaMethodTrans("com.tenwa.customer.controller.invoice.CustomerInvoiceController","checkTax_no","tax_no="+tax_no+",customer_id="+"<%=customer_id%>"); if(sReturnInfo != "true"){ - alert("统一社会信用代码已存在"); + alert("纳税人识别号已存在"); return false; } } @@ -114,7 +115,7 @@ if(typeof(tax_no) != undefined && tax_no != "" ){ var sReturnInfo = RunJavaMethodTrans("com.tenwa.customer.controller.invoice.CustomerInvoiceController","editCheckTax_no","tax_no="+tax_no+",id="+id+",customer_id="+"<%=customer_id%>"); if(sReturnInfo != "true"){ - alert("统一社会信用代码已存在"); + alert("纳税人识别号已存在"); return false; } } diff --git a/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/ActualPaymentTempList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/ActualPaymentTempList.jsp index f9db7c3d9..00a1ea762 100644 --- a/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/ActualPaymentTempList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/ActualPaymentTempList.jsp @@ -64,7 +64,7 @@ sumethod6 += parseFloat(getItemValue(0,i,'FACT_MONEY')); } } - $('.list_gridCell_standard.list_div_pagecount').text(ormatKNumber(sumethod6,2)); + $('.list_gridCell_standard.list_div_pagecount').text(FormatKNumber(sumethod6,2)); }) function setColRequired(){ diff --git a/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp b/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp index 220b2dc7c..edceb0937 100644 --- a/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp @@ -47,36 +47,6 @@ } %><%@include file="/Frame/resources/include/ui/include_list.jspf"%> <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/fileTemplate/鎶ヤ环鏂规.xlsx b/WebContent/fileTemplate/鎶ヤ环鏂规.xlsx new file mode 100644 index 000000000..824ed5f1f Binary files /dev/null and b/WebContent/fileTemplate/鎶ヤ环鏂规.xlsx differ diff --git a/src_tenwa/com/tenwa/customer/handler/invoice/CustomerInvoiceHandler.java b/src_tenwa/com/tenwa/customer/handler/invoice/CustomerInvoiceHandler.java index 746734d57..42e47cba8 100644 --- a/src_tenwa/com/tenwa/customer/handler/invoice/CustomerInvoiceHandler.java +++ b/src_tenwa/com/tenwa/customer/handler/invoice/CustomerInvoiceHandler.java @@ -20,7 +20,7 @@ public class CustomerInvoiceHandler extends CommonHandler{ if(CUSTOMER_INFO != null) { bo.setAttributeValue("tax_object", CUSTOMER_INFO.getAttribute("customername").getString()); - bo.setAttributeValue("tax_no", CUSTOMER_INFO.getAttribute("customerid").getString()); + bo.setAttributeValue("tax_no", CUSTOMER_INFO.getAttribute("certid").getString()); } //初始化customer_id diff --git a/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java b/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java index 5f77e3f6d..b6137b558 100644 --- a/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java +++ b/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java @@ -423,4 +423,13 @@ public class FundIncomeMethod { } return "SUCCESS"; } + + public static String setCerificationMoney(String corpus,String interest,String penalty){ + BigDecimal c = new BigDecimal(corpus); + BigDecimal i = new BigDecimal(interest); + BigDecimal p = new BigDecimal(penalty); + c=c.add(i).add(p); +// double CerificationMoney= Double.valueOf(corpus)+Double.valueOf(interest)+Double.valueOf(penalty); + return c.doubleValue()+""; + } }