From 356d90401830f5c5688a167d2ae59c256f6b59c1 Mon Sep 17 00:00:00 2001 From: amarsoft Date: Sat, 23 Jun 2018 19:02:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=8F=E9=94=80=E5=95=86=E5=8A=9E=E5=93=A6?= =?UTF-8?q?=E9=83=91=E8=BF=9B=E6=94=B6=E5=8F=96=E5=87=AD=E8=AF=81=E7=9B=B8?= =?UTF-8?q?=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../VoucherConfig/LvVoucherLoanInfo.jsp | 2 +- .../ReceiveDealerMarginForLoan.java | 20 ++++++ .../CreateVoucherReceiveDealerMargin.java | 68 +++++++++++++++++++ .../voucher/serviceImp/VoucherToV8Impl.java | 10 ++- 4 files changed, 97 insertions(+), 3 deletions(-) create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ReceiveDealerMarginForLoan.java create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherReceiveDealerMargin.java diff --git a/WebContent/Tenwa/Core/Voucher/VoucherConfig/LvVoucherLoanInfo.jsp b/WebContent/Tenwa/Core/Voucher/VoucherConfig/LvVoucherLoanInfo.jsp index fc5523e2d..fd68c3b06 100644 --- a/WebContent/Tenwa/Core/Voucher/VoucherConfig/LvVoucherLoanInfo.jsp +++ b/WebContent/Tenwa/Core/Voucher/VoucherConfig/LvVoucherLoanInfo.jsp @@ -27,7 +27,7 @@ AsControl.OpenView(pUrl, "vouid=<%=vouid%>&owned=<%=owned%>","_self",""); } function selectLoanSubject(){ - AsDialog.OpenSelector("SelectLoanSubject","owned,<%=owned%>","dialogWidth=" + parseInt(window.screen.width * 0.5) + "px dialogHeight=" + parseInt(window.screen.height * 0.3) + "px",function(sReturn){ + AsDialog.OpenSelector("SelectLoanSubject","","dialogWidth=" + parseInt(window.screen.width * 0.5) + "px dialogHeight=" + parseInt(window.screen.height * 0.3) + "px",function(sReturn){ if(!sReturn || sReturn == "_CANCEL_"||sReturn=="_NONE_"||sReturn=="_CLEAR_"){ return; } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ReceiveDealerMarginForLoan.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ReceiveDealerMarginForLoan.java new file mode 100644 index 000000000..995ad1a2d --- /dev/null +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ReceiveDealerMarginForLoan.java @@ -0,0 +1,20 @@ +package com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan; + +import java.util.HashMap; +import java.util.Map; + +import com.amarsoft.are.jbo.JBOTransaction; +import com.tenwa.comm.exception.BusinessException; +import com.tenwa.voucher.service.VoucherJavaParamService; + +public class ReceiveDealerMarginForLoan implements VoucherJavaParamService { + + @Override + public Map getJavaParam(JBOTransaction tx, + Map param) throws BusinessException { + MapreturnValue=new HashMap(); + returnValue.putAll(param); + return returnValue; + } + +} diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherReceiveDealerMargin.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherReceiveDealerMargin.java new file mode 100644 index 000000000..d0e5c82dc --- /dev/null +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherReceiveDealerMargin.java @@ -0,0 +1,68 @@ +package com.tenwa.voucher.CreateVoucherProcess; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import jbo.voucher.LV_VOUCHER_CONFIG; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.awe.util.Transaction; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import com.tenwa.flow.baseBussion.BaseBussiness; +import com.tenwa.voucher.serviceImp.CreateVoucherServiceImpl; + +public class CreateVoucherReceiveDealerMargin extends BaseBussiness{ + @Override + public Object run(Transaction Sqlca) throws Exception { + this.initBussinessParam(Sqlca); + + Map map=new HashMap(); + Map param=new HashMap(); + String MONEY=null; + String ACCOUNTING_DATE=null; + String FACT_DATE=null; + String LEAS_FORM=null; + String DISTRIBUTOR_NO=null; + String DISTRIBUTOR_NAME=null; + String FlowUnid=this.getAttribute("FlowUnid").toString(); + map.put("FlowUnid", FlowUnid); + String sql="SELECT DDIT.CAUTION_MONEY AS MONEY,DDIT.COLLECT_TIME AS ACCOUNTING_DATE," + + "DDIT.COLLECT_TIME AS FACT_DATE ,'02' AS LEAS_FORM ,DIF.DISTRIBUTOR_NO," + + "DIF.DISTRIBUTOR_NAME FROM D_DEPOSITCHARGE_INFO_TEMP DDIT LEFT JOIN " + + "DISTRIBUTOR_INFO DIF ON DDIT.DISTRIBUTOR_ID=DIF.ID WHERE DDIT.FLOWUNID=:FLOWUNID"; + List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map); + + CreateVoucherServiceImpl vs=new CreateVoucherServiceImpl(); + String VOUCHER_TYPE="1";// 凭证分类 金蝶 + String userid ="admin"; + + for(Map ma:dataList){ + MONEY=ma.get("MONEY"); + ACCOUNTING_DATE=ma.get("ACCOUNTING_DATE"); + FACT_DATE=ma.get("FACT_DATE"); + LEAS_FORM=ma.get("LEAS_FORM"); + DISTRIBUTOR_NO=ma.get("DISTRIBUTOR_NO"); + DISTRIBUTOR_NAME=ma.get("DISTRIBUTOR_NAME"); + + param.put("MONEY", MONEY); + param.put("ACCOUNTING_DATE", ACCOUNTING_DATE); + param.put("FACT_DATE", FACT_DATE); + param.put("LEAS_FORM", LEAS_FORM); + param.put("DISTRIBUTOR_NO", DISTRIBUTOR_NO); + param.put("DISTRIBUTOR_NAME", DISTRIBUTOR_NAME); + + map.clear(); + map.put("PROJ_TYPE", LEAS_FORM); + map.put("MODULAR_NUMBER", "记录经销商保证金"); + BizObject vouch=DataOperatorUtil.getSingleJBO(LV_VOUCHER_CONFIG.CLASS_NAME, map, Sqlca); + + if(vouch!=null){ + vs.createVoucher("记录经销商保证金", vouch.getAttribute("OWNED_COMPANY").getString(), LEAS_FORM, VOUCHER_TYPE, userid,param, Sqlca); + } + } + return "true"; + } + + +} diff --git a/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java b/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java index f64c18a9b..47e00d5ab 100644 --- a/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java +++ b/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java @@ -45,12 +45,18 @@ public class VoucherToV8Impl implements VoucherService { */ private static final String moduleName_value = "网银导入"; + /** * 欧力士特殊生成凭证模块 * 因根据合同号都会把凭证归属在合同对应所属公司下，这样不满足欧力士现业务需求 */ private static final String SPECIAL_MODULENAME = "代收深圳款"; + /** + * 经销商保证金收取使用的参考变量 + * + */ + private static final String Receive_Dealer_Margin="记录经销商保证金"; public String saveMessage(List> list,Map param,BizObject user,JBOTransaction tx) throws Exception{ try{ @@ -79,13 +85,13 @@ public class VoucherToV8Impl implements VoucherService { String contracid=list.get(i).get("CONTRACT_ID");//合同号 String modularNumber=param.get("MODULAR_NUMBER");//凭证编号 //网银导入、代收租金 的凭证不需要合同号 - if(!moduleName_value.equals(modularNumber) && !SPECIAL_MODULENAME.equals(modularNumber) && Tools.isNullOrEmpty(contracid)){ + if(!Receive_Dealer_Margin.equals(modularNumber)&&!moduleName_value.equals(modularNumber) && !SPECIAL_MODULENAME.equals(modularNumber) && Tools.isNullOrEmpty(contracid)){ log.error("合同号为空,无法构建对应的凭证信息!"); return null; } //检查合同ID是否是正确的 - if(!moduleName_value.equals(modularNumber) && !SPECIAL_MODULENAME.equals(modularNumber)){ + if(!Receive_Dealer_Margin.equals(modularNumber)&&!moduleName_value.equals(modularNumber) && !SPECIAL_MODULENAME.equals(modularNumber)){ BizObject contract=JBOFactory.createBizObjectQuery(LB_CONTRACT_INFO.CLASS_NAME, "id=:id").setParameter("id", contracid).getSingleResult(false); if(contract==null){