From bfedbd7844424914bf00ff66261f63ecaf0c4b1b Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Mon, 4 Mar 2019 11:39:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=AD=E8=AF=81=E4=BF=A1=E6=81=AF,=20?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=B0=E5=A2=9E=E8=B4=B4=E6=81=AF=E5=8F=8D?= =?UTF-8?q?=E5=86=B2=E5=87=AD=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tenwa/apzl/discount/LbDiscountList.jsp | 6 ++ config/vouchers.properties | 18 +++- ...CreateVoucherForInterestSubsidyImport.java | 94 ++++++++++++++++++- .../serviceImp/CreateVoucherServiceImpl.java | 2 +- 4 files changed, 116 insertions(+), 4 deletions(-) diff --git a/WebContent/com/tenwa/apzl/discount/LbDiscountList.jsp b/WebContent/com/tenwa/apzl/discount/LbDiscountList.jsp index 82aa6c59a..059a61229 100644 --- a/WebContent/com/tenwa/apzl/discount/LbDiscountList.jsp +++ b/WebContent/com/tenwa/apzl/discount/LbDiscountList.jsp @@ -61,6 +61,7 @@ if(!frames["downloadTemplate"]) $("").appendTo("body"); window.open(sWebRootPath+"/servlet/view/docDownloadServlet?CompClientID=<%=sCompClientID%>&sqlString=save@"+id, "downloadTemplate"); } + function newRecord(){ var sUrl = ""; AsControl.OpenView(sUrl,'','_self',''); @@ -75,7 +76,12 @@ AsControl.OpenView(sUrl,'SerialNo=' +sPara ,'_self',''); } function do_delete(){ + var sPara = getItemValue(0,getRow(0),'ID'); if(confirm("是否删除？")){ + // 删除生成反冲贴息凭证 + if(typeof(sPara)!="undefined" || sPara.length>0 ){ + var res = RunJavaMethodTrans("com.tenwa.voucher.CreateVoucherProcess.CreateVoucherForInterestSubsidyImport", "createInterSubsidyRecoilVoucher", "id="+sPara); + } as_delete(0); } } diff --git a/config/vouchers.properties b/config/vouchers.properties index 93c47a79e..96b4b8735 100644 --- a/config/vouchers.properties +++ b/config/vouchers.properties @@ -1,5 +1,4 @@ #鍑瘉淇℃伅 - #璐﹀ voucher_account=bq1217 #鍗曟嵁绫诲瀷 @@ -111,4 +110,19 @@ contract_replace=Y #鎵灞為泦鍥 contract_pk_group=06 #鎵灞炵粍缁 -contract_pk_org=06 \ No newline at end of file +contract_pk_org=06 + + + +#鐢ㄥ弸杩炴帴閰嶇疆-绀轰緥:http://172.16.0.88:9990/service/XChangeServlet?account=BQ1217&groupcode=06 +#IP鍦板潃鍙婄鍙 +NC_URL=http://172.16.0.88:9990 +account=BQ1217 +groupcode=06 + +#浼犺緭xml鏂囦欢瀛樻斁璺緞 +LOCALHOST_URL=//data//files//apzl_leasing//tmp//XZW// +#鍥炴墽淇℃伅瀛樻斁璺緞 +RECEIVE_URL=//data//files//apzl_leasing//tmp//WEN// + + diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherForInterestSubsidyImport.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherForInterestSubsidyImport.java index bc76fda1b..fe05570b8 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherForInterestSubsidyImport.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherForInterestSubsidyImport.java @@ -14,6 +14,19 @@ import com.tenwa.comm.util.jboutil.DataOperatorUtil; import com.tenwa.voucher.serviceImp.CreateVoucherServiceImpl; public class CreateVoucherForInterestSubsidyImport { + private String id; + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + + /** + * 导入贴息生成凭证 + * @param tx + * @throws Exception + */ public void createInterSubsidyVoucher(JBOTransaction tx) throws Exception { Transaction Sqlca = null; Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); @@ -37,7 +50,7 @@ public class CreateVoucherForInterestSubsidyImport { String voucherNo = "PZ2018072100000028"; Map param = new HashMap(); // 获取新导入的贴息数据 - String sql = "SELECT IFNULL(LD.DISCOUNT_MONEY, 0) AS MONEY,IFNULL(ROUND(LD.DISCOUNT_MONEY/getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL((LD.DISCOUNT_MONEY- ROUND(LD.DISCOUNT_MONEY/getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)),0) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,LD.BANK_SUBJECT AS SUBJECTCODE,LD.ACC_NUMBER FROM LB_DISCOUNT LD LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.FRAME_NUMBER=LD.FRAME_NUMBER LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LEC.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID=LCCT.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID 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 LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE IS_VOUCHER IS NULL "; + String sql = "SELECT IFNULL(LD.DISCOUNT_MONEY, 0) AS MONEY,IFNULL(ROUND(LD.DISCOUNT_MONEY/getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL((LD.DISCOUNT_MONEY- ROUND(LD.DISCOUNT_MONEY/getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)),0) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(LD.RECEIVED_DATE, '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,LD.BANK_SUBJECT AS SUBJECTCODE,LD.ACC_NUMBER FROM LB_DISCOUNT LD LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.FRAME_NUMBER=LD.FRAME_NUMBER LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LEC.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID=LCCT.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID 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 LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE IS_VOUCHER IS NULL "; // 查询sql, 将结果集封装到list集合中 List> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql, null); CreateVoucherServiceImpl vs = new CreateVoucherServiceImpl(); @@ -89,4 +102,83 @@ public class CreateVoucherForInterestSubsidyImport { } Sqlca.commit(); } + + public void createInterSubsidyRecoilVoucher(JBOTransaction tx) throws Exception { + Transaction Sqlca = null; + Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); + // 定义全局变量 + String MONEY=null; + String MONEYNOTAX=null; + String MONEYTAX=null; + String ACCOUNT_DATE=null; + String FACT_DATE=null; + String CONTRACT_ID=null; + String CONTRACT_NUMBER=null; + String PROJECT_NAME=null; + String leas_form=null; + String DISTRIBUTOR_ID=null; + String DISTRIBUTOR_NAME=null; + String CUSTID=null; + String CUSTNAME=null; + String SUBJECTCODE=null; + String ACC_NUMBER=null; + + String voucherNo = "PZ2018072100000041"; + Map param = new HashMap(); + // 获取新导入的贴息数据 + String sql = "SELECT -IFNULL(LD.DISCOUNT_MONEY, 0) AS MONEY,-IFNULL(ROUND(LD.DISCOUNT_MONEY / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2),0) AS MONEYNOTAX,-IFNULL((LD.DISCOUNT_MONEY - ROUND(LD.DISCOUNT_MONEY / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)),0) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,LD.BANK_SUBJECT AS SUBJECTCODE,LD.ACC_NUMBER FROM LB_DISCOUNT LD LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.FRAME_NUMBER = LD.FRAME_NUMBER LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LEC.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LCCT.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID 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 LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LD.ID=:ID"; + // 查询sql, 将结果集封装到list集合中 + Mapmap1 = new HashMap(); + map1.put("ID",id); + List> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql, map1); + + CreateVoucherServiceImpl vs = new CreateVoucherServiceImpl(); + String VOUCHER_TYPE = "1";// 凭证分类 金蝶 + String userid = "admin"; + for (int i=0;i map = new HashMap(); + map.put("PROJ_TYPE", "02"); + map.put("VOUCHER_NO", voucherNo); + BizObject vouch = DataOperatorUtil.getSingleJBO(LV_VOUCHER_CONFIG.CLASS_NAME, map, Sqlca); + if (vouch != null) { + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(),vouch.getAttribute("OWNED_COMPANY").getString(), "02", VOUCHER_TYPE, userid, param, Sqlca); + } + } + if(Sqlca !=null) { + Sqlca.commit(); + } + } } diff --git a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java index 79b1d7f3b..b9252be4f 100644 --- a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java +++ b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java @@ -253,7 +253,7 @@ public class CreateVoucherServiceImpl { /** * 贴息根据导入的科目编码获取科目信息, 其他的正常 */ - if("PZ2018072100000028".equals(VOUCHERNO)) { + if("PZ2018072100000028".equals(VOUCHERNO) || "PZ2018072100000041".equals(VOUCHERNO)) { if("1".equals(SORT_NUMBER)) { String SUBJECTCODE = param.get("SUBJECTCODE"); sub=JBOFactory.createBizObjectQuery(LV_STACTS_CONFIG.CLASS_NAME,"SUBJECTS_CODE=:SUBJECTS_CODE").setParameter("SUBJECTS_CODE", SUBJECTCODE).getSingleResult(false);