From 1d2a196011eed4f9e4fbe24dfe48b58118dddd80 Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Mon, 28 Jan 2019 18:15:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=A1=E6=89=A3=E5=9B=9E=E6=AC=BE=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tenwa/Lease/voucher/Contract_NC_Log.jsp | 37 ++++++ .../Tenwa/Lease/voucher/Customer_NC_Log.jsp | 37 ++++++ .../Lease/voucher/Distributor_NC_Log.jsp | 37 ++++++ .../Lease/voucher/NCXML_TOTAL_RECORDS.jsp | 37 ++++++ .../Tenwa/Lease/voucher/Voucher_NC_Log.jsp | 37 ++++++ config/vouchers.properties | 114 ++++++++++++++++++ .../app/quartzmession/Checkfordeduction.java | 6 +- 7 files changed, 302 insertions(+), 3 deletions(-) create mode 100644 WebContent/Tenwa/Lease/voucher/Contract_NC_Log.jsp create mode 100644 WebContent/Tenwa/Lease/voucher/Customer_NC_Log.jsp create mode 100644 WebContent/Tenwa/Lease/voucher/Distributor_NC_Log.jsp create mode 100644 WebContent/Tenwa/Lease/voucher/NCXML_TOTAL_RECORDS.jsp create mode 100644 WebContent/Tenwa/Lease/voucher/Voucher_NC_Log.jsp create mode 100644 config/vouchers.properties diff --git a/WebContent/Tenwa/Lease/voucher/Contract_NC_Log.jsp b/WebContent/Tenwa/Lease/voucher/Contract_NC_Log.jsp new file mode 100644 index 000000000..e7a8bcdc1 --- /dev/null +++ b/WebContent/Tenwa/Lease/voucher/Contract_NC_Log.jsp @@ -0,0 +1,37 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% + /* + Author: undefined 2019-01-07 + Content: + History Log: + */ + ASObjectModel doTemp = new ASObjectModel("NCXML_DETAIL_RECORDS_CONTRACT"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; //--设置为Grid风格-- + dwTemp.ReadOnly = "1"; //只读模式 + dwTemp.setPageSize(10); + dwTemp.genHTMLObjectWindow(""); + + //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 + String sButtons[][] = { + //{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, + //{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""}, + //{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""}, + }; +%><%@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/Tenwa/Lease/voucher/Customer_NC_Log.jsp b/WebContent/Tenwa/Lease/voucher/Customer_NC_Log.jsp new file mode 100644 index 000000000..96cd5d121 --- /dev/null +++ b/WebContent/Tenwa/Lease/voucher/Customer_NC_Log.jsp @@ -0,0 +1,37 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% + /* + Author: undefined 2019-01-07 + Content: + History Log: + */ + ASObjectModel doTemp = new ASObjectModel("NCXML_DETAIL_RECORDS_CUSTOMER"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; //--设置为Grid风格-- + dwTemp.ReadOnly = "1"; //只读模式 + dwTemp.setPageSize(10); + dwTemp.genHTMLObjectWindow(""); + + //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 + String sButtons[][] = { + //{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, + //{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""}, + //{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""}, + }; +%><%@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/Tenwa/Lease/voucher/Distributor_NC_Log.jsp b/WebContent/Tenwa/Lease/voucher/Distributor_NC_Log.jsp new file mode 100644 index 000000000..966e45f0b --- /dev/null +++ b/WebContent/Tenwa/Lease/voucher/Distributor_NC_Log.jsp @@ -0,0 +1,37 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% + /* + Author: undefined 2019-01-07 + Content: + History Log: + */ + ASObjectModel doTemp = new ASObjectModel("NCXML_DETAIL_RECORDS_DISTRIBUTOR"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; //--设置为Grid风格-- + dwTemp.ReadOnly = "1"; //只读模式 + dwTemp.setPageSize(10); + dwTemp.genHTMLObjectWindow(""); + + //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 + String sButtons[][] = { + //{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, + //{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""}, + //{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""}, + }; +%><%@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/Tenwa/Lease/voucher/NCXML_TOTAL_RECORDS.jsp b/WebContent/Tenwa/Lease/voucher/NCXML_TOTAL_RECORDS.jsp new file mode 100644 index 000000000..bbd29c260 --- /dev/null +++ b/WebContent/Tenwa/Lease/voucher/NCXML_TOTAL_RECORDS.jsp @@ -0,0 +1,37 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% + /* + Author: undefined 2019-01-14 + Content: + History Log: + */ + ASObjectModel doTemp = new ASObjectModel("NCXML_TOTAL_RECORDS"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; //--设置为Grid风格-- + dwTemp.ReadOnly = "1"; //只读模式 + dwTemp.setPageSize(10); + dwTemp.genHTMLObjectWindow(""); + + //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 + String sButtons[][] = { + //{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, + //{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""}, + //{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""}, + }; +%><%@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/Tenwa/Lease/voucher/Voucher_NC_Log.jsp b/WebContent/Tenwa/Lease/voucher/Voucher_NC_Log.jsp new file mode 100644 index 000000000..386dd4a90 --- /dev/null +++ b/WebContent/Tenwa/Lease/voucher/Voucher_NC_Log.jsp @@ -0,0 +1,37 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% + /* + Author: undefined 2019-01-07 + Content: + History Log: + */ + ASObjectModel doTemp = new ASObjectModel("NCXML_DETAIL_RECORDS_VOUCHER"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; //--设置为Grid风格-- + dwTemp.ReadOnly = "1"; //只读模式 + dwTemp.setPageSize(10); + dwTemp.genHTMLObjectWindow(""); + + //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 + String sButtons[][] = { + //{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, + //{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""}, + //{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""}, + }; +%><%@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/config/vouchers.properties b/config/vouchers.properties new file mode 100644 index 000000000..93c47a79e --- /dev/null +++ b/config/vouchers.properties @@ -0,0 +1,114 @@ +#鍑瘉淇℃伅 + +#璐﹀ +voucher_account=bq1217 +#鍗曟嵁绫诲瀷 +voucher_billtype=vouchergl +#闆嗗洟缂栫爜 +voucher_groupcode=06 +#绯荤粺鍙傛暟 +voucher_isexchange=Y +#鎺ユ敹鏂 +voucher_receiver=807001002001 +#澶栫郴缁熺紪鐮 +voucher_sender=GL +#绯荤粺鍙傛暟 +voucher_replace=Y +#鍑瘉绫诲埆 +voucher_pk_vouchertype=01 +#鏉ユ簮绯荤粺 +voucher_pk_system=GL +#鍑瘉绫诲瀷鍊 +voucher_voucherkind=0 +#鏍哥畻璐︾翱 +voucher_pk_accountingbook=807001002001-0001 +#鍒跺崟浜 +voucher_pk_prepared=807caoyuli +#鎵灞炵粍缁 +voucher_pk_org=807001002001 +#鎵灞為泦鍥 +voucher_pk_group=06 +#甯佺 +voucher_pk_currtype=CNY + + + +#瀹㈡埛淇℃伅 +#璐﹀ +customer_account=bq1217 +#鍗曟嵁绫诲瀷 +customer_billtype=customer +#闆嗗洟缂栫爜 +customer_groupcode=06 +#绯荤粺鍙傛暟 +customer_isexchange=Y +#鎺ユ敹鏂 +customer_receiver=807001002001 +#澶栫郴缁熺紪鐮 +customer_sender=kh01 +#绯荤粺鍙傛暟 +customer_replace=Y +#鎵灞為泦鍥 +customer_pk_group=06 +#鎵灞炵粍缁 +customer_pk_org=06 +#瀹㈡埛鍩烘湰鍒嗙被 +customer_pk_custclass=0202 +#鍥藉鍦板尯 +customer_pk_country=CN +#鏃跺尯 +customer_pk_timezone=P0800 +#鏁版嵁鏍煎紡 +customer_pk_format=ZH-CN + + + +#缁忛攢鍟嗕俊鎭 +#璐﹀ +distributor_account=bq1217 +#鍗曟嵁绫诲瀷 +distributor_billtype=supplier +#闆嗗洟缂栫爜 +distributor_groupcode=06 +#绯荤粺鍙傛暟 +distributor_isexchange=Y +#鎺ユ敹鏂 +distributor_receiver=Y +#澶栫郴缁熺紪鐮 +distributor_sender=gys01 +#绯荤粺鍙傛暟 +distributor_replace=Y +#鎵灞為泦鍥 +distributor_pk_group=06 +#鎵灞炵粍缁 +distributor_pk_org=06 +#渚涘簲鍟嗗熀鏈垎绫 +distributor_pk_supplierclass=0202 +#鍥藉鍦板尯 +distributor_pk_country=CN +#鏃跺尯 +distributor_pk_timezone=P0800 +#璐︽暟鎹牸寮 +distributor_pk_format=ZH-CN + + + +#鍚堝悓淇℃伅 +#璐﹀ +contract_account=bq1217 +#鍗曟嵁绫诲瀷 +contract_billtype=defdoc +#闆嗗洟缂栫爜 +contract_groupcode=06 +#绯荤粺鍙傛暟 +contract_isexchange=Y +#鎺ユ敹鏂 +contract_receiver=06 +#澶栫郴缁熺紪鐮 +contract_sender=ht +#绯荤粺鍙傛暟 +contract_replace=Y +#鎵灞為泦鍥 +contract_pk_group=06 +#鎵灞炵粍缁 +contract_pk_org=06 \ No newline at end of file diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/Checkfordeduction.java b/src_tenwa/com/tenwa/lease/app/quartzmession/Checkfordeduction.java index 50c34df3a..d3d313262 100644 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/Checkfordeduction.java +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/Checkfordeduction.java @@ -113,10 +113,10 @@ public class Checkfordeduction { // 未逾期及逾期未过月 String[] ids = id.split("@"); for (String str : ids) { - String sql = "INSERT INTO lv_rent_income (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ()),cif.customer_num,cif.customername,lci.id,lci.contract_number,lrp.ID,lri.HIRE_DATE,lri.RENT,lri.CORPUS,lri.INTEREST,0.00,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER,lri.EBANK_NUMBER,lri.CARDDEDUCT_ID,lri.ACCOUNTING_DATE FROM lc_rent_income lri LEFT JOIN lb_contract_info lci ON lci.id = lri.contract_id LEFT JOIN lc_rent_plan lrp ON lrp.contract_id=lci.id AND lrp.plan_list=lri.plan_list LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id WHERE lrp.id in('"+ str + "') AND DATE_FORMAT(NOW(),'%Y-%m') = DATE_FORMAT(lrp.plan_date,'%Y-%m'))"; + String sql = "INSERT INTO lv_rent_income (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ()),cif.customer_num,cif.customername,lci.id,lci.contract_number,lrp.ID,lri.HIRE_DATE,lri.RENT,lri.CORPUS,lri.INTEREST,0.00,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER,lri.EBANK_NUMBER,lri.CARDDEDUCT_ID,lri.ACCOUNTING_DATE FROM lc_rent_income lri LEFT JOIN lb_contract_info lci ON lci.id = lri.contract_id LEFT JOIN lc_rent_plan lrp ON lrp.contract_id=lci.id AND lrp.plan_list=lri.plan_list LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id WHERE lrp.id in('"+ str + "') AND lrp.id NOT IN(SELECT INCOME_ID FROM lv_rent_income) AND DATE_FORMAT(NOW(),'%Y-%m') = DATE_FORMAT(lrp.plan_date,'%Y-%m'))"; // 逾期过月 - String sq1 = "INSERT INTO lv_rent_income2 (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ()),cif.customer_num,cif.customername,lci.id,lci.contract_number,lrp.ID,lri.HIRE_DATE,lri.RENT,lri.CORPUS,lri.INTEREST,0.00,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER,lri.EBANK_NUMBER,lri.CARDDEDUCT_ID,lri.ACCOUNTING_DATE FROM lc_rent_income lri LEFT JOIN lb_contract_info lci ON lci.id = lri.contract_id LEFT JOIN lc_rent_plan lrp ON lrp.contract_id=lci.id AND lrp.plan_list=lri.plan_list LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id WHERE lrp.id in('"+ str + "') AND DATE_FORMAT(NOW(),'%Y-%m')> DATE_FORMAT(lrp.plan_date,'%Y-%m'))"; - String sql1 = "INSERT INTO lv_penalty_income (SELECT REPLACE(UUID(),'-',''),CONCAT('k',getSerialNumber ()),cif.customer_num,cif.customername,lci.id,lci.contract_number,lrp.ID,lri.HIRE_DATE ,0.00,0.00,0.00,lri.PENALTY,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER,lri.EBANK_NUMBER,lri.CARDDEDUCT_ID,lri.ACCOUNTING_DATE FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lri.contract_id=lrp.contract_id AND lrp.plan_list=lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id=lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id=lci.id LEFT JOIN customer_info cif ON cif.customerid=lul.customer_id WHERE lrp.id in('"+ str + "') )"; + String sq1 = "INSERT INTO lv_rent_income2 (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ()),cif.customer_num,cif.customername,lci.id,lci.contract_number,lrp.ID,lri.HIRE_DATE,lri.RENT,lri.CORPUS,lri.INTEREST,0.00,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER,lri.EBANK_NUMBER,lri.CARDDEDUCT_ID,lri.ACCOUNTING_DATE FROM lc_rent_income lri LEFT JOIN lb_contract_info lci ON lci.id = lri.contract_id LEFT JOIN lc_rent_plan lrp ON lrp.contract_id=lci.id AND lrp.plan_list=lri.plan_list LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id WHERE lrp.id in('"+ str + "') AND lrp.id NOT IN(SELECT INCOME_ID FROM lv_rent_income2) AND DATE_FORMAT(NOW(),'%Y-%m')> DATE_FORMAT(lrp.plan_date,'%Y-%m'))"; + String sql1 = "INSERT INTO lv_penalty_income (SELECT REPLACE(UUID(),'-',''),CONCAT('k',getSerialNumber ()),cif.customer_num,cif.customername,lci.id,lci.contract_number,lrp.ID,lri.HIRE_DATE ,0.00,0.00,0.00,lri.PENALTY,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER,lri.EBANK_NUMBER,lri.CARDDEDUCT_ID,lri.ACCOUNTING_DATE FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lri.contract_id=lrp.contract_id AND lrp.plan_list=lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id=lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id=lci.id LEFT JOIN customer_info cif ON cif.customerid=lul.customer_id WHERE lrp.id in('"+ str + "') AND lrp.id NOT IN(SELECT INCOME_ID FROM lv_penalty_income) )"; // String sql2 = "INSERT INTO lv_discount_income (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ()),cif.customer_num,cif.customername,lci.id,lci.contract_number,ld.ID,DATE_FORMAT(ld.inputtime, '%Y/%m/%d'),ld.discount_money,0.00,0.00,0.00,oac.acc_bank,oac.acc_name,oac.acc_number FROM lb_discount ld LEFT JOIN lb_contract_info lci ON lci.contract_no = ld.contract_no LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT acc_bank,acc_name,acc_number FROM OWN_ACCOUNT WHERE account_type = 'in_account' AND state_ = '0010' LIMIT 0, 1) oac ON 1 = 1 WHERE ld.id NOT IN (SELECT income_id FROM lv_discount_income)) "; SqlObject as1 = new SqlObject(sq1); SqlObject asql = new SqlObject(sql);