From 978b71e611d121fa2c6c559dc75f33248c0614cf Mon Sep 17 00:00:00 2001
From: zhangbb <zhangbb@DESKTOP-GH0CKE6>
Date: Wed, 26 Sep 2018 19:53:40 +0800
Subject: [PATCH 1/4] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E8=B5=B7=E7=A7=9F=E7=94=B3=E8=AF=B7=E7=9A=84=E5=95=86=E5=8A=A1?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LoanBasicInfoBusiness.jsp                 | 1274 +++++++++++++++++
 .../reckon/executor/FundFundPlanExecutor.java |    7 +-
 2 files changed, 1279 insertions(+), 2 deletions(-)
 create mode 100644 WebContent/Accounting/LoanSimulation_onhire/LoanBasicInfoBusiness.jsp

diff --git a/WebContent/Accounting/LoanSimulation_onhire/LoanBasicInfoBusiness.jsp b/WebContent/Accounting/LoanSimulation_onhire/LoanBasicInfoBusiness.jsp
new file mode 100644
index 000000000..5db307d87
--- /dev/null
+++ b/WebContent/Accounting/LoanSimulation_onhire/LoanBasicInfoBusiness.jsp
@@ -0,0 +1,1274 @@
+<%@page import="jbo.prd.BUSINESS_TYPE"%>
+<%@page import="com.tenwa.reckon.util.TbBeanTools"%>
+<%@page import="com.tenwa.reckon.bean.TabCalBean"%>
+<%@page import="com.amarsoft.awe.control.model.Parameter"%>
+<%@page import="com.amarsoft.app.base.util.DateHelper"%>
+<%@page import="com.tenwa.util.SerialNumberUtil"%>
+<%@page import="com.tenwa.reckon.product.ProductCondition"%>
+<%@page import="com.amarsoft.app.util.ProductParamUtil"%>
+<%@ page import="com.amarsoft.app.lc.workflow.action.GetFlowAction" %>
+<%@ page import="java.util.Vector" %>
+<%@ page import="com.amarsoft.awe.dw.ui.validator.ValidateRule" %>
+<%@ page import="com.tenwa.reckon.product.ASObjectWindowCalc" %>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%>
+<%
+	/*获取参数*/
+	String flowunid = CurPage.getParameter("FlowUnid");
+	String plannumber=CurPage.getParameter("plannumber");
+	String productId=CurPage.getParameter("ProductId");
+	String ishistory=CurPage.getParameter("IsHistory");
+	String nodeNo=CurPage.getParameter("NodeNo");
+	String RightType= CurPage.getParameter("RightType");
+	String calType = CurPage.getParameter("calType");
+	//判断是否为汽车业务
+	boolean isCarProduct = "004".equals(productId) ? false : true;
+	/*获取参数*/
+	/*根据参数判断   是否去数据库查询*/
+	BizObject flow=GetFlowAction.getFlowBussinessObject(flowunid);
+	if(productId==null){
+		productId=flow.getAttribute("productId").getString();
+	}
+	if(calType ==  null){
+		calType = "proj_process";
+	}
+	TabCalBean tcb=TbBeanTools.getTabInfo(calType);
+	String planCName=tcb.getPlanCName();
+	//方案编号  
+	if(plannumber==null){
+		if("pay_process".equals(calType)||"onHire_process".equals(calType)){
+			BizObject condtion=JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LC_CALC_CONDITION_TEMP","flowunid=:flowunid and PAYMENT_NUMBER is not null and length(PAYMENT_NUMBER)>0 ").setParameter("flowunid", flowunid).getSingleResult(false);
+			if(condtion!=null){
+				plannumber=condtion.getAttribute(planCName).getString();
+			}
+		}else{
+			String planType=ProductParamUtil.getProductParameterValue(productId, "PRD0314", "planinformation");
+			if("SinglePlan".equals(planType)){
+				BizObject condtion=JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LC_CALC_CONDITION_TEMP","flowunid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false);
+				if(condtion!=null){
+					plannumber=condtion.getAttribute(planCName).getString();
+				}
+			}
+		}
+	}
+	//新增数据 自动生成方案编号
+	if(plannumber==null){
+		String sSerialType="";
+		JBOTransaction tx=JBOFactory.createJBOTransaction();
+		if("proj_process".equals(calType)){
+			BizObject proj=JBOFactory.createBizObjectQuery("jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP","flowunid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false);
+			sSerialType=proj.getAttribute("PROJECT_NO").getString();
+		}else{
+			BizObject contract=JBOFactory.createBizObjectQuery("jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO_TEMP","flowunid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false);
+			sSerialType=contract.getAttribute("CONTRACT_NO").getString();
+		}
+		plannumber=SerialNumberUtil.getPlannumber(sSerialType,calType,tx);
+		tx.commit();
+	}
+	/*根据参数判断   是否去数据库查询*/
+	
+	String sTempletNo = "TLoanSimulationBasicInfo_onhire";//--模板号--
+	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+	
+	
+	
+	/*设置字段事件*/
+	doTemp.setHtmlEvent("SETTLE_METHOD", "onchange", "changeSettleMethod");//租金计算方式
+	doTemp.setHtmlEvent("RENT_OR_RATE", "onchange", "rentOrRateChange");//租金推算方法
+	doTemp.setHtmlEvent("INCOME_NUMBER_YEAR", "onchange", "changeIncomeNumber");//还款间隔
+	doTemp.setHtmlEvent("INCOME_INTERVAL_MONTH", "onchange", "changeIntervalMonth");//还款间隔(月)
+	doTemp.setHtmlEvent("INCOME_NUMBER", "onchange", "changeNumber");//还款次数
+	doTemp.setHtmlEvent("PERIOD_TYPE", "onchange", "changePeriod");//期初/期末
+	doTemp.setHtmlEvent("GRACE", "onchange", "changeGrace");//宽限期RATTermID
+	doTemp.setHtmlEvent("RATE_FLOAT_TYPE", "onchange", "changeRateFloat");//利率计算方式
+	doTemp.setHtmlEvent("BASE_RATE", "onchange", "changeBaseRate");//基准利率
+	doTemp.setHtmlEvent("RATE_FLOAT_AMT", "onchange", "changeRateFloatAmt");//利率调整值
+	doTemp.setHtmlEvent("CAUTION_MONEY", "onchange", "cautionMoney");//保证金
+	doTemp.setHtmlEvent("CAUTION_DEDUCTION_MONEY", "onchange", "cautionDeductionMoney");//保证金抵扣金额
+	doTemp.setHtmlEvent("LEASE_AMT_DATE", "onchange", "changeLeaseAmtDate");//投放日
+	doTemp.setHtmlEvent("START_DATE", "onchange", "changeStartDate");//起租日
+	doTemp.setHtmlEvent("FIRST_PLAN_DATE", "onchange", "changeFistPlanDate");//第一期计划日期
+	doTemp.setHtmlEvent("CORPUS_RATIO", "onchange", "changeCorpusRatio");//期限内本金比例
+	doTemp.setHtmlEvent("RATE_TYPE", "onchange", "changeRateTypeNew");//利率类型
+	/*设置字段事件*/
+
+	/*设置模板属性*/
+	Vector<ValidateRule> vali=new Vector<ValidateRule>();
+	//费用规则
+	ProductCondition pc=new ProductCondition();
+	pc.getProductFundRules(doTemp, productId);
+	String calcRules=pc.getProductRulesBusiness(doTemp, productId,vali);
+	
+	if("quoted_price".equals(calType)){//客户报价  流程号存的是客户主键
+		doTemp.setDefaultValue("cust_id", flowunid);
+	}
+	doTemp.setColumnAttribute(planCName,"isipdate","1");
+	doTemp.setJboClass(tcb.getCondition_tb());
+	doTemp.setDefaultValue(planCName, plannumber);
+	doTemp.setDefaultValue("flowunid", flowunid);
+	doTemp.appendJboWhere(" and "+planCName+"='"+plannumber+"'");
+	if(null!=ishistory&&ishistory.equals("true")){
+		 doTemp.setDataQueryClass("com.tenwa.lease.flow.flowarchive.calcarchive.CalcCondtionInfoArachiveShow");//如果是历史则新显示历史数据
+	}
+	/*设置模板属性*/
+	
+	/*设置页面属性*/
+	CurPage.getCurComp().setAttribute("RightType", null);
+	Parameter p=new Parameter("plannumber",plannumber);
+	Vector<Parameter> v=CurPage.parameterList;
+	v.add(p);
+	/*设置页面属性*/
+	
+	
+	ASObjectWindowCalc dwTemp = new ASObjectWindowCalc(CurPage, doTemp,request);
+	
+	
+	dwTemp.Style = "2";//freeform
+	if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true"))){
+		dwTemp.ReadOnly = "-2";//只读模式
+		isShowButton=false;
+	}else{
+		isShowButton=true;
+	}
+	dwTemp.setVali(vali);
+	dwTemp.setAttr("inputWidth","120");
+	dwTemp.setAttr("spanWidth","107");
+	dwTemp.setAttr("showRatio", true);
+	dwTemp.genHTMLObjectWindow(flowunid);
+	RightType="ReadOnly";
+	CurPage.getCurComp().setAttribute("RightType", RightType);
+	
+	String compClientID = request.getParameter("CompClientID");
+	dwTemp.replaceColumn("condition_plan", "<iframe type='iframe' id='frame_list' name=\"frame_list\" width=\"100%\" height=\"600px\" frameborder=\"0\" src=\""+sWebRootPath+"/Accounting/LoanSimulation/condition_plan_business.jsp?CompClientID="+compClientID+"&flowunid="+flowunid+"&plannumber="+plannumber+"&planCName="+planCName+"&IsHistory="+ishistory+"&NodeNo="+nodeNo+"&RightType="+RightType+"&ProductId="+productId+"&calType="+calType+"\"></iframe>", CurPage.getObjectWindowOutput()); 
+	dwTemp.replaceColumn("even_subsection", "<iframe type='iframe' id='frame_even_break' name=\"frame_even_subsection\" width=\"100%\" height=\"300px\" frameborder=\"0\" src=\""+sWebRootPath+"/Accounting/LoanSimulation/subsection/LCCalcSubsectionList.jsp?CompClientID="+compClientID+"&flowunid="+flowunid+"&plannumber="+plannumber+"&planCName="+planCName+"&IsHistory="+ishistory+"&NodeNo="+nodeNo+"&RightType="+RightType+"&calType="+calType+"\"></iframe>", CurPage.getObjectWindowOutput()); 
+	dwTemp.replaceColumn("knowing_config", "<iframe type='iframe' id='frame_list_knowing' name=\"frame_list_knowing\" width=\"100%\" height=\"400px\" frameborder=\"0\" src=\""+sWebRootPath+"/Accounting/LoanSimulation/KnowConfigList.jsp?CompClientID="+compClientID+"&flowunid="+flowunid+"&plannumber="+plannumber+"&planCName="+planCName+"&IsHistory="+ishistory+"NodeNo="+nodeNo+"&RightType="+RightType+"&calType="+calType+"\"></iframe>", CurPage.getObjectWindowOutput());
+	String businessDate = DateHelper.getBusinessDate();
+	String sButtons[][] = {
+		//{"true","All","Button","重置","重置","reloadSelf()","","","",""},
+		{"true","","Button","租金测算","租金测算","saveRecord()","","","","btn_icon_save"},
+	//	{((isCarProduct) && ("proj_process".equals(calType)||"cont_process".equals(calType)))?"true":"false","","Button","引入客户报价","引入客户报价","importCustomerQuot()","","","","btn_icon_edit"}
+	};
+%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<script type="text/javascript">
+var calcRules=eval("(<%=calcRules%>)");
+var rentOrRateOption;
+var incomeNumberYear;
+var adjustType;
+var count = 0;
+$(function(){
+	//document.getElementById('div_my0').innerHTML = '<div style="width:1160px;overflow: scroll;">'+document.getElementById('div_my0').innerHTML+'</div>';
+	if("ReadOnly"!="<%=RightType%>"){
+		changeRateTypeNew();
+		rentOrRateOption=$("#RENT_OR_RATE").children();
+		incomeNumberYear=$("#INCOME_NUMBER_YEAR").children();
+		adjustType=$("#ADJUST_TYPE").children();
+		var fundRules=calcRules["fund"];
+		for(var key in fundRules){
+				$("#"+key).bind("change",function(){
+					getRatioByMoney(this);
+				});
+				if($("#"+key+"_FINA").length > 0){
+					$("#"+key+"_FINA").bind("change",function(){
+						getRatioByMoney(this);
+					});
+				}
+		}
+		$("#EQUIP_AMT,#INSURANCE_PREMIUM,#EQUIP_END_VALUE,#OTHER_MONEY").bind("change",function(){
+			getRatioByMoney(this);
+		});
+		CalcControl.PeriodTypeView();
+		CalcControl.SettleMethodView();
+		changeSettleMethod2();
+		changeRateType();
+		CalcControl.RentOrRateView();
+		count++;
+	}else{
+		changeSettleMethod3();
+	}
+	getRatioByMoney(getObj(0, "EQUIP_AMT"));
+});
+
+function importCustomerQuot(){
+	 AsDialog.OpenSelector("SelectCustomerQuot","flowunid,<%=flowunid%>,productid,<%=productId%>","dialogWidth=800px;dialogHeight=500px",
+			function(sReturn){
+				if(!sReturn||sReturn=="_CANCEL_"||sReturn==""||sReturn=="_NONE_")
+				{
+						 //alert(getHtmlMessage('1'));//请选择一条信息！
+							return;
+				}
+					sReturn = sReturn.split("@");
+					var quotid=sReturn[0];
+					var customerid=sReturn[1];
+					var param="flowunid=<%=flowunid%>,quotid="+quotid+",planCName=<%=planCName%>,planCValue=<%=plannumber%>";
+					AsControl.RunJavaMethodTrans("com.tenwa.reckon.action.CalcAction","copyCustomerQuotToTemp",param);
+					var param2="FlowUnid=<%=flowunid%>&calType=<%=calType%>&plannumber=<%=plannumber%>";
+					AsControl.OpenView("/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp",param2, "_self");
+				},"请选择客户报价",'');
+	
+}
+
+function changeRateTypeNew() {
+	if("ratetype01" == getItemValue(0, 0, "RATE_TYPE")) {
+		setItemRequired(0, "ADJUST_STYLE", true);
+		setItemReadOnly(0, 0, "ADJUST_STYLE", false);
+		setItemRequired(0, "ADJUST_TYPE", true);
+		setItemReadOnly(0, 0, "ADJUST_TYPE", false);
+	} else {
+		setItemValue(0, 0, "ADJUST_STYLE", "");
+		setItemRequired(0, "ADJUST_STYLE", false);
+		setItemReadOnly(0, 0, "ADJUST_STYLE", true);
+		setItemValue(0, 0, "ADJUST_TYPE", "");
+		setItemRequired(0, "ADJUST_TYPE", false);
+		setItemReadOnly(0, 0, "ADJUST_TYPE", true);
+	}
+}
+
+var CalcControl={};
+CalcControl.IncomeNumberView=function(){
+	var incomeNumber=getItemValue(0,0,"INCOME_NUMBER_YEAR");
+	if(incomeNumber=="income_n"){
+		setEnable("INCOME_INTERVAL_MONTH");
+	}else{
+		setDisable("INCOME_INTERVAL_MONTH");
+	}
+}
+CalcControl.IncomeNumberInit=function(){
+	var settleMethod = getItemValue(0,0,"SETTLE_METHOD");
+	var incomeNumber = getItemValue(0,0,"INCOME_NUMBER_YEAR");
+	//按月付息一次还本和按月付息按季还本目前只允许等额本金和均息法选择
+	if(("one_1" == incomeNumber || "three_1" == incomeNumber) && !("even_corpus" == settleMethod || "even_interest" == settleMethod)){
+		setItemValue(0,0,"INCOME_NUMBER_YEAR","income_1");
+		incomeNumber = "income_1";
+		alert("只允许等额本金和均息法选择");
+	}
+	if(incomeNumber=="income_n" || incomeNumber=="irregular"){
+		setItemValue(0,0,"INCOME_INTERVAL_MONTH",1);
+	}else{
+		if(incomeNumber.length>0){
+			var month=incomeNumber.split("_")[1];
+			setItemValue(0,0,"INCOME_INTERVAL_MONTH",month);
+		}else{
+			setItemValue(0,0,"INCOME_INTERVAL_MONTH",1);
+		}
+	}
+	CalcControl.InitLsaseTerm();
+	var leaseAmtDate = getItemValue(0,getRow(),"LEASE_AMT_DATE");
+	if(leaseAmtDate){
+		CalcControl.InitStartDate();
+	}
+}
+
+
+CalcControl.InitLsaseTerm=function(){
+	var INCOME_NUMBER_YEAR = getItemValue(0,0,"INCOME_NUMBER_YEAR");// 还款间隔
+	var INCOME_INTERVAL_MONTH  = getItemValue(0,getRow(),"INCOME_INTERVAL_MONTH");//还款间隔（月）
+	var INCOME_NUMBER  = getItemValue(0,getRow(),"INCOME_NUMBER");//还款次数
+	if("three_1" == INCOME_NUMBER_YEAR && INCOME_NUMBER % 3 != 0){
+		alert("按月付息按季还本，还款次数必须能被3整除");
+		setItemValue(0,0,"INCOME_NUMBER","");
+		return;
+	}
+	var grace = getItemValue(0,getRow(),"GRACE");
+	setItemValue(0,getRow(),"LEASE_TERM",INCOME_INTERVAL_MONTH* (Number(INCOME_NUMBER) + Number(grace)));
+}
+
+CalcControl.InitStartDate=function(){
+	var leaseAmtDate=getItemValue(0,getRow(),"LEASE_AMT_DATE");//投放日
+	var startDate=getItemValue(0,getRow(),"START_DATE");//起租日
+	//默认起租日为投放日
+	if(startDate.length==""){
+		setItemValue(0,0,"START_DATE",leaseAmtDate);
+	}
+	CalcControl.InitFistPlanDate();
+}
+
+CalcControl.InitFistPlanDate=function(){
+	var incomenumberyear = Number(getItemValue(0,getRow(),"INCOME_INTERVAL_MONTH"));//获取还款间隔 月
+	var periodType = getItemValue(0,getRow(),"PERIOD_TYPE");//获取  期初/期末
+	var startDate=getItemValue(0,getRow(),"START_DATE");//起租日
+	if(!startDate)return;
+	if("period_type_1" == periodType){//期初  第一期还款日为投放日
+		setItemValue(0,0,"FIRST_PLAN_DATE",startDate);
+	}else{
+		var firstPlanDate = dateAdd('m',incomenumberyear,new Date(startDate)).format('yyyy\/MM\/dd');
+		setItemValue(0,0,"FIRST_PLAN_DATE",firstPlanDate);
+	}
+	CalcControl.InitSecondPlanDate();
+}
+
+CalcControl.InitSecondPlanDate=function(){
+
+	var incomenumberyear = Number(getItemValue(0,getRow(),"INCOME_INTERVAL_MONTH"));//获取还款间隔 月
+	var firstPlanDate=getItemValue(0,0,"FIRST_PLAN_DATE");
+	if(!firstPlanDate)return;
+	setItemValue(0,0,"SECOND_PLAN_DATE",dateAdd('m',incomenumberyear,new Date(firstPlanDate)).format('yyyy\/MM\/dd'));
+	
+}
+
+
+CalcControl.PeriodTypeView=function(){
+	var periodType = getItemValue(0,getRow(),"PERIOD_TYPE");
+	if(periodType == 'period_type_1'){
+		setDisable("GRACE");
+	}else{
+		setEnable("GRACE");
+	}
+}
+CalcControl.PeriodTypeInit=function(){
+	var periodType = getItemValue(0,getRow(),"PERIOD_TYPE");
+	if(periodType == 'period_type_1'){
+		setItemValue(0,0,"GRACE","0");
+	}
+	CalcControl.InitLsaseTerm();
+	var leaseAmtDate = getItemValue(0,getRow(),"LEASE_AMT_DATE");
+	if(leaseAmtDate){
+		CalcControl.InitStartDate();
+	}
+}
+CalcControl.RateFloatTypeView=function(){
+	var rateway = getItemValue(0,getRow(),"RATE_FLOAT_TYPE");//利率计算方式
+	var rateOrRate=getItemValue(0,0,"RENT_OR_RATE");//租金推算方式
+	if(rateway=="fixed"){
+		setDisable('BASE_RATE');
+		setDisable('RATE_FLOAT_AMT');
+		setDisable('RENT_VALUE');
+		setEnable('YEAR_RATE');
+	}else if(rateway=="base"){
+		setEnable('BASE_RATE');
+		setDisable('RATE_FLOAT_AMT');
+		setDisable('RENT_VALUE');
+		setDisable('YEAR_RATE');
+	}else{
+		setEnable('BASE_RATE');
+		setEnable('RATE_FLOAT_AMT');
+		setDisable('RENT_VALUE');
+		setDisable('YEAR_RATE');
+	}
+}
+CalcControl.RateFloatTypeInit=function(){
+	var rateway = getItemValue(0,getRow(),"RATE_FLOAT_TYPE");//利率计算方式
+	var baserate = getItemValue(0,getRow(),"BASE_RATE");//基准利率
+	var ratefloatamt = getItemValue(0,getRow(),"RATE_FLOAT_AMT");//利率调整值
+	var rate="";
+	if(rateway=="add"){
+		rate=Number(baserate)+Number(ratefloatamt);
+	}else if(rateway=="proportion"){
+		rate=Number(baserate)*(1+Number(ratefloatamt));
+	}else if(rateway=="base"){
+		rate=baserate;
+	}else{
+		setItemValue(0,0,"BASE_RATE","0");
+		setItemValue(0,0,"RATE_FLOAT_AMT","0");
+	}
+	if(rateway != 'fixed'){
+		setItemValue(0,0,"YEAR_RATE",rate);
+	}
+}
+CalcControl.SettleMethodView=function(){
+	var method=getItemValue(0,getRow(),"SETTLE_METHOD");
+	//按计算方式 显示按钮  和分段测算录入页面
+	//document.all("A_Group_even_subsection").style.display="none";
+	if("true"=="<%=isShowButton%>"){
+		var button = document.getElementById("InfoButtonArea").getElementsByTagName('a')[0];
+		if(method == 'irregular_rent'){
+			button.title = '保存';
+			button.childNodes[2].childNodes[1].innerText = '保存';
+		}else{
+			button.title = '租金测算';
+			button.childNodes[2].childNodes[1].innerText = '租金测算';
+			if(method=='even_subsection'){
+				document.all("A_Group_even_subsection").style.display="block";
+			}
+		}
+	}
+	var ids="RENT_OR_RATE,INCOME_NUMBER_YEAR,INCOME_INTERVAL_MONTH,INCOME_NUMBER,PERIOD_TYPE,GRACE,RATE_FLOAT_TYPE,BASE_RATE,RATE_FLOAT_AMT,YEAR_RATE,RENT_VALUE,FIRST_PLAN_DATE,SECOND_PLAN_DATE";
+	if(method == 'irregular_rent'||method=="even_subsection"){
+		
+		setDisable(ids);
+		var showIds="RATE_FLOAT_DAY,FIRST_PLAN_DATE,SECOND_PLAN_DATE,PERIOD_TYPE,GRACE";
+		if(method == 'irregular_rent'){
+			setDisable(showIds);
+		}else{
+			setEnable(showIds);
+		}
+		setItemRequired(0,"YEAR_RATE",false);
+		setItemRequired(0,"INCOME_NUMBER",false);
+		setItemRequired(0,"FIRST_PLAN_DATE",false);
+		setItemRequired(0,"SECOND_PLAN_DATE",false);
+	}else{
+		setEnable(ids);
+		CalcControl.IncomeNumberView();
+		CalcControl.PeriodTypeView();
+		CalcControl.RateFloatTypeView();
+		CalcControl.RentOrRateView();
+		setItemRequired(0,"YEAR_RATE",true);
+	}
+	
+	//日期
+	//计划日期
+	var plan = "";
+	if(method=="even_subsection"||method=="irregular_rent"||method==""){
+		plan="";
+	}else{
+	 	//plan=calcRules['method'][method]["date_proc"].split(",");
+	}
+	var planflag={};
+	for(var i=0;i<plan.length;i++){
+		if(plan[i]==1){
+			showItem(0,"FIRST_PLAN_DATE");
+			setItemRequired(0,"FIRST_PLAN_DATE",true);
+			planflag["FIRST_PLAN_DATE"]=0;
+		}
+		if(plan[i]==4){
+			showItem(0,"SECOND_PLAN_DATE");
+			setItemRequired(0,"SECOND_PLAN_DATE",true);
+			planflag["SECOND_PLAN_DATE"]=0;
+		}
+		if(plan[i]==2){
+			showItem(0,"LAST_PLAN_DATE")
+			setItemRequired(0,"LAST_PLAN_DATE",true);
+			planflag["LAST_PLAN_DATE"]=0;
+		}
+		if(plan[i]==3){
+			showItem(0,"PLAN_DATE_HOILDAY")
+			setItemRequired(0,"PLAN_DATE_HOILDAY",true);
+			planflag["PLAN_DATE_HOILDAY"]=0;
+		}
+	}
+	var plana=["PLAN_DATE_HOILDAY","SECOND_PLAN_DATE","LAST_PLAN_DATE","PLAN_DATE_HOILDAY"];
+	for(var i=0;i<plana.length;i++){
+		if(planflag[plana[i]]!=0){
+			hideItem(0,plana[i]);
+			setItemRequired(0,plana[i],false);
+		}
+	}
+	//计息日期
+	var interest = "";
+	if(method=="even_subsection"||method=="irregular_rent"||method==""){
+		interest="";
+	}else{
+		//interest=calcRules['method'][method]["interest_date_proc"].split(",");
+	}
+	var interestflag={};
+	for(var i=0;i<interest.length;i++){
+		if(interest[i]==1){
+			showItem(0,"FIRST_INTEREST_DATE");
+			setItemRequired(0,"FIRST_INTEREST_DATE",true);
+			interestflag["FIRST_INTEREST_DATE"]=0;
+		}
+		if(interest[i]==2){
+			showItem(0,"LAST_INTEREST_DATA")
+			setItemRequired(0,"LAST_INTEREST_DATA",true);
+			interestflag["LAST_INTEREST_DATA"]=0;
+		}
+		if(interest[i]==3){
+			showItem(0,"INTEREST_DATE_HOLIDAY")
+			setItemRequired(0,"INTEREST_DATE_HOLIDAY",true);
+			interestflag["INTEREST_DATE_HOLIDAY"]=0;
+		}
+	}
+	var interesta=["FIRST_INTEREST_DATE","LAST_INTEREST_DATA","INTEREST_DATE_HOLIDAY"];
+	for(var i=0;i<interesta.length;i++){
+		if(interestflag[interesta[i]]!=0){
+			hideItem(0,interesta[i]);
+			setItemRequired(0,interesta[i],false);
+		}
+	}
+	var isShowRate;
+	if(method=="even_subsection"||method=="irregular_rent"||method==""){
+		isShowRate="";
+	}else{
+		isShowRate=calcRules['method'][method]["isShowRate"];
+	}
+	if(isShowRate=="Y"){
+		showItem(0,"RATE");
+		showItem(0,"ADDITIONAL_RATE");
+		setItemRequired(0,"RATE",true);
+		setItemRequired(0,"ADDITIONAL_RATE",true);
+	}else{
+		hideItem(0,"RATE");
+		hideItem(0,"ADDITIONAL_RATE");
+		setItemRequired(0,"RATE",false);
+		setItemRequired(0,"ADDITIONAL_RATE",false);
+	}
+	
+	var  param="CompClientID=<%=compClientID%>&flowunid=<%=flowunid%>&plannumber=<%=plannumber%>&planCName=<%=planCName%>&IsHistory=<%=ishistory%>&NodeNo=<%=nodeNo%>&calType=<%=calType%>&ProductId=<%=productId%>&method="+method;
+	AsControl.OpenView("/Accounting/LoanSimulation/condition_plan_business.jsp",param, "frame_list"); 
+}
+CalcControl.SettleMethodInit=function(){
+	var method=getItemValue(0,getRow(),"SETTLE_METHOD");
+	if(method == 'irregular_rent'||method=="even_subsection"){
+		setItemValue(0,0,"INCOME_NUMBER_YEAR","irregular");
+		setItemValue(0,0,"INCOME_INTERVAL_MONTH","1");
+		setItemValue(0,0,"LEASE_TERM","");
+		setItemValue(0,0,"INCOME_NUMBER","");
+		setItemValue(0,0,"RATE_FLOAT_TYPE","fixed");
+		CalcControl.RateFloatTypeInit();
+		setItemValue(0,0,"YEAR_RATE","");
+		setItemValue(0,0,"RENT_VALUE","");
+		setItemRequired(0,"INCOME_NUMBER",false);
+		if(method == 'irregular_rent'){
+			setItemValue(0,0,"RATE_FLOAT_DAY","360");
+			setItemValue(0,0,"FIRST_PLAN_DATE","");
+			setItemValue(0,0,"SECOND_PLAN_DATE","");
+			setItemValue(0,0,"PERIOD_TYPE","period_type_0");
+			setItemValue(0,0,"GRACE","0");
+		}
+	}else{
+		setItemRequired(0,"INCOME_NUMBER",true);
+	}
+	if(method=="even_subsection"||method=="irregular_rent"||method==""){
+		setItemValue(0,0,"PLAN_DATE_HOILDAY","unchanged");
+		setItemValue(0,0,"INTEREST_DATE_HOLIDAY","unchanged");
+
+		setItemValue(0,0,"RATE","0");
+		setItemValue(0,0,"ADDITIONAL_RATE","0");
+		setItemValue(0,0,"INTEREST_DAY_TYPE","start_date");
+	}else{
+		setItemValue(0,0,"PLAN_DATE_HOILDAY",calcRules['method'][method]["HolidayAdjust"]);
+		setItemValue(0,0,"INTEREST_DATE_HOLIDAY",calcRules['method'][method]["InterestHolidayAdjust"]);
+
+		setItemValue(0,0,"RATE",calcRules['method'][method]["RATE"]);
+		setItemValue(0,0,"ADDITIONAL_RATE",calcRules['method'][method]["AdditionalRate"]);
+		setItemValue(0,0,"INTEREST_DAY_TYPE",calcRules['method'][method]["InterestDayType"]);
+	}
+	
+}
+CalcControl.RentOrRateView=function(){
+	var rentOrRate  = getItemValue(0,getRow(),"RENT_OR_RATE");//租金推算方式
+	var method=getItemValue(0,getRow(),"SETTLE_METHOD");//租金计算方式
+	//document.all("A_Group_calc_config").style.display="none";
+	var ids="RATE_FLOAT_TYPE,BASE_RATE,RATE_FLOAT_AMT,RATE_FLOAT_DAY,YEAR_RATE,RENT_VALUE,INCOME_NUMBER";
+	var ids2="INCOME_NUMBER_YEAR,PERIOD_TYPE,GRACE,FIRST_PLAN_DATE,SECOND_PLAN_DATE";
+	setItemRequired(0,"RENT_VALUE",false);
+	if(rentOrRate == 'rate'){//按年利率算租金
+		if(method=="irregular_rent"||method=="even_subsection"){
+			
+		}else{
+			setEnable(ids);
+			setEnable(ids2);
+			CalcControl.RateFloatTypeView();
+			setItemRequired(0,"YEAR_RATE",true);
+			setItemValue(0, 0, "RENT_VALUE", "");
+		}
+		
+	}else if(rentOrRate == 'rent'){//按租金算年利率    
+		setDisable(ids);
+		setEnable(ids2);
+		setEnable('RENT_VALUE');
+		setEnable('INCOME_NUMBER');
+		setItemRequired(0,"YEAR_RATE",false);
+		setItemRequired(0,"RENT_VALUE",true);
+	}else if(rentOrRate == 'knowing_rent'){//已知租金规则  只能固定利率  
+		setDisable(ids);
+		setEnable(ids2);
+		setItemRequired(0,"YEAR_RATE",false);
+		document.all("A_Group_calc_config").style.display="block";
+		var  param="CompClientID=<%=compClientID%>&flowunid=<%=flowunid%>&plannumber=<%=plannumber%>&planCName=<%=planCName%>&Ishistory=<%=ishistory%>&NodeNo=<%=nodeNo%>&calType=<%=calType%>";
+		AsControl.OpenView("/Accounting/LoanSimulation/KnowConfigList.jsp",param,"frame_list_knowing");
+	}else if(rentOrRate== 'knowing_corpus'){//已知本金规则
+		setDisable(ids);
+		setEnable(ids2);
+		setItemRequired(0,"YEAR_RATE",true);
+		setEnable('RATE_FLOAT_TYPE');
+		CalcControl.RateFloatTypeView();
+		document.all("A_Group_calc_config").style.display="block";
+		var  param="CompClientID=<%=compClientID%>&flowunid=<%=flowunid%>&plannumber=<%=plannumber%>&planCName=<%=planCName%>&IsHistory=<%=ishistory%>&NodeNo=<%=nodeNo%>&calType=<%=calType%>";
+		AsControl.OpenView("/Accounting/LoanSimulation/KnowConfigList.jsp",param,"frame_list_knowing");
+	}else if(rentOrRate=='rent_period'||rentOrRate=='rent_period_360'){//已知租金表
+		setDisable(ids);
+		setDisable(ids2);
+		setItemRequired(0,"YEAR_RATE",false);
+		document.all("A_Group_calc_config").style.display="block";
+		var  param="CompClientID=<%=compClientID%>&flowunid=<%=flowunid%>&plannumber=<%=plannumber%>&planCName=<%=planCName%>&IsHistory=<%=ishistory%>&NodeNo=<%=nodeNo%>&calType=<%=calType%>";
+		AsControl.OpenView("/Accounting/LoanSimulation/reriod/LCCalcReriodList.jsp",param,"frame_list_knowing");
+	}else if(rentOrRate=='corpus_period'){//已知本金表
+		setDisable(ids);
+		setDisable(ids2);
+		setEnable('RATE_FLOAT_TYPE');
+		setItemRequired(0,"YEAR_RATE",true);
+		CalcControl.RateFloatTypeView();
+		document.all("A_Group_calc_config").style.display="block";
+		var  param="CompClientID=<%=compClientID%>&flowunid=<%=flowunid%>&plannumber=<%=plannumber%>&planCName=<%=planCName%>&IsHistory=<%=ishistory%>&NodeNo=<%=nodeNo%>&calType=<%=calType%>";
+		AsControl.OpenView("/Accounting/LoanSimulation/reriod/LCCalcReriodList.jsp",param,"frame_list_knowing");
+	}
+}
+CalcControl.RentOrRateInit=function(){
+	var rentOrRate  = getItemValue(0,getRow(),"RENT_OR_RATE");//租金推算方式
+	if(rentOrRate=="rent"){
+		setItemValue(0,0,"RATE_FLOAT_TYPE","fixed");
+		CalcControl.RateFloatTypeInit();
+		setItemValue(0,0,"YEAR_RATE","");
+		setItemValue(0,0,"RATE_FLOAT_DAY","360");
+	}else if(rentOrRate=="knowing_rent"){
+		setItemValue(0,0,"RATE_FLOAT_TYPE","fixed");
+		CalcControl.RateFloatTypeInit();
+		setItemValue(0,0,"INCOME_NUMBER","0");
+		setItemValue(0,0,"YEAR_RATE","");
+		setItemValue(0,0,"RENT_VALUE","");
+		setItemValue(0,0,"RATE_FLOAT_DAY","360");
+	}else if(rentOrRate=="rent_period"||rentOrRate=="rent_period_360"){
+		setItemValue(0,0,"RATE_FLOAT_TYPE","fixed");
+		CalcControl.RateFloatTypeInit();
+		setItemValue(0,0,"YEAR_RATE","");
+		setItemValue(0,0,"RENT_VALUE","");
+		setItemValue(0,0,"INCOME_NUMBER_YEAR","income_1");
+		setItemValue(0,0,"INCOME_INTERVAL_MONTH","1");
+		setItemValue(0,0,"PERIOD_TYPE","period_type_0");
+		setItemValue(0,0,"GRACE","0");
+		setItemValue(0,0,"FIRST_PLAN_DATE","");
+		setItemValue(0,0,"SECOND_PLAN_DATE","");
+		setItemValue(0,0,"RATE_FLOAT_DAY","360");
+	}else if(rentOrRate=="knowing_corpus"){
+		setItemValue(0,0,"INCOME_NUMBER","0");
+		setItemValue(0,0,"RATE_FLOAT_DAY","360");
+	}else if(rentOrRate=="corpus_period"){
+		setItemValue(0,0,"INCOME_NUMBER","0");
+		setItemValue(0,0,"RATE_FLOAT_DAY","360");
+		setItemValue(0,0,"FIRST_PLAN_DATE","");
+		setItemValue(0,0,"SECOND_PLAN_DATE","");
+	}
+	
+}
+//改变租金计算方式
+function changeSettleMethod(){
+	CalcControl.SettleMethodInit();
+	changeSettleMethod2();
+	CalcControl.SettleMethodView();
+	if(count > 0){
+		AsControl.RunJavaMethod("com.tenwa.reckon.executor.CreateTransactionExecutor","runDeleSubsection","flowunid=<%=flowunid%>,plannumber=<%=plannumber%>,planCName=<%=planCName%>,calType=<%=calType%>");
+
+	}
+	rentOrRateChange();
+	
+}
+
+
+
+
+
+function  changeSettleMethod2(){
+	var sele=$("#RENT_OR_RATE").val();
+	var a={};
+	a["even_rent"]={"rate":1,"rent":1,"knowing_rent":1};
+	a["even_corpus"]={"rate":1,"corpus_period":1,"knowing_corpus":1};
+	a["even_rent_rate"]={"rate":1};
+	a["even_corpus_rate"]={"rate":1,"corpus_period":1,"knowing_corpus":1};
+	a["even_interest"]={"rate":1,"rent":1};
+	a["car_even_rent"]={"rate":1};
+	a["car_even_interest"]={"rate":1};
+	a["even_rent_day"]={"rate":1,"rent":1,"knowing_rent":1,"rent_period":1,"rent_period_360":1};
+	a["even_subsection"]={"rate":1};
+	a["irregular_rent"]={"rate":1};
+	a[""]={};
+	
+	//***********设置租金推算方法
+	var settleMethod=getItemValue(0,0,"SETTLE_METHOD");
+
+	$("#RENT_OR_RATE").empty();
+	$(rentOrRateOption).each(function(){
+		var value=$(this).attr("value");
+		if(value.length==0||a[settleMethod][value]==1){
+			$("#RENT_OR_RATE").append(this);
+		}
+	});
+	$("#RENT_OR_RATE").val(sele);
+	if(count>0){
+		$("#RENT_OR_RATE").val("rate");
+	}
+	//**********设置还款间隔
+	var incomeValue=$("#INCOME_NUMBER_YEAR").val();
+	$("#INCOME_NUMBER_YEAR").empty();
+	if(calcRules['method'][settleMethod]&&calcRules['method'][settleMethod]['PayFrequencyType']){
+		var incomerNumber=calcRules['method'][settleMethod]['PayFrequencyType'];
+		incomerNumber=incomerNumber.split(",");
+		var inco={};
+		for(var i=0;i<incomerNumber.length;i++){
+			inco[incomerNumber[i]]="1";
+		}
+		$(incomeNumberYear).each(function(){
+			var value=$(this).attr("value");
+			if(value.length==0||inco[value]==1){
+				$("#INCOME_NUMBER_YEAR").append(this);
+			}
+		});
+		$("#INCOME_NUMBER_YEAR").val(incomeValue);
+		if(count>0&&incomerNumber.length>0){
+			$("#INCOME_NUMBER_YEAR").val(incomerNumber[0]);
+			$("#INCOME_NUMBER_YEAR").change();
+		}
+	}else{
+		$(incomeNumberYear).each(function(){
+			$("#INCOME_NUMBER_YEAR").append(this);
+		});
+		$("#INCOME_NUMBER_YEAR").val(incomeValue);
+	}
+	
+}
+
+function changeRateType(){
+	var a={};
+	//a["fixed"]={"fixed":1,"add":1};
+	//a["base"]={"fixed":1,"add":1};
+	a["fixed"]={"fixed":1,"calculation":1,"add":1};
+	a["base"]={"fixed":1,"calculation":1,"add":1};
+	a["proportion"]={"fixed":1,"calculation":1,"add":1};
+	a["add"]={"fixed":1,"calculation":1,"add":1};
+	
+	var RATE_FLOAT_TYPE=getItemValue(0,0,"RATE_FLOAT_TYPE");
+	var adjustTypeValue=getItemValue(0,0,"ADJUST_TYPE");
+	$("#ADJUST_TYPE").empty();
+	$(adjustType).each(function(){
+		var value=$(this).attr("value");
+		if(value.length==0||a[RATE_FLOAT_TYPE][value]==1){
+			$("#ADJUST_TYPE").append(this);
+		}
+	});
+	$("#ADJUST_TYPE").val(adjustTypeValue);
+	/* if(count>0||adjustTypeValue==""){
+		$("#ADJUST_TYPE").val("fixed");
+	} */
+}
+
+//根据金额算比例
+function getRatioByMoney(e){
+	if(e.value === "") {
+		setItemValue(0, 0, e.id, "0");
+	}
+	var equipAmt = getItemValue(0,0,"EQUIP_AMT");//设备款
+	var cleanLeaseMoney = getItemValue(0,0,"CLEAN_LEASE_MONEY");//融资额
+	var fundRules = calcRules["fund"];
+	var firstPayment = getItemValue(0,0,"FIRST_PAYMENT");//首付款
+	//计算总价款
+	var allMoney = Number(equipAmt) + Number(getItemValue(0, 0, "INSURANCE_PREMIUM")) + Number(getItemValue(0, 0, "OTHER_MONEY"));
+	if(getItemValue(0, 0, "FIRST_PAYMENT_RATIO_0")) {
+		var calcMoney = 0;
+		if(fundRules["FIRST_PAYMENT"]["ratioFee"] == "EquipEndAmt"){//比例参照项
+			calcMoney = cleanLeaseMoney;
+		}else if(fundRules["FIRST_PAYMENT"]["ratioFee"] == "TOTAL_ALL"){//比例参照项
+			calcMoney = allMoney;
+		}else{
+			calcMoney = equipAmt;
+		}
+		firstPayment = Number(getItemValue(0, 0, "FIRST_PAYMENT_RATIO_0")) / 100 * Number(calcMoney);
+	} else {
+		firstPayment = 0;
+	}
+	//计算融资额
+	setItemValue(0, 0, "TOTAL_ALL", allMoney + "");
+	cleanLeaseMoney = allMoney - firstPayment;
+	setItemValue(0, 0, "CLEAN_LEASE_MONEY", cleanLeaseMoney + "")
+	
+	for(var key in fundRules){
+		if(key=="EQUIP_AMT"){
+			continue;
+		}
+		var fundMoney=getItemValue(0,0,key);//金额
+		var fundRatio=getItemValue(0,0,key+"_RATIO");//  比例
+		var fundFina=getItemValue(0,0,key+"_FINA");//   是否参与融资
+		if(fundFina == "finatype02" || fundFina == "finatype03"){
+			setItemValue(0,0,"CLEAN_LEASE_MONEY",Number(cleanLeaseMoney)+Number(fundMoney));
+			cleanLeaseMoney = Number(cleanLeaseMoney)+Number(fundMoney);
+		}
+		
+		var money=0;
+		if(fundRules[key]["ratioFee"]=="EquipEndAmt"){//比例参照项
+			money=cleanLeaseMoney;
+		}else if(fundRules[key]["ratioFee"]=="TOTAL_ALL"){//比例参照项
+			money=allMoney;
+		}else{
+			money=equipAmt;
+		}
+		if(fundRules[key]["ratioType"]=="InputMode03"){//互算
+			if(e.id==key){
+				if(Number(equipAmt)!=0){
+					fundRatio=Number(fundMoney/money*100).toFixed(6);
+				}else{
+					fundRatio=Number(0).toFixed(6);
+				}
+				setValue(key+"_RATIO",fundRatio);
+				$("#"+key+"_RATIO_0").val(Number(fundRatio).toFixed(2));
+			}else{
+				setValue(key,Number(money*fundRatio/100).toFixed(2));
+			}
+		}else if(fundRules[key]["ratioType"]=="InputMode02"){//比例算金额
+			setValue(key,Number(money*fundRatio/100).toFixed(2));
+		}else{
+			if(Number(equipAmt)!=0){
+				fundRatio=Number(fundMoney/money*100).toFixed(6);
+			}else{
+				fundRatio=Number(0).toFixed(6);
+			}
+			setValue(key+"_RATIO",fundRatio);
+			if(fundRules[key]["isShowRatio"]!="false"){
+				$("#"+key+"_RATIO_0").val(Number(fundRatio).toFixed(2));
+			}
+		}
+	}
+	cautionMoney();
+}
+//根据比例算金额
+function getMoneyByRatio(e){
+	var colRatio=e.id;
+	var ratio=e.value;
+	var col=colRatio.replace('_RATIO_0','');
+	if(ratio!='')$(e).val(FormatKNumber(ratio,2));
+	var equipAmt=getItemValue(0,0,"EQUIP_AMT");//设备款
+	var cleanLeaseMoney=getItemValue(0,0,"CLEAN_LEASE_MONEY");//融资额
+	var fundRules=calcRules["fund"];
+	var firstPayment=getItemValue(0,0,"FIRST_PAYMENT");//首付款
+	var money=0;
+	if(col=="FIRST_PAYMENT"){
+		firstPayment=Number(equipAmt*ratio/100).toFixed(2);
+		setValue(col+"_RATIO",ratio);
+		setValue(col,firstPayment);
+		getRatioByMoney(e);
+	}else{
+		if(fundRules[col]["ratioFee"]=="EquipEndAmt"){//比例参照项
+			money=cleanLeaseMoney;
+		}else{
+			money=equipAmt;
+		}
+		setValue(col+"_RATIO",ratio);
+		setValue(col,Number(money*ratio/100).toFixed(2));
+	}
+	cautionMoney();
+}
+
+function setValue(colName,value){
+	setItemValue(0,0,colName,value);
+}
+
+function changeCorpusRatio(){
+	var corpusRatio = getItemValue(0,0,"CORPUS_RATIO");
+	var firstPaymentRatio = getItemValue(0,0,"FIRST_PAYMENT_RATIO");
+	if(corpusRatio < 0){
+		alert("期限内本金比例不能小于0");
+		return;
+	}
+	if(Number(firstPaymentRatio) + Number(corpusRatio) > 100){
+		alert("期限内本金比例+首付比例不能大于100%");
+		return;
+	}
+	setItemValue(0,0,"CORPUS",(Number(getItemValue(0,0,"EQUIP_AMT"))*Number(corpusRatio)/100).toFixed(2));
+}
+
+function saveRecord(sPostEvents){
+	if(getItemValue(0,0,"PURCHASE_TAX") < 0){
+		alert("购置税不能小于0");
+		return;
+	}
+	if(getItemValue(0,0,"INSURANCE_PREMIUM") < 0){
+		alert("保险费不能小于0");
+		return;
+	}
+	if(getItemValue(0,0,"INCIDENTAL") < 0){
+		alert("杂费不能小于0");
+		return;
+	}
+	if(getItemValue(0,0,"FACTORY_ACCESSORIES") < 0){
+		alert("原厂配件费不能小于0");
+		return;
+	}
+	var corpusRatio = getItemValue(0,0,"CORPUS_RATIO");
+	var firstPaymentRatio = getItemValue(0,0,"FIRST_PAYMENT_RATIO");
+	if(corpusRatio < 0){
+		alert("期限内本金比例不能小于0");
+		return;
+	}
+	if(Number(firstPaymentRatio) + Number(corpusRatio) > 100){
+		alert("期限内本金比例+首付比例不能大于100%");
+		return;
+	}
+	//设备款大于0
+	var equipAmt = getItemValue(0,getRow(),"EQUIP_AMT");
+	if(!equipAmt || Number(equipAmt) <= 0){
+		alert('设备款需大于0 ！！！');
+		return ;
+	}
+	var cleanLeaseMoney = getItemValue(0,getRow(),"CLEAN_LEASE_MONEY");
+	if(!cleanLeaseMoney || Number(cleanLeaseMoney) <= 0){
+		alert('融资额需大于0 ！！！');
+		return ;
+	}
+	var incomeNumebr = getItemValue(0,getRow(),"INCOME_NUMBER");
+	if(incomeNumebr && Number(incomeNumebr) <= 0){
+		alert('还租次数需大于0 ！！！');
+		return ;
+	}
+	
+	var startDate=getItemValue(0,getRow(),"START_DATE");
+	var FIRST_PLAN_DATE=getItemValue(0,getRow(),"FIRST_PLAN_DATE");
+	var SECOND_PLAN_DATE=getItemValue(0,getRow(),"SECOND_PLAN_DATE");
+	if(SECOND_PLAN_DATE&&FIRST_PLAN_DATE&&SECOND_PLAN_DATE<FIRST_PLAN_DATE){
+		alert("第二期租金计划日期不能小于第一期租金计划日期！");
+		return ;
+	}
+	if(FIRST_PLAN_DATE&&startDate&&FIRST_PLAN_DATE<startDate){
+		alert("第一期租金计划日期不能小于起租日！");
+		return ;
+	}
+	
+	//已知本金已知租金，判断保存后的租金和本地是否跟净融资额匹配？
+	var rentOrRate = getItemValue(0,getRow(),"RENT_OR_RATE");
+	var cleanLeaseMoney = getItemValue(0,getRow(),"CLEAN_LEASE_MONEY");
+	var equipEndValue = getItemValue(0,getRow(),"EQUIP_END_VALUE");
+	if(rentOrRate.indexOf('knowing') > -1||rentOrRate.indexOf('period')>-1){
+		var result =  AsControl.RunJavaMethod("com.tenwa.reckon.executor.CreateTransactionExecutor","checkKnowingConfig","flowunid=<%=flowunid%>,plannumber=<%=plannumber%>,calType=<%=calType%>,planCName=<%=planCName%>,rentOrRate="+rentOrRate+",cleanLeasemoney="+cleanLeaseMoney+",equipEndValue="+equipEndValue);
+		if(result){
+			alert(result);
+			return;
+		}
+	}
+	// 如果是不规则租金测算的话，那么仅保存商务报价。
+	var settleMethod = getItemValue(0,getRow(),"SETTLE_METHOD");
+	if(settleMethod == 'irregular_rent'){
+		as_save("myiframe0");	
+	}else{
+		as_save("myiframe0","run()");	
+		
+	}
+}
+function run()
+{
+	var result =  AsControl.RunJavaMethod("com.tenwa.reckon.executor.CreateTransactionExecutor","runOnhire","flowunid=<%=flowunid%>,plannumber=<%=plannumber%>,calType=<%=calType%>,productId=<%=productId%>");
+	document.all("frame_list").src = document.all("frame_list").src;
+	if(result.info){
+		for(var p in result.info){
+			setItemValue(0,getRow(),p.toUpperCase(),result.info[p]);
+		}
+	}
+	if(result.message){
+		alert(result.message);
+	}
+}
+//strInterval 增加日期类型  ,num 数量 ,date 起始日期
+function dateAdd(strInterval, num, date){
+    date =  arguments[2] || new Date();
+    switch (strInterval) {
+        case 's' :return new Date(date.getTime() + (1000 * num)); 
+        case 'n' :return new Date(date.getTime() + (60000 * num)); 
+        case 'h' :return new Date(date.getTime() + (3600000 * num)); 
+        case 'd' :return new Date(date.getTime() + (86400000 * num)); 
+        case 'w' :return new Date(date.getTime() + ((86400000 * 7) * num)); 
+        case 'm' :return new Date(date.getFullYear(), (date.getMonth()) + num, date.getDate(), date.getHours(), date.getMinutes(), date.getSeconds()); 
+        case 'y' :return new Date((date.getFullYear() + num), date.getMonth(), date.getDate(), date.getHours(), date.getMinutes(), date.getSeconds()); 
+    } 
+} 
+//在input框后设置比例
+function setItemRatio(fieldName,unit){
+	var dwname=0;
+	var rowindex=0;
+	if(!isNaN(dwname))dwname = "myiframe" + dwname;
+	var dwindex = dwname.substring(8);
+	var sColIndex = getColIndexFromName(fieldName);
+	var oSpanInput = document.getElementById("Ratio_" + sColIndex);
+	oSpanInput.innerHTML = unit;
+}
+//设置可编辑
+function setEnable(ids){
+	var id=ids.split(",");
+	for(var i=0;i<id.length;i++){
+		setItemDisabled(0,getRow(),id[i],false);
+		getObj(0,id[i]).style.backgroundColor="";
+	}
+}
+//设置只读
+function setDisable(ids){
+	var id=ids.split(",");
+	for(var i=0;i<id.length;i++){
+		setItemDisabled(0,getRow(),id[i],true);
+		getObj(0,id[i]).style.backgroundColor="#EBEBE4";
+	}
+}
+
+//保证金事件
+function cautionMoney(){
+	var cautionMoney = getItemValue(0,getRow(),"CAUTION_MONEY");//保证金
+	var cautionDeductionMoney = getItemValue(0,getRow(),"CAUTION_DEDUCTION_MONEY");//保证金抵扣
+	var cautionMoneyRemain=getItemValue(0,getRow(),"CAUTION_MONEY_REMAIN");//保证金退还
+	if(Number(cautionMoneyRemain)==Number(cautionMoney)-Number(cautionDeductionMoney)){
+		return ;
+	}
+	cautionDeductionMoney = cautionMoney;//保证金抵扣
+	setItemValue(0,0,"CAUTION_DEDUCTION_MONEY",cautionDeductionMoney);
+	cautionMoneyRemain=Number(cautionMoney)-Number(cautionDeductionMoney);//保证金退还
+	if(cautionMoneyRemain<0){
+		setItemValue(0,0,"CAUTION_DEDUCTION_MONEY",cautionMoney);
+		alert("保证金退还金额填写过大!");
+		return;
+	}else{
+		setItemValue(0,0,"CAUTION_MONEY_REMAIN",cautionMoneyRemain);
+	}
+	if(!getItemValue(0,getRow(),"CAUTION_MONEY_REMAIN")){
+		setItemValue(0,0,"CAUTION_MONEY_REMAIN","0");
+	}
+}
+//保证金抵扣事件
+function cautionDeductionMoney(){
+	var cautionMoney = getItemValue(0,getRow(),"CAUTION_MONEY");//保证金
+	var cautionDeductionMoney = getItemValue(0,getRow(),"CAUTION_DEDUCTION_MONEY");//保证金抵扣
+	var cautionMoneyRemain=Number(cautionMoney)-Number(cautionDeductionMoney);//保证金退还
+	if(cautionMoneyRemain<0){
+		setItemValue(0,0,"CAUTION_DEDUCTION_MONEY",cautionMoney);
+		setItemValue(0,0,"CAUTION_MONEY_REMAIN","0");
+		alert("保证金退还金额填写过大!");
+		return;
+	}else{
+		setItemValue(0,0,"CAUTION_MONEY_REMAIN",cautionMoneyRemain);
+	}
+	if(!getItemValue(0,getRow(),"CAUTION_MONEY_REMAIN")){
+		setItemValue(0,0,"CAUTION_MONEY_REMAIN","0");
+	}
+}
+//利率计算方式    租金计算方式
+function changeRateFloat(){
+	CalcControl.RateFloatTypeView();
+	CalcControl.RateFloatTypeInit();
+	changeRateType();
+}
+
+//期初期末
+function changePeriod(){
+	CalcControl.PeriodTypeView();
+	CalcControl.PeriodTypeInit();
+}
+//改变还款间隔
+function changeIncomeNumber(){
+	CalcControl.IncomeNumberView();
+	CalcControl.IncomeNumberInit();
+}
+//改变还款月数
+function changeIntervalMonth(){
+	CalcControl.InitLsaseTerm();
+	var leaseAmtDate = getItemValue(0,getRow(),"LEASE_AMT_DATE");
+	if(leaseAmtDate){
+		CalcControl.InitStartDate();
+	}
+}
+//改变还租次数
+function changeNumber(){
+	CalcControl.InitLsaseTerm();
+}
+//改变宽限期
+function changeGrace(){
+	CalcControl.InitLsaseTerm();
+}
+//改变基准利率
+function changeBaseRate(){
+	CalcControl.RateFloatTypeInit();
+}
+//改变利率调整值
+function changeRateFloatAmt(){
+	CalcControl.RateFloatTypeInit();
+}
+//改变投放日
+function changeLeaseAmtDate(){
+	CalcControl.InitStartDate();
+}
+//改变起租日
+function changeStartDate(){
+	CalcControl.InitFistPlanDate();
+}
+//改变第一期租金计划日期
+function changeFistPlanDate(){
+	CalcControl.InitSecondPlanDate();
+}
+
+//租金推算方法
+function rentOrRateChange(){
+	CalcControl.RentOrRateInit();
+	CalcControl.RentOrRateView();
+	
+	//document.all("frame_list_knowing").src = document.all("frame_list_knowing").src;
+	if(count > 0){
+		AsControl.RunJavaMethod("com.tenwa.reckon.executor.CreateTransactionExecutor","runDelteKnowing","flowunid=<%=flowunid%>,plannumber=<%=plannumber%>,planCName=<%=planCName%>,calType=<%=calType%>");
+
+	} 
+}
+
+
+
+function changeSettleMethod3(){
+	var method="<%=dwTemp.getData().get("SETTLE_METHOD")%>";
+	//按计算方式 显示按钮  和分段测算录入页面
+	document.all("A_Group_even_subsection").style.display="none";
+	if(method=='even_subsection'){
+		document.all("A_Group_even_subsection").style.display="block";
+	}
+	<%-- var  param="CompClientID=<%=compClientID%>&flowunid=<%=flowunid%>&plannumber=<%=plannumber%>&planCName=<%=planCName%>&IsHistory=<%=ishistory%>&NodeNo=<%=nodeNo%>&calType=<%=calType%>&method="+method;
+	AsControl.OpenView("/Accounting/LoanSimulation/condition_plan.jsp",param, "frame_list"); --%>
+	
+	var rentOrRate  ="<%=dwTemp.getData().get("RENT_OR_RATE")%>";//租金推算方式
+	document.all("A_Group_calc_config").style.display="none";
+	if(rentOrRate == 'knowing_rent'){//已知租金规则  只能固定利率  
+		document.all("A_Group_calc_config").style.display="block";
+		var  param="CompClientID=<%=compClientID%>&flowunid=<%=flowunid%>&plannumber=<%=plannumber%>&planCName=<%=planCName%>&IsHistory=<%=ishistory%>&NodeNo=<%=nodeNo%>&calType=<%=calType%>";
+		AsControl.OpenView("/Accounting/LoanSimulation/KnowConfigList.jsp",param,"frame_list_knowing");
+	}else if(rentOrRate== 'knowing_corpus'){//已知本金规则
+		document.all("A_Group_calc_config").style.display="block";
+		var  param="CompClientID=<%=compClientID%>&flowunid=<%=flowunid%>&plannumber=<%=plannumber%>&planCName=<%=planCName%>&IsHistory=<%=ishistory%>&NodeNo=<%=nodeNo%>&calType=<%=calType%>";
+		AsControl.OpenView("/Accounting/LoanSimulation/KnowConfigList.jsp",param,"frame_list_knowing");
+	}else if(rentOrRate=='rent_period'||rentOrRate=='rent_period_360'){//已知租金表
+		document.all("A_Group_calc_config").style.display="block";
+		var  param="CompClientID=<%=compClientID%>&flowunid=<%=flowunid%>&plannumber=<%=plannumber%>&planCName=<%=planCName%>&IsHistory=<%=ishistory%>&NodeNo=<%=nodeNo%>&calType=<%=calType%>";
+		AsControl.OpenView("/Accounting/LoanSimulation/reriod/LCCalcReriodList.jsp",param,"frame_list_knowing");
+	}else if(rentOrRate=='corpus_period'){//已知本金表
+		document.all("A_Group_calc_config").style.display="block";
+		var  param="CompClientID=<%=compClientID%>&flowunid=<%=flowunid%>&plannumber=<%=plannumber%>&planCName=<%=planCName%>&IsHistory=<%=ishistory%>&NodeNo=<%=nodeNo%>&calType=<%=calType%>";
+		AsControl.OpenView("/Accounting/LoanSimulation/reriod/LCCalcReriodList.jsp",param,"frame_list_knowing");
+	}
+	//日期
+	//计划日期
+	var plan;
+	if(method=="even_subsection"||method=="irregular_rent"||method==""){
+		plan="";
+	}else{
+	 	plan=calcRules['method'][method]["date_proc"].split(",");
+	}
+	var planflag={};
+	for(var i=0;i<plan.length;i++){
+		if(plan[i]==1){
+			showItem(0,"FIRST_PLAN_DATE");
+			//setItemRequired(0,"FIRST_PLAN_DATE",true);
+			planflag["FIRST_PLAN_DATE"]=0;
+		}
+		if(plan[i]==4){
+			showItem(0,"SECOND_PLAN_DATE");
+			//setItemRequired(0,"SECOND_PLAN_DATE",true);
+			planflag["SECOND_PLAN_DATE"]=0;
+		}
+		if(plan[i]==2){
+			showItem(0,"LAST_PLAN_DATE")
+			//setItemRequired(0,"LAST_PLAN_DATE",true);
+			planflag["LAST_PLAN_DATE"]=0;
+		}
+		if(plan[i]==3){
+			showItem(0,"PLAN_DATE_HOILDAY")
+			//setItemRequired(0,"PLAN_DATE_HOILDAY",true);
+			planflag["PLAN_DATE_HOILDAY"]=0;
+		}
+	}
+	var plana=["PLAN_DATE_HOILDAY","SECOND_PLAN_DATE","LAST_PLAN_DATE","PLAN_DATE_HOILDAY"];
+	for(var i=0;i<plana.length;i++){
+		if(planflag[plana[i]]!=0){
+			hideItem(0,plana[i]);
+			//setItemRequired(0,plana[i],false);
+		}
+	}
+	//计息日期
+	var interest;
+	if(method=="even_subsection"||method=="irregular_rent"||method==""){
+		interest="";
+	}else{
+		interest=calcRules['method'][method]["interest_date_proc"].split(",");
+	}
+	var interestflag={};
+	for(var i=0;i<interest.length;i++){
+		if(interest[i]==1){
+			showItem(0,"FIRST_INTEREST_DATE");
+			//setItemRequired(0,"FIRST_INTEREST_DATE",true);
+			interestflag["FIRST_INTEREST_DATE"]=0;
+		}
+		if(interest[i]==2){
+			showItem(0,"LAST_INTEREST_DATA")
+			//setItemRequired(0,"LAST_INTEREST_DATA",true);
+			interestflag["LAST_INTEREST_DATA"]=0;
+		}
+		if(interest[i]==3){
+			showItem(0,"INTEREST_DATE_HOLIDAY")
+			//setItemRequired(0,"INTEREST_DATE_HOLIDAY",true);
+			interestflag["INTEREST_DATE_HOLIDAY"]=0;
+		}
+	}
+	var interesta=["FIRST_INTEREST_DATE","LAST_INTEREST_DATA","INTEREST_DATE_HOLIDAY"];
+	for(var i=0;i<interesta.length;i++){
+		if(interestflag[interesta[i]]!=0){
+			hideItem(0,interesta[i]);
+			//setItemRequired(0,interesta[i],false);
+		}
+	}
+	var isShowRate;
+	if(method=="even_subsection"||method=="irregular_rent"||method==""){
+		isShowRate="";
+	}else{
+		isShowRate=calcRules['method'][method]["isShowRate"];
+	}
+	if(isShowRate=="Y"){
+		showItem(0,"RATE");
+		showItem(0,"ADDITIONAL_RATE");
+		//setItemRequired(0,"RATE",true);
+		//setItemRequired(0,"ADDITIONAL_RATE",true);
+	}else{
+		hideItem(0,"RATE");
+		hideItem(0,"ADDITIONAL_RATE");
+		//setItemRequired(0,"RATE",false);
+		//setItemRequired(0,"ADDITIONAL_RATE",false);
+	}
+}
+var ischeck=true;
+function checkModified(){
+	 var sUnloadMessage = "\n\r当前页面内容已经被修改，\n\r按“取消”则留在当前页，然后再按当前页上的“保存”按钮以保存修改过的数据，\n\r按“确定”则不保存修改过的数据并且离开当前页．";
+	 if(!ischeck){
+		 return true;
+	 }
+	 if(as_isPageChanged()){
+		 return confirm(sUnloadMessage);
+	 }
+	 return true;
+}
+var fundError={};
+ function showErrors(tableIndex){
+	var list = $("#myiframe0").validate().errorList;
+	document.getElementById("messageBox").style.display='block';
+	var iExtCount = 8;
+	if(list.length<=iExtCount){
+		$("#showpart").hide();
+		$("#mobtn").hide();
+		$("#hidbtn").hide();
+	}else{
+		$("#showpart").hide();
+		$("#hidbtn").hide();
+	}
+	for(var ii=0;ii<list.length;ii++){
+		var ele_error = document.createElement("li");
+		var errmsg = fundError[list[ii].element.getAttribute('name')];;
+		ele_error.innerHTML = "<a href='javascript:void(0)' target='_self' element_name='"+list[ii].element.getAttribute('name')+"'>" + errmsg + "</a>";
+	
+		if(ii>=iExtCount){
+			document.getElementById("ul_error_1").appendChild(ele_error);
+		}else{
+			document.getElementById("ul_error_0").appendChild(ele_error);
+		}
+		var eventHander = function(e){
+			var sourceObj = e.srcElement?e.srcElement:e.target;
+			try{
+				document.getElementsByName(sourceObj.getAttribute("element_name"))[0].focus();
+			}catch(ex){
+				//alert('该控件无法聚焦');
+			}
+	    };
+		if(window.attachEvent)//IE
+			ele_error.childNodes[0].attachEvent("onclick", eventHander );
+	    else{
+	    	//FF
+	    	ele_error.childNodes[0].addEventListener("click", eventHander, false);
+	    }
+	}
+	if(list && list[0] && list[0].element){
+		try{
+			document.getElementsByName(list[0].element.getAttribute("name"))[0].focus();
+		}
+		catch(e){}
+	}
+} 
+jQuery.validator.prototype.showLabel = function(element,message){
+	var id=element.getAttribute('id');
+	if(element.getAttribute('errorInfo')){
+		message=element.getAttribute('errorInfo');
+		element.removeAttribute('errorInfo');
+	}
+	fundError[id]=message;
+};
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
diff --git a/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java b/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java
index ad4370d92..393bd7865 100644
--- a/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java
+++ b/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java
@@ -212,8 +212,11 @@ public class FundFundPlanExecutor {
 	  					BizObjectManager bomLFP = JBOFactory.getBizObjectManager(LC_FUND_PLAN.CLASS_NAME,tx);
 	  					BizObject boLFP = bomLFP.createQuery("select id from O where contract_id='"+tcb.getCb().getContractId()+"' and fee_type='"+item.getItemNo()+"'")
 	  											.getSingleResult(true);
-	  					ffcp.setId(boLFP.getAttribute("id").getString());
-	  					bomLFP.deleteObject(boLFP);
+	  					if(boLFP!=null){
+	  						ffcp.setId(boLFP.getAttribute("id").getString());
+		  					bomLFP.deleteObject(boLFP);
+	  					}
+	  					
 	  				}
 	  				ffcp.setFeeType(item.getItemNo());//费用类型
 	  				ffcp.setPlanList("1");

From 7f291340e99b8d09f7382e03f2d2960cb79f58c4 Mon Sep 17 00:00:00 2001
From: xiezhiwen <xiezhiwen@xiezhiwen-PC>
Date: Wed, 26 Sep 2018 21:15:15 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=87=AD=E8=AF=81=E7=9B=B8=E5=85=B3--?=
 =?UTF-8?q?=E8=B5=B7=E7=A7=9F=E5=89=8D=E7=94=9F=E6=88=90=E5=87=AD=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...reateVoucherActualPaymentCarTradition.java | 168 ++++++++++++++++++
 .../CreateVoucherActualPaymentTradition.java  | 168 ++++++++++++++++++
 ...tractActualPaymentCarTraditionVoucher.java |  39 ++++
 ...ContractActualPaymentTraditionVoucher.java |  51 ++++++
 .../ContractBeforeOnhireToVoucher.java        |  15 +-
 .../ContractOnhireVoucher.java                |   2 +-
 .../CreateVoucherToBeforeOnhire.java          |  36 ++--
 .../ContractGetMoneyToCautionMoney.java       |  22 +++
 .../ContractGetMoneyToEquip.java              |  22 +++
 ...ctGetMoneyToEquipAddInsuranceAddOther.java |  22 +++
 ...eyToEquipAddInsuranceAddOtherSubFirst.java |  22 +++
 .../ContractGetMoneyToEquipAddOthers.java     |  28 +++
 .../ContractGetMoneyToEquipNoTax.java         |  22 +++
 .../ContractGetMoneyToEquipTax.java           |  22 +++
 .../ContractGetMoneyToFirstPayment.java       |  22 +++
 .../ContractGetMoneyToFirstPaymentNoTax.java  |  22 +++
 .../ContractGetMoneyToFirstPaymentTax.java    |  22 +++
 .../ContractGetMoneyToHandlingCharge.java     |  22 +++
 ...ContractGetMoneyToHandlingChargeNoTax.java |  22 +++
 .../ContractGetMoneyToHandlingChargeTax.java  |  22 +++
 .../ContractGetMoneyToInsuranceAddOther.java  |  22 +++
 ...tractGetMoneyToInsuranceAddOtherNoTax.java |  22 +++
 ...ontractGetMoneyToInsuranceAddOtherTax.java |  22 +++
 .../ContractGetMoneyToMoney.java              |  20 +++
 .../ContractGetMoneyToMoneyNoTax.java         |  20 +++
 .../ContractGetMoneyToMoneyTax.java           |  20 +++
 .../ContractGetMoneyToOther.java              |  23 +++
 .../ContractGetMoneyToOtherNoTax.java         |  22 +++
 .../ContractGetMoneyToOtherTax.java           |  22 +++
 .../ContractGetMoneyToOthersMath.java         |  34 ++++
 .../serviceImp/CreateVoucherServiceImpl.java  |   9 +-
 31 files changed, 981 insertions(+), 26 deletions(-)
 create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentCarTradition.java
 create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentTradition.java
 create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractActualPaymentCarTraditionVoucher.java
 create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractActualPaymentTraditionVoucher.java
 create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToCautionMoney.java
 create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquip.java
 create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddInsuranceAddOther.java
 create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddInsuranceAddOtherSubFirst.java
 create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddOthers.java
 create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipNoTax.java
 create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipTax.java
 create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToFirstPayment.java
 create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToFirstPaymentNoTax.java
 create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToFirstPaymentTax.java
 create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToHandlingCharge.java
 create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToHandlingChargeNoTax.java
 create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToHandlingChargeTax.java
 create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOther.java
 create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOtherNoTax.java
 create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOtherTax.java
 create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoney.java
 create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoneyNoTax.java
 create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoneyTax.java
 create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOther.java
 create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOtherNoTax.java
 create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOtherTax.java
 create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOthersMath.java

diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentCarTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentCarTradition.java
new file mode 100644
index 000000000..ebf50b945
--- /dev/null
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentCarTradition.java
@@ -0,0 +1,168 @@
+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.app.util.ProductParamUtil;
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.awe.util.Transaction;
+import com.amarsoft.dict.als.cache.CacheLoaderFactory;
+import com.tenwa.comm.util.jboutil.DataOperatorUtil;
+import com.tenwa.flow.baseBussion.BaseBussiness;
+import com.tenwa.voucher.serviceImp.CreateVoucherServiceImpl;
+/**
+ * 汽车传统实际付款后生成凭证
+ * @author xiezhiwen
+ */
+public class CreateVoucherActualPaymentCarTradition extends BaseBussiness{
+	
+	public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception {
+		// 创建事物
+		Transaction Sqlca =null;
+		Sqlca =  Transaction.createTransaction(CacheLoaderFactory.getDataSource());
+		Map<String,String> map=new HashMap<String, String>();
+		Map<String,String> param=new HashMap<String, String>();
+		// 定义全局对象
+		String EQUIP_AMT=null;					// 设备款
+		String EQUIP_AMT_NOTAX=null;			// 设备款(不含税)
+		String EQUIP_AMT_TAX=null;				// 设备款(税金)
+		String FIRST_PAYMENT=null;				// 首付款
+		String FIRST_PAYMENT_NOTAX=null;		// 首付款(不含税)
+		String FIRST_PAYMENT_TAX=null;			// 首付款(税金)
+		String INSURANCE_PREMIUM_ADD_OTHER=null;// 保险费+其他金额
+		String INSURANCE_PREMIUM_ADD_OTHER_NOTAX=null;// 保险费+其他金额(不含税)
+		String INSURANCE_PREMIUM_ADD_OTHER_TAX=null;  // 保险费+其他金额(税金)
+		String EQUIP_INSURACE_PREMIUM_OTHER=null;// 设备款+保险费+其他
+		String OTHERSMONEY=null; 				// 车款+保险+其他-首付款
+		String ACCOUNT_DATE=null; 				// 会计日期
+		String FACT_DATE=null; 					// 实际付款日期
+		String CONTRACT_ID=null; 				// 合同id
+		String CONTRACT_NUMBER=null; 			// 合同编号
+		String PROJECT_NAME=null; 				// 项目名称
+		String LEAS_FORM=null; 					// 项目类别
+		String DISTRIBUTOR_ID=null; 			// 经销商编号
+		String DISTRIBUTOR_NAME=null; 			// 经销商名称
+		String CUSTOMERID=null; 				// 客户编号
+		String CUSTOMERNAME=null; 				// 客户名称
+		String CUSTOMERTYPE=null; 				// 客户类别
+		String BUSINESSTYPE=null; 				// 业务类型
+		String ACC_NUMBER=null;					// 银行账号
+		String PRODUCT_ID=null; 				// 产品编号
+		String sql="";
+		
+		sql="SELECT LCCT.EQUIP_AMT,ROUND(LCCT.EQUIP_AMT / getTax (LCI.LEAS_FORM,'本金',LCI.INPUTTIME),2) AS EQUIP_AMT_NOTAX,(LCCT.EQUIP_AMT - ROUND(LCCT.EQUIP_AMT / getTax (LCI.LEAS_FORM,'本金',LCI.INPUTTIME),2)) AS EQUIP_AMT_TAX,LCCT.FIRST_PAYMENT,ROUND(LCCT.FIRST_PAYMENT/getTax(LCI.LEAS_FORM,'本金',LCI.INPUTTIME),2) AS FIRST_PAYMENT_NOTAX,(LCCT.FIRST_PAYMENT - ROUND(LCCT.FIRST_PAYMENT/getTax(LCI.LEAS_FORM,'本金',LCI.INPUTTIME),2)) AS FIRST_PAYMENT_TAX,(LCCT.INSURANCE_PREMIUM+LCCT.OTHER_MONEY) AS INSURANCE_PREMIUM_ADD_OTHER,ROUND((LCCT.INSURANCE_PREMIUM+LCCT.OTHER_MONEY) / getTax (LCI.LEAS_FORM,'本金',LCI.INPUTTIME),2) AS INSURANCE_PREMIUM_ADD_OTHER_NOTAX,((LCCT.INSURANCE_PREMIUM+LCCT.OTHER_MONEY) - ROUND((LCCT.INSURANCE_PREMIUM+LCCT.OTHER_MONEY) / getTax (LCI.LEAS_FORM,'本金',LCI.INPUTTIME),2)) AS INSURANCE_PREMIUM_ADD_OTHER_TAX,(LCCT.EQUIP_AMT+LCCT.INSURANCE_PREMIUM+LCCT.OTHER_MONEY) AS EQUIP_INSURACE_PREMIUM_OTHER,(LCCT.EQUIP_AMT+LCCT.INSURANCE_PREMIUM+LCCT.OTHER_MONEY-LCCT.FIRST_PAYMENT) AS OTHERSMONEY,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 AS DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,lfit.ACC_NUMBER,LPDI.PRODUCT_ID FROM LC_CALC_CONDITION LCCT INNER JOIN (SELECT contract_id,FLOWUNID,MIN(ACC_NUMBER) ACC_NUMBER FROM lc_fund_income_temp WHERE fee_type = 'feetype10' GROUP BY contract_id,FLOWUNID) lfit ON lfit.contract_id = lcct.contract_id LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.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 LEFT JOIN LB_PRODUCT_INFO LPDI ON LPDI.PRODUCT_ID = LPI.PRODUCT_ID WHERE LCI.BUSINESSTYPE = '3' AND lfit.FLOWUNID = :FLOWUNID ";
+		
+		param.clear();
+		map.put("FLOWUNID", FlowUnid);
+		
+		// 查询sql, 将结果集封装到map中
+		List<Map<String,String>> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map);
+
+		// 创建生成凭证的类对象
+		CreateVoucherServiceImpl vs=new CreateVoucherServiceImpl();
+		
+		// 设置常用参数
+		String VOUCHER_TYPE="1"; // 凭证分类 	金蝶
+		String userid ="admin";
+		
+		for (int i=0;i<dataList.size();i++){
+			EQUIP_AMT=dataList.get(i).get("EQUIP_AMT").toString();// 设备款
+			EQUIP_AMT_NOTAX=dataList.get(i).get("EQUIP_AMT_NOTAX").toString();// 设备款(不含税)
+			EQUIP_AMT_TAX=dataList.get(i).get("EQUIP_AMT_TAX").toString();// 设备款(税金)
+			FIRST_PAYMENT=dataList.get(i).get("FIRST_PAYMENT").toString();// 首付款
+			FIRST_PAYMENT_NOTAX=dataList.get(i).get("FIRST_PAYMENT_NOTAX").toString();// 首付款(不含税)
+			FIRST_PAYMENT_TAX=dataList.get(i).get("FIRST_PAYMENT_TAX").toString();// 首付款(税金)
+			INSURANCE_PREMIUM_ADD_OTHER=dataList.get(i).get("INSURANCE_PREMIUM_ADD_OTHER").toString();// 保险+其他
+			INSURANCE_PREMIUM_ADD_OTHER_NOTAX=dataList.get(i).get("INSURANCE_PREMIUM_ADD_OTHER_NOTAX").toString();// 保险+其他(不含税)
+			INSURANCE_PREMIUM_ADD_OTHER_TAX=dataList.get(i).get("INSURANCE_PREMIUM_ADD_OTHER_TAX").toString();// 保险+其他(税金)
+			EQUIP_INSURACE_PREMIUM_OTHER=dataList.get(i).get("EQUIP_INSURACE_PREMIUM_OTHER").toString();// 其他金额(不含税)
+			OTHERSMONEY=dataList.get(i).get("OTHERSMONEY").toString();
+			ACCOUNT_DATE=dataList.get(i).get("ACCOUNT_DATE").toString();// 会计日期
+			FACT_DATE=dataList.get(i).get("FACT_DATE").toString();// 实际付款日期
+			CONTRACT_ID=dataList.get(i).get("CONTRACT_ID").toString();// 合同id
+			CONTRACT_NUMBER=dataList.get(i).get("CONTRACT_NUMBER").toString();// 合同编号
+			PROJECT_NAME=dataList.get(i).get("PROJECT_NAME").toString();// 项目名称
+			LEAS_FORM=dataList.get(i).get("LEAS_FORM").toString();// 项目类别
+			DISTRIBUTOR_ID=dataList.get(i).get("DISTRIBUTOR_ID").toString();// 经销商编号
+			DISTRIBUTOR_NAME=dataList.get(i).get("DISTRIBUTOR_NAME").toString();// 经销商名称
+			CUSTOMERID=dataList.get(i).get("CUSTOMERID").toString();// 客户编号
+			CUSTOMERNAME=dataList.get(i).get("CUSTOMERNAME").toString();// 客户名称
+			CUSTOMERTYPE=dataList.get(i).get("CUSTOMERTYPE").toString();// 客户类别
+			BUSINESSTYPE=dataList.get(i).get("BUSINESSTYPE").toString();// 业务类型
+			ACC_NUMBER=dataList.get(i).get("ACC_NUMBER").toString();// 银行账号
+			PRODUCT_ID=dataList.get(i).get("PRODUCT_ID").toString();// 产品编号
+			
+			String YesOrNo= ProductParamUtil.getProductParameterValue(PRODUCT_ID, "PRD0315", "CAUTION_MONEY", "isBalance");
+			if("PZ2018092500000198".equals(VOUCHERNO) || "PZ2018092600000236".equals(VOUCHERNO)) {
+				if("yes".equals(YesOrNo)) {
+					EQUIP_AMT="0.00";					// 设备款
+					EQUIP_AMT_NOTAX="0.00";				// 设备款(不含税)
+					EQUIP_AMT_TAX="0.00";				// 设备款(税金)
+					FIRST_PAYMENT="0.00";				// 首付款
+					FIRST_PAYMENT_NOTAX="0.00";			// 首付款(不含税)
+					FIRST_PAYMENT_TAX="0.00";			// 首付款(税金)
+					INSURANCE_PREMIUM_ADD_OTHER="0.00";	// 保险费+其他金额
+					INSURANCE_PREMIUM_ADD_OTHER_NOTAX="0.00";// 保险费+其他金额(不含税)
+					INSURANCE_PREMIUM_ADD_OTHER_TAX="0.00";  // 保险费+其他金额(税金)
+					EQUIP_INSURACE_PREMIUM_OTHER="0.00";// 设备款+保险费+其他
+					OTHERSMONEY="0.00"; 				// 车款+保险+其他-首付款
+				}
+			}
+			// 将数据封装到定义好的map集合中
+			param.put("EQUIP_AMT",EQUIP_AMT);
+			param.put("EQUIP_AMT_NOTAX",EQUIP_AMT_NOTAX);
+			param.put("EQUIP_AMT_TAX",EQUIP_AMT_TAX);
+			param.put("FIRST_PAYMENT",FIRST_PAYMENT);
+			param.put("FIRST_PAYMENT_NOTAX",FIRST_PAYMENT_NOTAX);
+			param.put("FIRST_PAYMENT_TAX",FIRST_PAYMENT_TAX);
+			param.put("INSURANCE_PREMIUM_ADD_OTHER",INSURANCE_PREMIUM_ADD_OTHER);
+			param.put("INSURANCE_PREMIUM_ADD_OTHER_NOTAX",INSURANCE_PREMIUM_ADD_OTHER_NOTAX);
+			param.put("INSURANCE_PREMIUM_ADD_OTHER_TAX",INSURANCE_PREMIUM_ADD_OTHER_TAX);
+			param.put("EQUIP_INSURACE_PREMIUM_OTHER",EQUIP_INSURACE_PREMIUM_OTHER);
+			param.put("OTHERSMONEY",OTHERSMONEY);
+			param.put("ACCOUNT_DATE",ACCOUNT_DATE);
+			param.put("FACT_DATE",FACT_DATE);
+			param.put("CONTRACT_ID",CONTRACT_ID);
+			param.put("CONTRACT_NUMBER",CONTRACT_NUMBER);
+			param.put("PROJECT_NAME",PROJECT_NAME);
+        	param.put("LEAS_FORM",LEAS_FORM);
+        	param.put("DISTRIBUTOR_ID",DISTRIBUTOR_ID);
+        	param.put("DISTRIBUTOR_NAME",DISTRIBUTOR_NAME);
+        	param.put("CUSTID",CUSTOMERID);
+        	param.put("CUSTNAME",CUSTOMERNAME);
+        	param.put("CUSTOMERTYPE",CUSTOMERTYPE);
+        	param.put("BUSINESSTYPE",BUSINESSTYPE);
+        	param.put("ACC_NUMBER",ACC_NUMBER);
+        	param.put("PRODUCT_ID",PRODUCT_ID);
+        	param.put("VOUCHERNO",VOUCHERNO);
+        	
+        	// 判断传统类型
+        	if("3".equals(BUSINESSTYPE)){
+        		// 融资租赁资产
+        		param.put("LEASFORMASSET", "02/03/05/06"); 
+        		// 业务一部
+            	param.put("DEPT", "01"); 
+            	// 传统融资租赁收入
+            	param.put("LEASINCOMEFORM", "05"); 
+            }
+            
+            param.put("BUSINESSTYPE", "06");
+        	param.put("FlowUnid", FlowUnid);
+        	map.clear();
+        	map.put("PROJ_TYPE", LEAS_FORM);
+        	map.put("VOUCHER_NO", VOUCHERNO);
+        	BizObject vouch=DataOperatorUtil.getSingleJBO(LV_VOUCHER_CONFIG.CLASS_NAME, map, Sqlca);
+        	if(vouch!=null){
+        	 	vs.createVoucher(vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), LEAS_FORM, VOUCHER_TYPE, userid,param, Sqlca);
+            }
+		}
+		if(Sqlca!=null){
+			Sqlca.commit();
+		}
+        String sMessage="true"; 
+		return sMessage;
+	}
+}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentTradition.java
new file mode 100644
index 000000000..9a49bc4e4
--- /dev/null
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentTradition.java
@@ -0,0 +1,168 @@
+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.app.util.ProductParamUtil;
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.awe.util.Transaction;
+import com.amarsoft.dict.als.cache.CacheLoaderFactory;
+import com.tenwa.comm.util.jboutil.DataOperatorUtil;
+import com.tenwa.flow.baseBussion.BaseBussiness;
+import com.tenwa.voucher.serviceImp.CreateVoucherServiceImpl;
+/**
+ * 传统实际付款后生成凭证
+ * @author xiezhiwen
+ */
+public class CreateVoucherActualPaymentTradition extends BaseBussiness{
+	
+	public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception {
+		// 创建事物
+		Transaction Sqlca =null;
+		Sqlca =  Transaction.createTransaction(CacheLoaderFactory.getDataSource());
+		Map<String,String> map=new HashMap<String, String>();
+		Map<String,String> param=new HashMap<String, String>();
+		// 定义全局对象
+		String EQUIP_AMT=null;					// 设备款
+		String EQUIP_AMT_NOTAX=null;			// 设备款(不含税)
+		String EQUIP_AMT_TAX=null;				// 设备款(税金)
+		String FIRST_PAYMENT=null;				// 首付款
+		String HANDLING_CHARGE_MONEY=null; 		// 手续费
+		String HANDLING_CHARGE_MONEY_NOTAX=null;// 不含税手续费
+		String HANDLING_CHARGE_MONEY_TAX=null; 	// 手续费税金
+		String CAUTION_MONEY=null; 				// 保证金
+		String OTHER_MONEY=null; 				// 其它金额
+		String OTHER_MONEY_NOTAX=null; 			// 其它金额(不含税)
+		String OTHER_MONEY_TAX=null; 			// 其它金额(税金)
+		String ACCOUNT_DATE=null; 				// 会计日期
+		String FACT_DATE=null; 					// 实际付款日期
+		String CONTRACT_ID=null; 				// 合同id
+		String CONTRACT_NUMBER=null; 			// 合同编号
+		String PROJECT_NAME=null; 				// 项目名称
+		String LEAS_FORM=null; 					// 项目类别
+		String DISTRIBUTOR_ID=null; 			// 经销商编号
+		String DISTRIBUTOR_NAME=null; 			// 经销商名称
+		String CUSTOMERID=null; 				// 客户编号
+		String CUSTOMERNAME=null; 				// 客户名称
+		String CUSTOMERTYPE=null; 				// 客户类别
+		String BUSINESSTYPE=null; 				// 业务类型
+		String ACC_NUMBER=null;					// 银行账号
+		String PRODUCT_ID=null; 				// 产品编号
+		String sql="";
+		
+		sql="SELECT LCCT.EQUIP_AMT,ROUND(LCCT.EQUIP_AMT/getTax(LCI.LEAS_FORM,'本金',LCI.INPUTTIME),2) AS EQUIP_AMT_NOTAX,(LCCT.EQUIP_AMT-ROUND(LCCT.EQUIP_AMT/getTax(LCI.LEAS_FORM,'本金',LCI.INPUTTIME),2)) AS EQUIP_AMT_TAX,LCCT.FIRST_PAYMENT,LCCT.HANDLING_CHARGE_MONEY,ROUND(LCCT.HANDLING_CHARGE_MONEY/ getTax(LCI.LEAS_FORM,'手续费',LCI.INPUTTIME),2) AS HANDLING_CHARGE_MONEY_NOTAX,(LCCT.HANDLING_CHARGE_MONEY - ROUND(LCCT.HANDLING_CHARGE_MONEY/ getTax(LCI.LEAS_FORM,'手续费',LCI.INPUTTIME),2)) AS HANDLING_CHARGE_MONEY_TAX,IFNULL(LCCT.CAUTION_MONEY, 0) AS CAUTION_MONEY,LCCT.OTHER_MONEY,ROUND(LCCT.OTHER_MONEY/getTax(LCI.LEAS_FORM,'本金',LCI.INPUTTIME),2) AS OTHER_MONEY_NOTAX,(LCCT.OTHER_MONEY - ROUND(LCCT.OTHER_MONEY/getTax(LCI.LEAS_FORM,'本金',LCI.INPUTTIME),2)) AS OTHER_MONEY_TAX,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 AS DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,lfit.ACC_NUMBER,LPDI.PRODUCT_ID FROM LC_CALC_CONDITION LCCT INNER JOIN (SELECT contract_id,FLOWUNID,MIN(ACC_NUMBER) ACC_NUMBER FROM lc_fund_income_temp WHERE fee_type = 'feetype10' GROUP BY contract_id,FLOWUNID) lfit ON lfit.contract_id = lcct.contract_id LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.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 LEFT JOIN LB_PRODUCT_INFO LPDI ON LPDI.PRODUCT_ID=LPI.PRODUCT_ID WHERE LCI.BUSINESSTYPE='2' AND lfit.FLOWUNID = :FLOWUNID ";
+		
+		param.clear();
+		map.put("FLOWUNID", FlowUnid);
+		
+		// 查询sql, 将结果集封装到map中
+		List<Map<String,String>> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map);
+
+		// 创建生成凭证的类对象
+		CreateVoucherServiceImpl vs=new CreateVoucherServiceImpl();
+		
+		// 设置常用参数
+		String VOUCHER_TYPE="1"; // 凭证分类 	金蝶
+		String userid ="admin";
+		
+		for (int i=0;i<dataList.size();i++){
+			EQUIP_AMT=dataList.get(i).get("EQUIP_AMT").toString();// 设备款
+			EQUIP_AMT_NOTAX=dataList.get(i).get("EQUIP_AMT_NOTAX").toString();// 设备款(不含税)
+			EQUIP_AMT_TAX=dataList.get(i).get("EQUIP_AMT_TAX").toString();// 设备款(税金)
+			FIRST_PAYMENT=dataList.get(i).get("FIRST_PAYMENT").toString();// 首付款
+			HANDLING_CHARGE_MONEY=dataList.get(i).get("HANDLING_CHARGE_MONEY").toString();// 手续费
+			HANDLING_CHARGE_MONEY_NOTAX=dataList.get(i).get("HANDLING_CHARGE_MONEY_NOTAX").toString();// 不含税手续费
+			HANDLING_CHARGE_MONEY_TAX=dataList.get(i).get("HANDLING_CHARGE_MONEY_TAX").toString();// 手续费税金
+			CAUTION_MONEY=dataList.get(i).get("CAUTION_MONEY").toString();// 保证金
+			OTHER_MONEY=dataList.get(i).get("OTHER_MONEY").toString();// 其他金额
+			OTHER_MONEY_NOTAX=dataList.get(i).get("OTHER_MONEY_NOTAX").toString();// 其他金额(不含税)
+			OTHER_MONEY_TAX=dataList.get(i).get("OTHER_MONEY_TAX").toString();// 其他金额(税金)
+			ACCOUNT_DATE=dataList.get(i).get("ACCOUNT_DATE").toString();// 会计日期
+			FACT_DATE=dataList.get(i).get("FACT_DATE").toString();// 实际付款日期
+			CONTRACT_ID=dataList.get(i).get("CONTRACT_ID").toString();// 合同id
+			CONTRACT_NUMBER=dataList.get(i).get("CONTRACT_NUMBER").toString();// 合同编号
+			PROJECT_NAME=dataList.get(i).get("PROJECT_NAME").toString();// 项目名称
+			LEAS_FORM=dataList.get(i).get("LEAS_FORM").toString();// 项目类别
+			DISTRIBUTOR_ID=dataList.get(i).get("DISTRIBUTOR_ID").toString();// 经销商编号
+			DISTRIBUTOR_NAME=dataList.get(i).get("DISTRIBUTOR_NAME").toString();// 经销商名称
+			CUSTOMERID=dataList.get(i).get("CUSTOMERID").toString();// 客户编号
+			CUSTOMERNAME=dataList.get(i).get("CUSTOMERNAME").toString();// 客户名称
+			CUSTOMERTYPE=dataList.get(i).get("CUSTOMERTYPE").toString();// 客户类别
+			BUSINESSTYPE=dataList.get(i).get("BUSINESSTYPE").toString();// 业务类型
+			ACC_NUMBER=dataList.get(i).get("ACC_NUMBER").toString();// 银行账号
+			PRODUCT_ID=dataList.get(i).get("PRODUCT_ID").toString();// 产品编号
+			
+			String YesOrNo= ProductParamUtil.getProductParameterValue(PRODUCT_ID, "PRD0315", "CAUTION_MONEY", "isBalance");
+			if("PZ2018092500000161".equals(VOUCHERNO) || "PZ2018092600000225".equals(VOUCHERNO)) {
+				if("yes".equals(YesOrNo)) {
+					EQUIP_AMT="0.00";					// 设备款
+					EQUIP_AMT_NOTAX="0.00";				// 设备款(不含税)
+					EQUIP_AMT_TAX="0.00";				// 设备款(税金)
+					FIRST_PAYMENT="0.00";				// 首付款
+					HANDLING_CHARGE_MONEY="0.00"; 		// 手续费
+					HANDLING_CHARGE_MONEY_NOTAX="0.00"; // 不含税手续费
+					HANDLING_CHARGE_MONEY_TAX="0.00"; 	// 手续费税金
+					CAUTION_MONEY="0.00"; 				// 保证金
+					OTHER_MONEY="0.00"; 				// 其它金额
+					OTHER_MONEY_NOTAX="0.00"; 			// 其它金额(不含税)
+					OTHER_MONEY_TAX="0.00"; 			// 其它金额(税金)
+				}
+			}
+			// 将数据封装到定义好的map集合中
+			param.put("EQUIP_AMT",EQUIP_AMT);
+			param.put("EQUIP_AMT_NOTAX",EQUIP_AMT_NOTAX);
+			param.put("EQUIP_AMT_TAX",EQUIP_AMT_TAX);
+			param.put("FIRST_PAYMENT",FIRST_PAYMENT);
+			param.put("HANDLING_CHARGE_MONEY",HANDLING_CHARGE_MONEY);
+			param.put("HANDLING_CHARGE_MONEY_NOTAX",HANDLING_CHARGE_MONEY_NOTAX);
+			param.put("HANDLING_CHARGE_MONEY_TAX",HANDLING_CHARGE_MONEY_TAX);
+			param.put("CAUTION_MONEY",CAUTION_MONEY);
+			param.put("OTHER_MONEY",OTHER_MONEY);
+			param.put("OTHER_MONEY_NOTAX",OTHER_MONEY_NOTAX);
+			param.put("OTHER_MONEY_TAX",OTHER_MONEY_TAX);
+			param.put("ACCOUNT_DATE",ACCOUNT_DATE);
+			param.put("FACT_DATE",FACT_DATE);
+			param.put("CONTRACT_ID",CONTRACT_ID);
+			param.put("CONTRACT_NUMBER",CONTRACT_NUMBER);
+			param.put("PROJECT_NAME",PROJECT_NAME);
+        	param.put("LEAS_FORM",LEAS_FORM);
+        	param.put("DISTRIBUTOR_ID",DISTRIBUTOR_ID);
+        	param.put("DISTRIBUTOR_NAME",DISTRIBUTOR_NAME);
+        	param.put("CUSTID",CUSTOMERID);
+        	param.put("CUSTNAME",CUSTOMERNAME);
+        	param.put("CUSTOMERTYPE",CUSTOMERTYPE);
+        	param.put("BUSINESSTYPE",BUSINESSTYPE);
+        	param.put("ACC_NUMBER",ACC_NUMBER);
+        	param.put("PRODUCT_ID",PRODUCT_ID);
+        	param.put("VOUCHERNO",VOUCHERNO);
+        	
+        	// 判断传统类型
+        	if("2".equals(BUSINESSTYPE)){
+        		// 融资租赁资产
+        		param.put("LEASFORMASSET", "02/03/05/06"); 
+        		// 业务一部
+            	param.put("DEPT", "01"); 
+            	// 传统融资租赁收入
+            	param.put("LEASINCOMEFORM", "06"); 
+            }
+            
+            param.put("BUSINESSTYPE", "06");
+        	param.put("FlowUnid", FlowUnid);
+        	map.clear();
+        	map.put("PROJ_TYPE", LEAS_FORM);
+        	map.put("VOUCHER_NO", VOUCHERNO);
+        	BizObject vouch=DataOperatorUtil.getSingleJBO(LV_VOUCHER_CONFIG.CLASS_NAME, map, Sqlca);
+        	if(vouch!=null){
+        	 	vs.createVoucher(vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), LEAS_FORM, VOUCHER_TYPE, userid,param, Sqlca);
+            }
+		}
+		if(Sqlca!=null){
+			Sqlca.commit();
+		}
+        String sMessage="true"; 
+		return sMessage;
+	}
+}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractActualPaymentCarTraditionVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractActualPaymentCarTraditionVoucher.java
new file mode 100644
index 000000000..38b037fc8
--- /dev/null
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractActualPaymentCarTraditionVoucher.java
@@ -0,0 +1,39 @@
+package com.tenwa.voucher.CreateVoucherProcess.CreateVoucherMethodSettle;
+
+import com.amarsoft.awe.util.Transaction;
+import com.tenwa.flow.baseBussion.BaseBussiness;
+import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherActualPaymentCarTradition;
+/**
+ * 实际付款流程生成凭证(汽车传统)
+ * @author xiezhiwen
+ */
+public class ContractActualPaymentCarTraditionVoucher  extends BaseBussiness {
+
+	public Object run(Transaction Sqlca) throws Exception {
+		this.initBussinessParam(Sqlca);
+		String FlowUnid=this.getAttribute("FlowUnid").toString();
+		
+		CreateVoucherActualPaymentCarTradition cvap = new CreateVoucherActualPaymentCarTradition();
+		// 差额放款和非差额放款共有部分
+		cvap.CreateVoucher(FlowUnid, "PZ2018092500000196"); // 购置融资租赁资产-汽车--回租
+		cvap.CreateVoucher(FlowUnid, "PZ2018092600000234"); // 购置融资租赁资产-汽车--直租
+		
+		cvap.CreateVoucher(FlowUnid, "PZ2018092500000197"); // 购置融资租赁资产-其他--回租
+		cvap.CreateVoucher(FlowUnid, "PZ2018092600000235"); // 购置融资租赁资产-其他--直租
+		
+		// 非差额放款部分
+		cvap.CreateVoucher(FlowUnid, "PZ2018092500000198"); // 给经销商放款-非差额放款--回租
+		cvap.CreateVoucher(FlowUnid, "PZ2018092600000236"); // 给经销商放款-非差额放款--直租
+		
+		// 差额放款部分
+		cvap.CreateVoucher(FlowUnid, "PZ2018092500000200"); // 经销商支付的预付款(首付)--回租
+		cvap.CreateVoucher(FlowUnid, "PZ2018092600000237"); // 经销商支付的预付款(首付)--直租
+		
+		cvap.CreateVoucher(FlowUnid, "PZ2018092500000201"); // 给经销商放款-首付冲抵--回租
+		cvap.CreateVoucher(FlowUnid, "PZ2018092600000238"); // 给经销商放款-首付冲抵--直租
+		
+		cvap.CreateVoucher(FlowUnid, "PZ2018092500000199"); // 给经销商放款-差额放款--回租
+		cvap.CreateVoucher(FlowUnid, "PZ2018092600000239"); // 给经销商放款-差额放款--直租
+		return "true";
+	}
+}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractActualPaymentTraditionVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractActualPaymentTraditionVoucher.java
new file mode 100644
index 000000000..a1d6ea970
--- /dev/null
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractActualPaymentTraditionVoucher.java
@@ -0,0 +1,51 @@
+package com.tenwa.voucher.CreateVoucherProcess.CreateVoucherMethodSettle;
+
+import com.amarsoft.awe.util.Transaction;
+import com.tenwa.flow.baseBussion.BaseBussiness;
+import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherActualPaymentTradition;
+/**
+ * 实际付款流程生成凭证(传统)
+ * @author xiezhiwen
+ */
+public class ContractActualPaymentTraditionVoucher  extends BaseBussiness {
+
+	public Object run(Transaction Sqlca) throws Exception {
+		this.initBussinessParam(Sqlca);
+		String FlowUnid=this.getAttribute("FlowUnid").toString();
+		
+		CreateVoucherActualPaymentTradition cvap = new CreateVoucherActualPaymentTradition();
+		// 差额放款和非差额放款共有部分
+		cvap.CreateVoucher(FlowUnid, "PZ2018092500000159"); // 购置融资租赁资产-传统租赁资产--回租
+		cvap.CreateVoucher(FlowUnid, "PZ2018092600000223"); // 购置融资租赁资产-传统租赁资产--直租
+		
+		cvap.CreateVoucher(FlowUnid, "PZ2018092500000160"); // 购置融资租赁资产-其他--回租
+		cvap.CreateVoucher(FlowUnid, "PZ2018092600000224"); // 购置融资租赁资产-其他--直租
+		
+		// 非差额放款部分
+		cvap.CreateVoucher(FlowUnid, "PZ2018092500000161"); // 给经销商放款-非差额放款--回租
+		cvap.CreateVoucher(FlowUnid, "PZ2018092600000225"); // 给经销商放款-非差额放款--直租
+		
+		// 差额放款部分
+		cvap.CreateVoucher(FlowUnid, "PZ2018092500000162"); // 经销商支付的预付款(首付)--回租
+		cvap.CreateVoucher(FlowUnid, "PZ2018092600000226"); // 经销商支付的预付款(首付)--直租
+		
+		cvap.CreateVoucher(FlowUnid, "PZ2018092500000163"); // 给经销商放款-首付冲抵--回租
+		cvap.CreateVoucher(FlowUnid, "PZ2018092600000227"); // 给经销商放款-首付冲抵--直租
+		
+		cvap.CreateVoucher(FlowUnid, "PZ2018092500000164"); // 客户记录保证金--回租
+		cvap.CreateVoucher(FlowUnid, "PZ2018092600000229"); // 客户记录保证金--直租
+		
+		cvap.CreateVoucher(FlowUnid, "PZ2018092500000165"); // 给经销商放款-保证金冲抵--回租
+		cvap.CreateVoucher(FlowUnid, "PZ2018092600000230"); // 给经销商放款-保证金冲抵--直租
+		
+		cvap.CreateVoucher(FlowUnid, "PZ2018092500000166"); // 收到客户手续费--回租
+		cvap.CreateVoucher(FlowUnid, "PZ2018092600000231"); // 收到客户手续费--直租
+		
+		cvap.CreateVoucher(FlowUnid, "PZ2018092500000167"); // 给经销商放款-手续费冲抵--回租
+		cvap.CreateVoucher(FlowUnid, "PZ2018092600000232"); // 给经销商放款-手续费冲抵--直租
+		
+		cvap.CreateVoucher(FlowUnid, "PZ2018092500000169"); // 给经销商放款-差额放款--回租
+		cvap.CreateVoucher(FlowUnid, "PZ2018092600000233"); // 给经销商放款-差额放款--直租
+		return "true";
+	}
+}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractBeforeOnhireToVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractBeforeOnhireToVoucher.java
index a4b5d852b..c058ff56d 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractBeforeOnhireToVoucher.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractBeforeOnhireToVoucher.java
@@ -12,16 +12,29 @@ public class ContractBeforeOnhireToVoucher  extends BaseBussiness {
 	public Object run(Transaction Sqlca) throws Exception {
 		this.initBussinessParam(Sqlca);
 		String FlowUnid=this.getAttribute("FlowUnid").toString();
-		CreateVoucherToBeforeOnhire cvbo=new CreateVoucherToBeforeOnhire();
+		CreateVoucherToBeforeOnhire cvbo = new CreateVoucherToBeforeOnhire();
 		// 传统
 		cvbo.CreateVoucher(FlowUnid, "PZ2018092500000156","feetype2"); // 收到客户保证金--回租
+		cvbo.CreateVoucher(FlowUnid, "PZ2018092600000244","feetype2"); // 收到客户保证金--直租
+		
 		cvbo.CreateVoucher(FlowUnid, "PZ2018092500000157","feetype1"); // 收到客户手续费--回租
+		cvbo.CreateVoucher(FlowUnid, "PZ2018092600000245","feetype1"); // 收到客户手续费--直租
+		
 		cvbo.CreateVoucher(FlowUnid, "PZ2018092500000158","feetype5"); // 收到客户预付款(首付)--回租
+		cvbo.CreateVoucher(FlowUnid, "PZ2018092600000246","feetype5"); // 收到客户预付款(首付)--直租
+		
 		// 汽车类传统
 		cvbo.CreateVoucher(FlowUnid, "PZ2018092500000192","feetype2"); // 收到客户记录保证金--回租
+		cvbo.CreateVoucher(FlowUnid, "PZ2018092600000240","feetype2"); // 收到客户记录保证金--直租
+		
 		cvbo.CreateVoucher(FlowUnid, "PZ2018092500000193","feetype1"); // 收到客户手续费--回租
+		cvbo.CreateVoucher(FlowUnid, "PZ2018092600000241","feetype1"); // 收到客户手续费--直租
+		
 		cvbo.CreateVoucher(FlowUnid, "PZ2018092500000194","feetype5"); // 收到客户预付款(首付)--回租
+		cvbo.CreateVoucher(FlowUnid, "PZ2018092600000242","feetype5"); // 收到客户预付款(首付)--直租
+		
 		cvbo.CreateVoucher(FlowUnid, "PZ2018092500000195","feetype24");// 记录GPS安装服务费（不参融）--回租
+		cvbo.CreateVoucher(FlowUnid, "PZ2018092600000243","feetype24");// 记录GPS安装服务费（不参融）--直租
 		return "true";
 	}
 }
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java
index e18a1d248..c09b8df0e 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java
@@ -8,7 +8,7 @@ import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoanDistributor;
 import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherToCommission;
 import com.tenwa.voucher.service.VoucherJavaParamService;
 /**
- * 起租相关凭证, 实际付款(汽车)流程借宿后生成
+ * 起租相关凭证, 实际付款(汽车)流程结束后生成
  * @author xiezhiwen
  */
 public class ContractOnhireVoucher  extends BaseBussiness {
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherToBeforeOnhire.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherToBeforeOnhire.java
index d69eba8de..6656e1db1 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherToBeforeOnhire.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherToBeforeOnhire.java
@@ -30,13 +30,11 @@ public class CreateVoucherToBeforeOnhire extends BaseBussiness {
 		String CONTRACT_ID = null;
 		String CONTRACT_NUMBER = null;
 		String PROJECT_NAME = null;
-		String leas_form = null;
+		String LEAS_FORM = null;
 		String DISTRIBUTOR_ID = null;
 		String DISTRIBUTOR_NAME = null;
-		String CARID = null;
-		String CARMODEL = null;
-		String CUSTID = null;
-		String CUSTNAME = null;
+		String CUSTOMERID = null;
+		String CUSTOMERNAME = null;
 		String CUSTOMERTYPE = null;
 		String BUSINESSTYPE = null;
 		String ACC_NUM = null;
@@ -54,9 +52,9 @@ public class CreateVoucherToBeforeOnhire extends BaseBussiness {
 		}
 		// 传统
 		if("PZ2018092500000156".equals(VOUCHERNO) || "PZ2018092500000157".equals(VOUCHERNO) || "PZ2018092500000158".equals(VOUCHERNO)) {
-			sql = "SELECT LFIT.FACT_MONEY AS MONEY,ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'"+tax_type+"',LCI.INPUTTIME),2) AS MONEYNOTAX,(LFIT.FACT_MONEY - ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'本金',LCI.INPUTTIME),2)) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LFIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.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 LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID WHERE LFIT.FEE_TYPE = :FEE_TYPE AND LCI.BUSINESSTYPE='2' AND LFIT.FLOWUNID = :FLOWUNID ";
+			sql = "SELECT LFIT.FACT_MONEY AS MONEY,ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'"+tax_type+"',LCI.INPUTTIME),2) AS MONEYNOTAX,(LFIT.FACT_MONEY - ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'"+tax_type+"',LCI.INPUTTIME),2)) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LFIT.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,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT.CONTRACT_ID = LCI.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 LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID WHERE LFIT.FEE_TYPE = :FEE_TYPE AND LCI.BUSINESSTYPE='2' AND LFIT.FLOWUNID = :FLOWUNID ";
 		}else {// 汽车类传统
-			sql = "SELECT LFIT.FACT_MONEY AS MONEY,ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'"+tax_type+"',LCI.INPUTTIME),2) AS MONEYNOTAX,(LFIT.FACT_MONEY - ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'本金',LCI.INPUTTIME),2)) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LFIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.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 LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID WHERE LFIT.FEE_TYPE = :FEE_TYPE AND LCI.BUSINESSTYPE='3' AND LFIT.FLOWUNID = :FLOWUNID ";
+			sql = "SELECT LFIT.FACT_MONEY AS MONEY,ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'"+tax_type+"',LCI.INPUTTIME),2) AS MONEYNOTAX,(LFIT.FACT_MONEY - ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'"+tax_type+"',LCI.INPUTTIME),2)) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LFIT.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,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT.CONTRACT_ID = LCI.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 LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID WHERE LFIT.FEE_TYPE = :FEE_TYPE AND LCI.BUSINESSTYPE='3' AND LFIT.FLOWUNID = :FLOWUNID ";
 		}
 		
 		if("feetype24".equals(fee_type)) {
@@ -81,13 +79,11 @@ public class CreateVoucherToBeforeOnhire extends BaseBussiness {
 				CONTRACT_ID = dataList.get(i).get("CONTRACT_ID").toString();
 				CONTRACT_NUMBER = dataList.get(i).get("CONTRACT_NUMBER").toString();
 				PROJECT_NAME = dataList.get(i).get("PROJECT_NAME").toString();
-				leas_form = dataList.get(i).get("LEAS_FORM").toString();
+				LEAS_FORM = dataList.get(i).get("LEAS_FORM").toString();
 				DISTRIBUTOR_ID = dataList.get(i).get("DISTRIBUTOR_ID");
 				DISTRIBUTOR_NAME = dataList.get(i).get("DISTRIBUTOR_NAME");
-				CARID = dataList.get(i).get("CARID");
-				CARMODEL = dataList.get(i).get("MODEL");
-				CUSTID = dataList.get(i).get("CUSTOMERID");
-				CUSTNAME = dataList.get(i).get("CUSTOMERNAME");
+				CUSTOMERID = dataList.get(i).get("CUSTOMERID");
+				CUSTOMERNAME = dataList.get(i).get("CUSTOMERNAME");
 				CUSTOMERTYPE = dataList.get(i).get("CUSTOMERTYPE");
 				BUSINESSTYPE = dataList.get(i).get("BUSINESSTYPE");
 				ACC_NUM = dataList.get(i).get("ACC_NUMBER");
@@ -100,13 +96,11 @@ public class CreateVoucherToBeforeOnhire extends BaseBussiness {
 				param.put("CONTRACT_ID", CONTRACT_ID);
 				param.put("CONTRACT_NUMBER", CONTRACT_NUMBER);
 				param.put("PROJECT_NAME", PROJECT_NAME);
-				param.put("LEAS_FORM", leas_form);
+				param.put("LEAS_FORM", LEAS_FORM);
 				param.put("DISTRIBUTOR_ID", DISTRIBUTOR_ID);
 				param.put("DISTRIBUTOR_NAME", DISTRIBUTOR_NAME);
-				param.put("CARID", CARID);
-				param.put("CARMODEL", CARMODEL);
-				param.put("CUSTID", CUSTID);
-				param.put("CUSTNAME", CUSTNAME);
+				param.put("CUSTID", CUSTOMERID);
+				param.put("CUSTNAME", CUSTOMERNAME);
 				param.put("CUSTOMERTYPE", CUSTOMERTYPE);
 				param.put("BUSINESSTYPE", BUSINESSTYPE);
 				param.put("ACC_NUMBER", ACC_NUM);
@@ -116,14 +110,14 @@ public class CreateVoucherToBeforeOnhire extends BaseBussiness {
 	        		// 融资租赁资产
 	    			param.put("LEASFORMASSET", "02/03/05/06"); 
 	    			// 部门,业务二部
-	    			param.put("DEPT", "02"); 
+	    			param.put("DEPT", "01"); 
 	    			// 传统融资租赁收入
         			param.put("LEASINCOMEFORM", "06"); 
 	            }else if("3".equals(BUSINESSTYPE)){
 	        		// 融资租赁资产
 	    			param.put("LEASFORMASSET", "04"); 
 	    			// 部门,业务二部
-	    			param.put("DEPT", "02"); 
+	    			param.put("DEPT", "01"); 
 	    			// 汽车类传统融资租赁收入
 	    			param.put("LEASINCOMEFORM", "05"); 
 	            }
@@ -132,14 +126,14 @@ public class CreateVoucherToBeforeOnhire extends BaseBussiness {
 				param.put("BUSINESSTYPE", "06");
 				param.put("FlowUnid", FlowUnid);
 				map.clear();
-				map.put("PROJ_TYPE", leas_form);
+				map.put("PROJ_TYPE", LEAS_FORM);
 				map.put("VOUCHER_NO", VOUCHERNO);
 				// 根据map中的参数, 查询LV_VOUCHER_CONFIG表数据
 				BizObject vouch = DataOperatorUtil.getSingleJBO(LV_VOUCHER_CONFIG.CLASS_NAME, map, Sqlca);
 				// 如果结果不为空, 
 				if (vouch != null) {
 					//将创建凭证的参数传入在下一层
-					vs.createVoucher(vouch.getAttribute("MODULAR_NUMBER").getString(),vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid, param,Sqlca);
+					vs.createVoucher(vouch.getAttribute("MODULAR_NUMBER").getString(),vouch.getAttribute("OWNED_COMPANY").getString(), LEAS_FORM, VOUCHER_TYPE, userid, param,Sqlca);
 				}
 			}
 		}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToCautionMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToCautionMoney.java
new file mode 100644
index 000000000..4a524b036
--- /dev/null
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToCautionMoney.java
@@ -0,0 +1,22 @@
+package com.tenwa.voucher.CreateVoucherProcess.VoucherGetMoneyForTradition;
+
+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;
+/**
+ * 获取保证金
+ * @author xiezhiwen
+ */
+public class ContractGetMoneyToCautionMoney implements VoucherJavaParamService{
+	public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
+		Map<String,String>returnValue=new HashMap<String,String>();
+		returnValue.putAll(param);
+		// 获取保证金
+		String CAUTION_MONEY=param.get("CAUTION_MONEY")==null?"0.00":param.get("CAUTION_MONEY");
+		returnValue.put("MONEY",CAUTION_MONEY);
+		return returnValue;
+	}
+}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquip.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquip.java
new file mode 100644
index 000000000..b167ec291
--- /dev/null
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquip.java
@@ -0,0 +1,22 @@
+package com.tenwa.voucher.CreateVoucherProcess.VoucherGetMoneyForTradition;
+
+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;
+/**
+ * 获取设备款
+ * @author xiezhiwen
+ */
+public class ContractGetMoneyToEquip implements VoucherJavaParamService{
+	public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
+		Map<String,String>returnValue=new HashMap<String,String>();
+		returnValue.putAll(param);
+		// 获取设备款
+		String EQUIP_AMT=param.get("EQUIP_AMT")==null?"0.00":param.get("EQUIP_AMT");
+		returnValue.put("MONEY",EQUIP_AMT);
+		return returnValue;
+	}
+}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddInsuranceAddOther.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddInsuranceAddOther.java
new file mode 100644
index 000000000..c01dd804a
--- /dev/null
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddInsuranceAddOther.java
@@ -0,0 +1,22 @@
+package com.tenwa.voucher.CreateVoucherProcess.VoucherGetMoneyForTradition;
+
+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;
+/**
+ * 设备+保险+其他
+ * @author xiezhiwen
+ */
+public class ContractGetMoneyToEquipAddInsuranceAddOther implements VoucherJavaParamService{
+	public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
+		Map<String,String>returnValue=new HashMap<String,String>();
+		returnValue.putAll(param);
+		// 获取设备款
+		String EQUIP_INSURACE_PREMIUM_OTHER=param.get("EQUIP_INSURACE_PREMIUM_OTHER")==null?"0.00":param.get("EQUIP_INSURACE_PREMIUM_OTHER");
+		returnValue.put("MONEY",EQUIP_INSURACE_PREMIUM_OTHER);
+		return returnValue;
+	}
+}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddInsuranceAddOtherSubFirst.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddInsuranceAddOtherSubFirst.java
new file mode 100644
index 000000000..7ac999967
--- /dev/null
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddInsuranceAddOtherSubFirst.java
@@ -0,0 +1,22 @@
+package com.tenwa.voucher.CreateVoucherProcess.VoucherGetMoneyForTradition;
+
+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;
+/**
+ * 设备+保险+其他-首付款
+ * @author xiezhiwen
+ */
+public class ContractGetMoneyToEquipAddInsuranceAddOtherSubFirst implements VoucherJavaParamService{
+	public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
+		Map<String,String>returnValue=new HashMap<String,String>();
+		returnValue.putAll(param);
+		// 获取设备款
+		String OTHERSMONEY=param.get("OTHERSMONEY")==null?"0.00":param.get("OTHERSMONEY");
+		returnValue.put("MONEY",OTHERSMONEY);
+		return returnValue;
+	}
+}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddOthers.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddOthers.java
new file mode 100644
index 000000000..dbb16374e
--- /dev/null
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddOthers.java
@@ -0,0 +1,28 @@
+package com.tenwa.voucher.CreateVoucherProcess.VoucherGetMoneyForTradition;
+
+import java.math.BigDecimal;
+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;
+/**
+ * 设备款+其他金额
+ * @author xiezhiwen
+ */
+public class ContractGetMoneyToEquipAddOthers implements VoucherJavaParamService{
+	public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
+		Map<String,String>returnValue=new HashMap<String,String>();
+		returnValue.putAll(param);
+		// 获取设备款
+		String EQUIP_AMT=param.get("EQUIP_AMT")==null?"0.00":param.get("EQUIP_AMT");
+		// 获取其它金额
+		String OTHER_MONEY=param.get("OTHER_MONEY")==null?"0.00":param.get("OTHER_MONEY");
+		
+		// 其他款项+设备款
+		BigDecimal FactMoney=new BigDecimal(EQUIP_AMT).add(new BigDecimal(OTHER_MONEY));
+		returnValue.put("MONEY",FactMoney.toString());
+		return returnValue;
+	}
+}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipNoTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipNoTax.java
new file mode 100644
index 000000000..d743e1d8b
--- /dev/null
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipNoTax.java
@@ -0,0 +1,22 @@
+package com.tenwa.voucher.CreateVoucherProcess.VoucherGetMoneyForTradition;
+
+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;
+/**
+ * 获取设备款(不含税)
+ * @author xiezhiwen
+ */
+public class ContractGetMoneyToEquipNoTax implements VoucherJavaParamService{
+	public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
+		Map<String,String>returnValue=new HashMap<String,String>();
+		returnValue.putAll(param);
+		// 获取设备款
+		String EQUIP_AMT_NOTAX=param.get("EQUIP_AMT_NOTAX")==null?"0.00":param.get("EQUIP_AMT_NOTAX");
+		returnValue.put("MONEY",EQUIP_AMT_NOTAX);
+		return returnValue;
+	}
+}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipTax.java
new file mode 100644
index 000000000..20aa09da3
--- /dev/null
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipTax.java
@@ -0,0 +1,22 @@
+package com.tenwa.voucher.CreateVoucherProcess.VoucherGetMoneyForTradition;
+
+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;
+/**
+ * 获取设备款(税金)
+ * @author xiezhiwen
+ */
+public class ContractGetMoneyToEquipTax implements VoucherJavaParamService{
+	public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
+		Map<String,String>returnValue=new HashMap<String,String>();
+		returnValue.putAll(param);
+		// 获取设备款
+		String EQUIP_AMT_TAX=param.get("EQUIP_AMT_TAX")==null?"0.00":param.get("EQUIP_AMT_TAX");
+		returnValue.put("MONEY",EQUIP_AMT_TAX);
+		return returnValue;
+	}
+}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToFirstPayment.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToFirstPayment.java
new file mode 100644
index 000000000..de432c84e
--- /dev/null
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToFirstPayment.java
@@ -0,0 +1,22 @@
+package com.tenwa.voucher.CreateVoucherProcess.VoucherGetMoneyForTradition;
+
+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;
+/**
+ * 获取首付款
+ * @author xiezhiwen
+ */
+public class ContractGetMoneyToFirstPayment implements VoucherJavaParamService{
+	public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
+		Map<String,String>returnValue=new HashMap<String,String>();
+		returnValue.putAll(param);
+		// 获取首付款
+		String FIRST_PAYMENT=param.get("FIRST_PAYMENT")==null?"0.00":param.get("FIRST_PAYMENT");
+		returnValue.put("MONEY",FIRST_PAYMENT);
+		return returnValue;
+	}
+}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToFirstPaymentNoTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToFirstPaymentNoTax.java
new file mode 100644
index 000000000..6e5551ff0
--- /dev/null
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToFirstPaymentNoTax.java
@@ -0,0 +1,22 @@
+package com.tenwa.voucher.CreateVoucherProcess.VoucherGetMoneyForTradition;
+
+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;
+/**
+ * 首付款(不含税)
+ * @author xiezhiwen
+ */
+public class ContractGetMoneyToFirstPaymentNoTax implements VoucherJavaParamService{
+	public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
+		Map<String,String>returnValue=new HashMap<String,String>();
+		returnValue.putAll(param);
+		// 首付款(不含税)
+		String FIRST_PAYMENT_NOTAX=param.get("FIRST_PAYMENT_NOTAX")==null?"0.00":param.get("FIRST_PAYMENT_NOTAX");
+		returnValue.put("MONEY",FIRST_PAYMENT_NOTAX);
+		return returnValue;
+	}
+}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToFirstPaymentTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToFirstPaymentTax.java
new file mode 100644
index 000000000..bb58b06de
--- /dev/null
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToFirstPaymentTax.java
@@ -0,0 +1,22 @@
+package com.tenwa.voucher.CreateVoucherProcess.VoucherGetMoneyForTradition;
+
+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;
+/**
+ * 首付款(税金)
+ * @author xiezhiwen
+ */
+public class ContractGetMoneyToFirstPaymentTax implements VoucherJavaParamService{
+	public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
+		Map<String,String>returnValue=new HashMap<String,String>();
+		returnValue.putAll(param);
+		// 首付款(税金)
+		String FIRST_PAYMENT_TAX=param.get("FIRST_PAYMENT_TAX")==null?"0.00":param.get("FIRST_PAYMENT_TAX");
+		returnValue.put("MONEY",FIRST_PAYMENT_TAX);
+		return returnValue;
+	}
+}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToHandlingCharge.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToHandlingCharge.java
new file mode 100644
index 000000000..9324dc22d
--- /dev/null
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToHandlingCharge.java
@@ -0,0 +1,22 @@
+package com.tenwa.voucher.CreateVoucherProcess.VoucherGetMoneyForTradition;
+
+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;
+/**
+ * 获取手续费
+ * @author xiezhiwen
+ */
+public class ContractGetMoneyToHandlingCharge implements VoucherJavaParamService{
+	public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
+		Map<String,String>returnValue=new HashMap<String,String>();
+		returnValue.putAll(param);
+		// 获取手续费
+		String HANDLING_CHARGE_MONEY=param.get("HANDLING_CHARGE_MONEY")==null?"0.00":param.get("HANDLING_CHARGE_MONEY");
+		returnValue.put("MONEY",HANDLING_CHARGE_MONEY);
+		return returnValue;
+	}
+}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToHandlingChargeNoTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToHandlingChargeNoTax.java
new file mode 100644
index 000000000..b4e98aa2b
--- /dev/null
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToHandlingChargeNoTax.java
@@ -0,0 +1,22 @@
+package com.tenwa.voucher.CreateVoucherProcess.VoucherGetMoneyForTradition;
+
+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;
+/**
+ * 获取手续费(不含税)
+ * @author xiezhiwen
+ */
+public class ContractGetMoneyToHandlingChargeNoTax implements VoucherJavaParamService{
+	public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
+		Map<String,String>returnValue=new HashMap<String,String>();
+		returnValue.putAll(param);
+		// 获取手续费(不含税) 
+		String HANDLING_CHARGE_MONEY_NOTAX=param.get("HANDLING_CHARGE_MONEY_NOTAX")==null?"0.00":param.get("HANDLING_CHARGE_MONEY_NOTAX");
+		returnValue.put("MONEY",HANDLING_CHARGE_MONEY_NOTAX);
+		return returnValue;
+	}
+}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToHandlingChargeTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToHandlingChargeTax.java
new file mode 100644
index 000000000..fa3bb3f3d
--- /dev/null
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToHandlingChargeTax.java
@@ -0,0 +1,22 @@
+package com.tenwa.voucher.CreateVoucherProcess.VoucherGetMoneyForTradition;
+
+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;
+/**
+ * 获取手续费(税金)
+ * @author xiezhiwen
+ */
+public class ContractGetMoneyToHandlingChargeTax implements VoucherJavaParamService{
+	public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
+		Map<String,String>returnValue=new HashMap<String,String>();
+		returnValue.putAll(param);
+		// 获取手续费(税金)
+		String HANDLING_CHARGE_MONEY_TAX=param.get("HANDLING_CHARGE_MONEY_TAX")==null?"0.00":param.get("HANDLING_CHARGE_MONEY_TAX");
+		returnValue.put("MONEY",HANDLING_CHARGE_MONEY_TAX);
+		return returnValue;
+	}
+}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOther.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOther.java
new file mode 100644
index 000000000..5ccac5085
--- /dev/null
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOther.java
@@ -0,0 +1,22 @@
+package com.tenwa.voucher.CreateVoucherProcess.VoucherGetMoneyForTradition;
+
+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;
+/**
+ * 保险+其他
+ * @author xiezhiwen
+ */
+public class ContractGetMoneyToInsuranceAddOther implements VoucherJavaParamService{
+	public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
+		Map<String,String>returnValue=new HashMap<String,String>();
+		returnValue.putAll(param);
+		// 获取设备款
+		String INSURANCE_PREMIUM_ADD_OTHER=param.get("INSURANCE_PREMIUM_ADD_OTHER")==null?"0.00":param.get("INSURANCE_PREMIUM_ADD_OTHER");
+		returnValue.put("MONEY",INSURANCE_PREMIUM_ADD_OTHER);
+		return returnValue;
+	}
+}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOtherNoTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOtherNoTax.java
new file mode 100644
index 000000000..1c7109ae7
--- /dev/null
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOtherNoTax.java
@@ -0,0 +1,22 @@
+package com.tenwa.voucher.CreateVoucherProcess.VoucherGetMoneyForTradition;
+
+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;
+/**
+ * 保险+其他(不含税)
+ * @author xiezhiwen
+ */
+public class ContractGetMoneyToInsuranceAddOtherNoTax implements VoucherJavaParamService{
+	public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
+		Map<String,String>returnValue=new HashMap<String,String>();
+		returnValue.putAll(param);
+		// 获取设备款
+		String INSURANCE_PREMIUM_ADD_OTHER_NOTAX=param.get("INSURANCE_PREMIUM_ADD_OTHER_NOTAX")==null?"0.00":param.get("INSURANCE_PREMIUM_ADD_OTHER_NOTAX");
+		returnValue.put("MONEY",INSURANCE_PREMIUM_ADD_OTHER_NOTAX);
+		return returnValue;
+	}
+}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOtherTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOtherTax.java
new file mode 100644
index 000000000..79defb5d9
--- /dev/null
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOtherTax.java
@@ -0,0 +1,22 @@
+package com.tenwa.voucher.CreateVoucherProcess.VoucherGetMoneyForTradition;
+
+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;
+/**
+ * 保险+其他(税金)
+ * @author xiezhiwen
+ */
+public class ContractGetMoneyToInsuranceAddOtherTax implements VoucherJavaParamService{
+	public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
+		Map<String,String>returnValue=new HashMap<String,String>();
+		returnValue.putAll(param);
+		// 保险+其他(税金)
+		String INSURANCE_PREMIUM_ADD_OTHER_TAX=param.get("INSURANCE_PREMIUM_ADD_OTHER_TAX")==null?"0.00":param.get("INSURANCE_PREMIUM_ADD_OTHER_TAX");
+		returnValue.put("MONEY",INSURANCE_PREMIUM_ADD_OTHER_TAX);
+		return returnValue;
+	}
+}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoney.java
new file mode 100644
index 000000000..5c91a7924
--- /dev/null
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoney.java
@@ -0,0 +1,20 @@
+package com.tenwa.voucher.CreateVoucherProcess.VoucherGetMoneyForTradition;
+
+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;
+/**
+ * 获取FACT_MONEY
+ * @author xiezhiwen
+ */
+public class ContractGetMoneyToMoney implements VoucherJavaParamService{
+	public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param) throws BusinessException {
+		Map<String,String>returnValue=new HashMap<String,String>();
+		returnValue.putAll(param);
+		returnValue.put("MONEY",param.get("FACT_MONEY"));
+		return returnValue;
+	}
+}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoneyNoTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoneyNoTax.java
new file mode 100644
index 000000000..06cc158e3
--- /dev/null
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoneyNoTax.java
@@ -0,0 +1,20 @@
+package com.tenwa.voucher.CreateVoucherProcess.VoucherGetMoneyForTradition;
+
+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;
+/**
+ * 获取INTERESTNOTAX
+ * @author xiezhiwen
+ */
+public class ContractGetMoneyToMoneyNoTax implements VoucherJavaParamService{
+	public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param) throws BusinessException {
+		Map<String,String>returnValue=new HashMap<String,String>();
+		returnValue.putAll(param);
+		returnValue.put("MONEY",param.get("INTERESTNOTAX"));
+		return returnValue;
+	}
+}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoneyTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoneyTax.java
new file mode 100644
index 000000000..3f3dc12ac
--- /dev/null
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoneyTax.java
@@ -0,0 +1,20 @@
+package com.tenwa.voucher.CreateVoucherProcess.VoucherGetMoneyForTradition;
+
+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;
+/**
+ * 获取TAX
+ * @author xiezhiwen
+ */
+public class ContractGetMoneyToMoneyTax implements VoucherJavaParamService{
+	public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param) throws BusinessException {
+		Map<String,String>returnValue=new HashMap<String,String>();
+		returnValue.putAll(param);
+		returnValue.put("MONEY",param.get("TAX"));
+		return returnValue;
+	}
+}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOther.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOther.java
new file mode 100644
index 000000000..6ba47bc76
--- /dev/null
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOther.java
@@ -0,0 +1,23 @@
+package com.tenwa.voucher.CreateVoucherProcess.VoucherGetMoneyForTradition;
+
+import java.math.BigDecimal;
+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;
+/**
+ * 获取其它金额
+ * @author xiezhiwen
+ */
+public class ContractGetMoneyToOther implements VoucherJavaParamService{
+	public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
+		Map<String,String>returnValue=new HashMap<String,String>();
+		returnValue.putAll(param);
+		// 获取其它金额
+		String OTHER_MONEY=param.get("OTHER_MONEY")==null?"0.00":param.get("OTHER_MONEY");
+		returnValue.put("MONEY",OTHER_MONEY);
+		return returnValue;
+	}
+}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOtherNoTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOtherNoTax.java
new file mode 100644
index 000000000..46d5feade
--- /dev/null
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOtherNoTax.java
@@ -0,0 +1,22 @@
+package com.tenwa.voucher.CreateVoucherProcess.VoucherGetMoneyForTradition;
+
+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;
+/**
+ * 获取其它金额(不含税)
+ * @author xiezhiwen
+ */
+public class ContractGetMoneyToOtherNoTax implements VoucherJavaParamService{
+	public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
+		Map<String,String>returnValue=new HashMap<String,String>();
+		returnValue.putAll(param);
+		// 获取其它金额
+		String OTHER_MONEY_NOTAX=param.get("OTHER_MONEY_NOTAX")==null?"0.00":param.get("OTHER_MONEY_NOTAX");
+		returnValue.put("MONEY",OTHER_MONEY_NOTAX);
+		return returnValue;
+	}
+}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOtherTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOtherTax.java
new file mode 100644
index 000000000..be577072a
--- /dev/null
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOtherTax.java
@@ -0,0 +1,22 @@
+package com.tenwa.voucher.CreateVoucherProcess.VoucherGetMoneyForTradition;
+
+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;
+/**
+ * 获取其它金额(不含税)
+ * @author xiezhiwen
+ */
+public class ContractGetMoneyToOtherTax implements VoucherJavaParamService{
+	public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
+		Map<String,String>returnValue=new HashMap<String,String>();
+		returnValue.putAll(param);
+		// 获取其它金额
+		String OTHER_MONEY_TAX=param.get("OTHER_MONEY_TAX")==null?"0.00":param.get("OTHER_MONEY_TAX");
+		returnValue.put("MONEY",OTHER_MONEY_TAX);
+		return returnValue;
+	}
+}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOthersMath.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOthersMath.java
new file mode 100644
index 000000000..3df614451
--- /dev/null
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOthersMath.java
@@ -0,0 +1,34 @@
+package com.tenwa.voucher.CreateVoucherProcess.VoucherGetMoneyForTradition;
+
+import java.math.BigDecimal;
+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;
+/**
+ * 设备款+其他金额-首付款-手续费-保证金
+ * @author xiezhiwen
+ */
+public class ContractGetMoneyToOthersMath implements VoucherJavaParamService{
+	public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
+		Map<String,String>returnValue=new HashMap<String,String>();
+		returnValue.putAll(param);
+		// 获取设备款
+		String EQUIP_AMT=param.get("EQUIP_AMT")==null?"0.00":param.get("EQUIP_AMT");
+		// 获取其它金额
+		String OTHER_MONEY=param.get("OTHER_MONEY")==null?"0.00":param.get("OTHER_MONEY");
+		// 获取首付款
+		String FIRST_PAYMENT=param.get("FIRST_PAYMENT")==null?"0.00":param.get("FIRST_PAYMENT");
+		// 获取保证金
+		String CAUTION_MONEY=param.get("CAUTION_MONEY")==null?"0.00":param.get("CAUTION_MONEY");
+		// 获取手续费
+		String HANDLING_CHARGE_MONEY=param.get("HANDLING_CHARGE_MONEY")==null?"0.00":param.get("HANDLING_CHARGE_MONEY");
+		// 其他款项+设备款
+		BigDecimal FactMoney=new BigDecimal(EQUIP_AMT).add(new BigDecimal(OTHER_MONEY)).subtract(new BigDecimal(FIRST_PAYMENT)).subtract(new BigDecimal(CAUTION_MONEY)).subtract(new BigDecimal(HANDLING_CHARGE_MONEY));
+		
+		returnValue.put("MONEY",FactMoney.toString());
+		return returnValue;
+	}
+}
diff --git a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java
index cf088a8d6..97bf5dfb7 100644
--- a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java
+++ b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java
@@ -311,13 +311,16 @@ public class CreateVoucherServiceImpl {
 				}else if("PZ2018082600000149".equals(VOUCHERNO) || "PZ2018082600000150".equals(VOUCHERNO) || "PZ2018070900000003".equals(VOUCHERNO) || "PZ2018080200000065".equals(VOUCHERNO)) {
 					subData.put("CUSTID",dataTemp.get("DISTRIBUTOR_ID"));//经销商id
 					subData.put("CUSTNAME",dataTemp.get("DISTRIBUTOR_NAME"));//经销商名称
-				}else if("PZ2018072100000037".equals(VOUCHERNO)||"PZ2018080400000091".equals(VOUCHERNO) || "PZ2018072100000038".equals(VOUCHERNO)||"PZ2018080400000092".equals(VOUCHERNO)){
+				}else if("PZ2018072100000037".equals(VOUCHERNO)||"PZ2018080400000091".equals(VOUCHERNO) || "PZ2018072100000038".equals(VOUCHERNO) || "PZ2018080400000092".equals(VOUCHERNO)){
 					subData.put("CUSTID","APZL00000000DC");//经销商id
 					subData.put("CUSTNAME","业务系统待查客户");//经销商名称
-				}else if("PZ2018092500000192".equals(VOUCHERNO)||"PZ2018092500000193".equals(VOUCHERNO) || "PZ2018092500000194".equals(VOUCHERNO)||"PZ2018092500000195".equals(VOUCHERNO)){
+				}else if("PZ2018092500000192".equals(VOUCHERNO)||"PZ2018092500000193".equals(VOUCHERNO) || "PZ2018092500000194".equals(VOUCHERNO) || "PZ2018092500000195".equals(VOUCHERNO) || "PZ2018092600000240".equals(VOUCHERNO)||"PZ2018092600000241".equals(VOUCHERNO) || "PZ2018092600000242".equals(VOUCHERNO) || "PZ2018092600000243".equals(VOUCHERNO)){
 					subData.put("CUSTID","APZL00000000DC");//经销商id
 					subData.put("CUSTNAME","业务系统待查客户");//经销商名称
-				}else if("PZ2018092500000156".equals(VOUCHERNO)||"PZ2018092500000157".equals(VOUCHERNO) || "PZ2018092500000158".equals(VOUCHERNO)){
+				}else if("PZ2018092500000164".equals(VOUCHERNO)||"PZ2018092600000229".equals(VOUCHERNO) || "PZ2018092500000166".equals(VOUCHERNO) || "PZ2018092600000231".equals(VOUCHERNO)){
+					subData.put("CUSTID","APZL00000000DC");//经销商id
+					subData.put("CUSTNAME","业务系统待查客户");//经销商名称
+				}else if("PZ2018092500000156".equals(VOUCHERNO)||"PZ2018092500000157".equals(VOUCHERNO) || "PZ2018092500000158".equals(VOUCHERNO) || "PZ2018092600000244".equals(VOUCHERNO)||"PZ2018092600000245".equals(VOUCHERNO) || "PZ2018092600000246".equals(VOUCHERNO)){
 					subData.put("CUSTID","APZL00000000DC");//经销商id
 					subData.put("CUSTNAME","业务系统待查客户");//经销商名称
 				}else {

From 74a06880d0390d63109ca95dc68d63c7fa65dc09 Mon Sep 17 00:00:00 2001
From: zhangbb <zhangbb@DESKTOP-GH0CKE6>
Date: Wed, 26 Sep 2018 21:28:56 +0800
Subject: [PATCH 3/4] =?UTF-8?q?1.=E9=A3=8E=E6=8E=A7=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E9=A3=8E=E6=8E=A7=E5=8F=8A=E6=B3=95=E5=8A=A1?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/Tenwa/Lease/Flow/Comm/LBRisk/LBRistList.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBRisk/LBRistList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBRisk/LBRistList.jsp
index 631f08786..d8447e80b 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBRisk/LBRistList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBRisk/LBRistList.jsp
@@ -159,7 +159,7 @@
 		
 		function upload(){
 // 			deleteFile();
-			var sparam="FlowUnid=<%=flowunid%>"+",ProjId=<%=projid%>"+",DocType=001,OneClassify=001003,DocName=风控报告";
+			var sparam="FlowUnid=<%=flowunid%>"+",ProjId=<%=projid%>"+",DocType=001,OneClassify=001003,DocName=风控及法务报告";
 			var library_id=RunJavaMethodTrans("com.tenwa.officetempalte.action.CreateContractOfficeAction","NewCreditLibraryId",sparam);
 			
 			var param="Library_id="+library_id+"&FlowUnid=<%=flowunid%>";

From aa73293ce9e62570b2ac8e221f9e25ab10c8cf65 Mon Sep 17 00:00:00 2001
From: jianghongdong <jianghd@tenwa.com.cn>
Date: Thu, 27 Sep 2018 09:52:37 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=85=B3=E4=BA=8E=E8=B5=84=E4=BA=A7?=
 =?UTF-8?q?=E5=A4=84=E7=BD=AE=E7=BB=93=E6=A1=88(=E4=BC=A0=E7=BB=9F)?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=B8=AD=E6=97=A0=E6=B3=95=E5=B8=A6=E5=87=BA?=
 =?UTF-8?q?=E7=BB=93=E6=A1=88=E4=BF=A1=E6=81=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AssetsDisposal/AssetsDisposalEnd/AssetsDisposalEndInfo.jsp   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalEnd/AssetsDisposalEndInfo.jsp b/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalEnd/AssetsDisposalEndInfo.jsp
index 36f10989d..b85fc9c11 100644
--- a/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalEnd/AssetsDisposalEndInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalEnd/AssetsDisposalEndInfo.jsp
@@ -16,6 +16,7 @@
 	if(null!=ishistory&&ishistory.equals("true")){
 		 doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataInfoHistory");//如果是历史则新显示历史数据
     }
+	doTemp.setDefaultValue("FLOWUNID", sFlowUnid);
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
 	CurPage.getCurComp().setAttribute("RightType", null);
 	dwTemp.Style = "2";//