diff --git a/WebContent/Accounting/LoanSimulation_new/LoanBasicInfoBusiness.jsp b/WebContent/Accounting/LoanSimulation_new/LoanBasicInfoBusiness.jsp
new file mode 100644
index 000000000..77139aa56
--- /dev/null
+++ b/WebContent/Accounting/LoanSimulation_new/LoanBasicInfoBusiness.jsp
@@ -0,0 +1,1269 @@
+<%@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 = "LoanSimulationBasicInfoBusiness";//--模板号--
+	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";//只读模式
+	}else{
+	}
+	isShowButton=false;
+	dwTemp.setVali(vali);
+	dwTemp.setAttr("inputWidth","120");
+	dwTemp.setAttr("spanWidth","107");
+	dwTemp.setAttr("showRatio", true);
+	dwTemp.genHTMLObjectWindow(flowunid);
+	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=\"200px\" 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 sButtons[][] = {
+		
+	};
+%><%@ 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","run","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/WebContent/Accounting/LoanSimulation_old/LoanBasicInfoBusiness.jsp b/WebContent/Accounting/LoanSimulation_old/LoanBasicInfoBusiness.jsp
new file mode 100644
index 000000000..dad3956dc
--- /dev/null
+++ b/WebContent/Accounting/LoanSimulation_old/LoanBasicInfoBusiness.jsp
@@ -0,0 +1,1269 @@
+<%@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_old";//--模板号--
+	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";//只读模式
+	}else{
+	}
+	isShowButton=false;
+	dwTemp.setVali(vali);
+	dwTemp.setAttr("inputWidth","120");
+	dwTemp.setAttr("spanWidth","107");
+	dwTemp.setAttr("showRatio", true);
+	dwTemp.genHTMLObjectWindow(plannumber);
+	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_old/condition_plan.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=\"200px\" 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 sButtons[][] = {
+		
+	};
+%><%@ 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","run","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/WebContent/Accounting/LoanSimulation_old/condition_plan.jsp b/WebContent/Accounting/LoanSimulation_old/condition_plan.jsp
index 32bd5c4a8..e2e882de5 100644
--- a/WebContent/Accounting/LoanSimulation_old/condition_plan.jsp
+++ b/WebContent/Accounting/LoanSimulation_old/condition_plan.jsp
@@ -10,7 +10,7 @@
 	String sTabStrip[][] = {
 		{"true", "租金计划", "/Accounting/LoanSimulation_old/RentPlanList.jsp",params, "", "", "false"},
 		{"true", "资金计划", "/Accounting/LoanSimulation_old/FundPlanList.jsp",params, "", "", "false"},
-		{"true", "现金流", "/Accounting/LoanSimulation_old/RentPlanList.jsp",params, "", "", "false"},
+		{"true", "现金流", "/Accounting/LoanSimulation_old/CashFlowList.jsp",params, "", "", "false"},
 	};
 %>
 <%@ include file="/Resources/CodeParts/Tab01.jsp"%>
diff --git a/WebContent/Accounting/LoanSimulation_onhire/LoanBasicInfoBusiness.jsp b/WebContent/Accounting/LoanSimulation_onhire/LoanBasicInfoBusiness.jsp
index 5db307d87..bbd3cba0e 100644
--- a/WebContent/Accounting/LoanSimulation_onhire/LoanBasicInfoBusiness.jsp
+++ b/WebContent/Accounting/LoanSimulation_onhire/LoanBasicInfoBusiness.jsp
@@ -156,6 +156,7 @@ var incomeNumberYear;
 var adjustType;
 var count = 0;
 $(function(){
+	changeRateTypeNew();
 	//document.getElementById('div_my0').innerHTML = '<div style="width:1160px;overflow: scroll;">'+document.getElementById('div_my0').innerHTML+'</div>';
 	if("ReadOnly"!="<%=RightType%>"){
 		changeRateTypeNew();
@@ -184,8 +185,10 @@ $(function(){
 		count++;
 	}else{
 		changeSettleMethod3();
+		changeRateTypeNew();
 	}
 	getRatioByMoney(getObj(0, "EQUIP_AMT"));
+	changeRateTypeNew();
 });
 
 function importCustomerQuot(){
@@ -207,12 +210,12 @@ function importCustomerQuot(){
 	
 }
 
-function changeRateTypeNew() {
+ 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);
+	//	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);
@@ -221,7 +224,7 @@ function changeRateTypeNew() {
 		setItemRequired(0, "ADJUST_TYPE", false);
 		setItemReadOnly(0, 0, "ADJUST_TYPE", true);
 	}
-}
+} 
 
 var CalcControl={};
 CalcControl.IncomeNumberView=function(){
diff --git a/WebContent/Frame/page/js/widget/frame_lrud.js b/WebContent/Frame/page/js/widget/frame_lrud.js
index 9fc169176..97f24f01c 100644
--- a/WebContent/Frame/page/js/widget/frame_lrud.js
+++ b/WebContent/Frame/page/js/widget/frame_lrud.js
@@ -58,6 +58,7 @@
 		}else{
 			second.hide();
 			changeLayout();
+			$('#FirstFrame').attr('style','width: 100%; height: '+eval(FirstFrame.offsetHeight-5)+'px;');
 		}
 	})).mousedown(AsLink.stopEvent);
 	
diff --git a/WebContent/Frame/page/tools/dialog/SelectCatalogGrid.jsp b/WebContent/Frame/page/tools/dialog/SelectCatalogGrid.jsp
index 74466d41f..1156c307b 100644
--- a/WebContent/Frame/page/tools/dialog/SelectCatalogGrid.jsp
+++ b/WebContent/Frame/page/tools/dialog/SelectCatalogGrid.jsp
@@ -113,11 +113,13 @@
 	
 	//将Sql中的变量用相对应的值替换	
 	StringTokenizer stArgs = new StringTokenizer(sParaString,",");
+	Map<String,String> paramap = new HashMap<String,String>();
 	while (stArgs.hasMoreTokens()) {
 		try{
 			String sArgName  = stArgs.nextToken().trim();
 			String sArgValue  = stArgs.nextToken().trim();		
-			sSelCode = StringFunction.replace(sSelCode,"#"+sArgName,sArgValue );		
+			sSelCode = StringFunction.replace(sSelCode,"#"+sArgName,sArgValue );
+			paramap.put(sArgName, sArgValue);
 		}catch(NoSuchElementException ex){
 			throw new Exception("输入参数格式错误！");
 		}
@@ -128,9 +130,12 @@
 		String[] params=param.split(",");
 		if(params.length==2){
 			String sCondtion=DataRightManager.getRightConditionSelect(CurUser,params[0],params[1],"1");
-			//sSelCode = StringFunction.replace(sSelCode,"{"+param+"}",sCondtion );
-			//汽车业务经销商发起没有跟单人员不需要加权限条件
-			sSelCode = StringFunction.replace(sSelCode,"{"+param+"}"," and 1=1 " );
+			if("2".equals(paramap.get("businessType"))||"3".equals(paramap.get("businessType"))){
+				sSelCode = StringFunction.replace(sSelCode,"{"+param+"}",sCondtion );
+			}else{
+				//汽车业务经销商发起没有跟单人员不需要加权限条件
+				sSelCode = StringFunction.replace(sSelCode,"{"+param+"}"," and 1=1 " );
+			}
 		}
 	} 
 	//实例化DataObject	
@@ -236,7 +241,7 @@
 	{
 		doTemp.WhereClauseNoFilter+=" "+sAttribute4;
 	}
-	
+	doTemp.WhereClauseNoFilter +="";
 	if(!sMutilOrSingle.equals("Single"))
 		doTemp.multiSelectionEnabled=true;
 	//实例化DataWindow
diff --git a/WebContent/Tenwa/Comm/DocList/LbCarLicensePlateInfoTemp.jsp b/WebContent/Tenwa/Comm/DocList/LbCarLicensePlateInfoTemp.jsp
index a319b50a3..d250513c4 100644
--- a/WebContent/Tenwa/Comm/DocList/LbCarLicensePlateInfoTemp.jsp
+++ b/WebContent/Tenwa/Comm/DocList/LbCarLicensePlateInfoTemp.jsp
@@ -25,13 +25,22 @@
 	//doTemp.setColTips("", "测试");
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
 	dwTemp.Style = "2";//freeform
-	//dwTemp.ReadOnly = "-2";//只读模式
+	/* if("0020".equals(CurPage.getParameter("PhaseNo"))){
+	dwTemp.ReadOnly = "-2";//只读模式
+	}  */
 	dwTemp.genHTMLObjectWindow(CurPage.getParameter("FlowUnid"));
-	
-	String sButtons[][] = {
+	String sButtons[][]=null;
+/* 	if("0020".equals(CurPage.getParameter("PhaseNo"))){
+		 sButtons =new String[][] {
+					//{"true","All","Button","保存","保存所有修改","as_save(0)","","","",""},
+					{String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""}
+				};
+	}else{ */
+	 sButtons =new String[][] {
 		{"true","All","Button","保存","保存所有修改","as_save(0)","","","",""},
 		{String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""}
 	};
+	// }
 	sButtonPosition = "south";
 %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
 <script type="text/javascript">
diff --git a/WebContent/Tenwa/Core/OfficeTemplate/TemplateManager/BFTemplateTest/uppdateMessage.jsp b/WebContent/Tenwa/Core/OfficeTemplate/TemplateManager/BFTemplateTest/uppdateMessage.jsp
new file mode 100644
index 000000000..d8654a35a
--- /dev/null
+++ b/WebContent/Tenwa/Core/OfficeTemplate/TemplateManager/BFTemplateTest/uppdateMessage.jsp
@@ -0,0 +1,81 @@
+<%-- <%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/IncludeBegin.jsp"%>
+<table><tr heigth="100px">
+	<td><span>是否借入资金：</span></td><td><select id="col1" name="col1">
+  <option value ="">------请选择------</option>
+  <option value ="money01">部分借入</option>
+  <option value ="money02">全部借入</option>
+  <option value="money03">自有资金</option>
+</select></td>
+	<td><span>借款银行：</span></td><td><input id="col2" name="col2" value=""/></td>
+	<td><span>借款合同号：</span></td><td><input id="col3" name="col3" value=""/></td>
+	</tr>
+	<tr heigth="100px">
+	<td><span>借款本金：</span></td><td><input id="col4" name="col4" value=""/></td>
+	<td><span>借款利率：</span></td><td><input id="col5" name="col5" value=""/></td>
+	<td></td><td><input  type="button" value="保存" onclick="javascrtpt:save()"/>
+	<input  type="button" value="关闭" onclick="javascrtpt:close()"/></td>
+</tr>
+
+</table>
+</div>
+</body>
+<script type="text/javascript">
+	function save(){
+		var v1=document.getElementById("col1").value;
+		var v2=document.getElementById("col2").value;
+		var v3=document.getElementById("col3").value;
+		var v4=document.getElementById("col4").value;
+		var v5=document.getElementById("col5").value;
+		if(v1.){
+			
+		}
+		parent.AsDialog.ClosePage(v1+"@"+v2+"@"+v3+"@"+v4+"@"+v5);
+	}
+	function close(){
+		window.close();
+	}
+</script>
+<%@ include file="/IncludeEnd.jsp"%> --%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
+	/*
+        Author: undefined 2018-05-29
+        Content: 示例详情页面
+        History Log: 
+    */
+	
+
+	String sTempletNo = "sourceOfFundsInfoMultiUpdate";//--模板号--
+	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+	/* doTemp.setColTips("", "测试"); */
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+	dwTemp.Style = "2";//freeform
+	//dwTemp.ReadOnly = "-2";//只读模式
+	dwTemp.genHTMLObjectWindow("");
+
+	String sButtons[][] = {
+		{"true","All","Button","保存","保存所有修改","save()","","","",""},
+		{"true","All","Button","返回","返回列表","returnList()","","","",""}
+	};
+	sButtonPosition = "south";
+%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<script type="text/javascript">
+	function save(){
+		var ifLoanMoney=getItemValue(0, 0, "if_loan_money");
+		var loanBank=getItemValue(0, 0, "loan_bank");
+		var loanContractNo=getItemValue(0, 0, "loan_contract_no");
+		var loanPrincipal=getItemValue(0, 0, "loan_principal");
+		var loanRate=getItemValue(0, 0, "loan_rate");
+		if(ifLoanMoney.length==0&&loanBank.length==0&&loanContractNo.length==0
+				&&loanPrincipal.length==0&&loanRate.length==0){
+			 AsDebug.showMessage("提示：", "请输入修改信息或返回！");
+			 return;
+		}else{
+		parent.AsDialog.ClosePage(ifLoanMoney+"@"+loanBank+"@"+loanContractNo+"@"+loanPrincipal+"@"+loanRate);
+	}}
+	function returnList(){
+		parent.AsDialog.ClosePage();
+	}
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Customer/Partner/Comm/Company/PartnerCompanyViewInfo.jsp b/WebContent/Tenwa/Customer/Partner/Comm/Company/PartnerCompanyViewInfo.jsp
index cc5e5b846..f1436b530 100644
--- a/WebContent/Tenwa/Customer/Partner/Comm/Company/PartnerCompanyViewInfo.jsp
+++ b/WebContent/Tenwa/Customer/Partner/Comm/Company/PartnerCompanyViewInfo.jsp
@@ -5,7 +5,8 @@
 	String sTempletNo = "PartnerCompany";//--模板号--
 	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
 	doTemp.setHtmlEvent("registercapital,paiclupcapital","onchange","changeCurrencyRequired");
-	//doTemp.setHtmlEvent("status","onchange","changeOtherRequired");
+// 	doTemp.setHtmlEvent("status","onchange","changeOtherRequired");
+	doTemp.setHtmlEvent("status", "onchange", "changeRegisterInfo");
 	//初始化客户类别字段
 	BizObjectManager typeManager = JBOFactory.getBizObjectManager(CUSTOMER_TYPE.CLASS_NAME);
 	List<BizObject> types = typeManager.createQuery("customerid=:customerid and status='valid' ").setParameter("customerid",customerId).getResultList(false);
@@ -116,5 +117,41 @@
 			}
 		},"请选择行业分类");
 	}
+	
+	function changeRegisterInfo(){//客户状态为正式时注册信息必填，否则不必填
+		var status = getItemValue(0,getRow(),"status");
+		if(status == "status02"){
+			setItemRequired(0,"economytypename",true);
+			setItemRequired(0,"orgnaturename",true);
+			setItemRequired(0,"orgnaturecategoryname",true);
+			setItemRequired(0,"industrytypename",true);
+			setItemRequired(0,"scope",true);
+			setItemRequired(0,"rccurrency",true);
+			setItemRequired(0,"registercapital",true);
+			setItemRequired(0,"pccurrency",true);
+			setItemRequired(0,"paiclupcapital",true);
+			setItemRequired(0,"establish_date",true);
+			setItemRequired(0,"licensematurity",true);
+			setItemRequired(0,"operationperiod",true);
+		
+		 }else{
+			setItemRequired(0,"economytypename",false);
+			setItemRequired(0,"orgnaturename",false);
+			setItemRequired(0,"orgnaturecategoryname",false);
+			setItemRequired(0,"industrytypename",false);
+			setItemRequired(0,"scope",false);
+			setItemRequired(0,"rccurrency",false);
+			setItemRequired(0,"registercapital",false);
+			setItemRequired(0,"pccurrency",false);
+			setItemRequired(0,"paiclupcapital",false);
+			setItemRequired(0,"establish_date",false);
+			setItemRequired(0,"licensematurity",false);
+			setItemRequired(0,"operationperiod",false);
+			setItemRequired(0,"custsource",false);
+			setItemRequired(0,"certtype",false);
+			setItemRequired(0,"custkind",false);
+			
+		} 
+	}
 </script>
 <%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractInfo.jsp
index 052e11a0f..6af56c002 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractInfo.jsp
@@ -80,6 +80,9 @@
 		doTemp.setColInnerBtEvent("PROJECT_ASSIST_NAME", "");
 	}
 	doTemp.setDefaultValue("FlowUnid", sFlowUnid);//赋值流程编号
+	if("TAssetsDisposalFeeFlow".equals(FlowNo)){
+	doTemp.setReadOnly("CONTRACT_NUMBER", true);
+	}
 %>
 	<%@ include file="/Tenwa/Lease/Flow/Comm/baseShowFormal.jspf"%>
 <% 	
@@ -105,23 +108,14 @@
 		isAll="";
 	}
     String sButtons[][] =null;
+  
+  
+	
    // 原版的
    sButtons= new String[][]{
 			{"true",isAll,"Button","保存","保存所有修改","saveRecord()","","","",""}	
 	};
     
-    //改动如下  如有问题可删除恢复
-  /*   if(!"ContractApprovalFlow".equals(FlowNo)||!"ContractChangeFlow".equals(FlowNo)){
-		 sButtons= new String[][]{
-					//{"true",isAll,"Button","保存","保存所有修改","saveRecord()","","","",""}	
-			};
-		   
-	}else{
-		
-   sButtons= new String[][]{
-			{"true",isAll,"Button","保存","保存所有修改","saveRecord()","","","",""}	
-	};
-	} */
     
     
     
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/EarlyClearanceList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/EarlyClearanceList.jsp
new file mode 100644
index 000000000..c9c7b8788
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/EarlyClearanceList.jsp
@@ -0,0 +1,211 @@
+<%@page import="jbo.app.tenwa.calc.LC_CALC_CONDITION"%>
+<%@page import="jbo.com.tenwa.lease.comm.LB_UNION_LESSEE"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%>
+<%@ page import="com.amarsoft.app.lc.workflow.action.GetFlowAction" %>
+<%@ page import="com.amarsoft.app.util.*"  %>
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=Info00;Describe=注释区;]~*/%>
+	
+<%/*~END~*/%>  
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=Info01;Describe=定义页面属性;]~*/%>
+	<%
+	String PG_TITLE = "提前结清"; // 浏览器窗口标题 <title> PG_TITLE </title>
+	%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=Info02;Describe=定义变量，获取参数;]~*/%>
+<%
+
+
+	String sFlowUnid = CurPage.getParameter("FlowUnid");//流程编号
+	if(sFlowUnid == null) sFlowUnid = "";
+	BizObject flow=GetFlowAction.getFlowBussinessObject(sFlowUnid);
+	String product_id=flow.getAttribute("productId").toString();
+	String contractid=flow.getAttribute("contract_id").toString();
+	String projectid=flow.getAttribute("proj_id").toString();
+	String contract_number=flow.getAttribute("flow_key").toString();//业务合同号
+	BizObjectManager bom=JBOFactory.getBizObjectManager(LB_UNION_LESSEE.CLASS_NAME);
+	BizObject cust=bom.createQuery("contract_id=:contract_id and is_main='Y'").setParameter("contract_id", contractid).getSingleResult(false);
+	String custname=cust.getAttribute("customer_name").toString();;//主承租人
+// 	String planinformation=ProductParamUtil.getProductParameterValue(product_id,"PRD0314","planinformation");//方案类型
+	String money="";//留购价
+// 	if("SinglePlan".equals(planinformation)){
+// 		BizObjectManager bom1=JBOFactory.getBizObjectManager(LC_CALC_CONDITION.CLASS_NAME);
+// 		BizObject condition=bom1.createQuery("contract_id=:contract_id ").setParameter("contract_id", contractid).getSingleResult(false);
+// 		money=condition.getAttribute("NOMINAL_PRICE").toString();
+// 	}
+	String ishistory=CurPage.getParameter("IsHistory");
+	String nodeNo=CurPage.getParameter("NodeNo");
+	String RightType = CurPage.getParameter("RightType");//选择模式
+	String sTempletNo = "LBContractTermainateTemp";//模板号
+%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=Info03;Describe=定义数据对象;]~*/%>
+<%
+	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+	doTemp.setDefaultValue("accept_person", custname);
+	doTemp.setDefaultValue("contract_id", contractid);
+	doTemp.setDefaultValue("project_id", projectid);
+	doTemp.setDefaultValue("flowunid", sFlowUnid);
+	doTemp.setDefaultValue("RESERVE_PRICE", money);
+	if(null!=ishistory&&ishistory.equals("true")){
+	 doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataInfoHistory");//如果是历史则新显示历史数据
+	}
+	
+	CurPage.getCurComp().setAttribute("RightType", null);
+	ASObjectWindow dwTemp = new ASObjectWindow(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;
+	}
+	String compClientID = request.getParameter("CompClientID");
+	
+	dwTemp.genHTMLObjectWindow(sFlowUnid);//得到的参数
+	CurPage.getCurComp().setAttribute("RightType",RightType);
+	dwTemp.replaceColumn("devolution", "<iframe type='iframe' id='frame_list_knowing' name=\"frame_list_knowing\" width=\"100%\" height=\"200px\" frameborder=\"0\" src=\""+sWebRootPath+"/Tenwa/Lease/Flow/Comm/LBContractEnd/QuotationList.jsp?CompClientID="+compClientID+"&flowunid="+sFlowUnid+"&IsHistory="+ishistory+"&NodeNo="+nodeNo+"&RightType="+RightType+"&docname=settletradition"+"\"></iframe>", CurPage.getObjectWindowOutput());
+%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=Info04;Describe=定义按钮;]~*/%>
+	<%
+	String sButtons[][] = {
+			{"true","All","Button","生成提前结清","生成提前结清","saveRecord()","","","","btn_icon_save"},
+			{"true","All","Button","公司盖章","盖公司电子章","stamp()","","","",""},
+		};
+	sButtonPosition = "north";
+	%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~不可编辑区~[Editable=false;CodeAreaID=Info05;Describe=主体页面;]~*/%>
+<%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=Info06;Describe=定义按钮事件;]~*/%>
+<script type="text/javascript">
+
+	var bIsInsert = false;
+	/*~[Describe=保存;InputParam=无;OutPutParam=无;]~*/
+	function saveRecord()
+	{
+			var param={};
+			var tempParam={};
+			var sparam="";
+			
+			//模板号
+			//param["templateNo"]="e1fc3afacfbc46fea0a881ac20de23cc";
+			param["templateNo"]="1a9be791ea6449f09f02f9a4afe8c86b";
+			
+			//生成文件关联关系
+			tempParam["OBJECTTYPE"]="settletradition";
+			tempParam["FLOW_UNID"]="<%=sFlowUnid%>";
+			tempParam["PROJ_ID"]="<%=projectid%>";
+			tempParam["ID"]="<%=contractid%>";
+			tempParam["CONTRACT_ID"]="<%=contractid%>";
+			tempParam["contract_number"]="<%=contract_number%>";
+			//生成模板固定参数
+			tempParam["CurUserId"]="<%=CurUser.getUserID()%>";
+			tempParam["CurOrgId"]="<%=CurUser.getOrgID()%>";
+			tempParam["fileSavePath"]="<%=CurConfig.getConfigure("FileSavePath")%>";
+			
+			param["templateParam"]=JSON.stringify(tempParam).replace(/,/g,"@");//生成模板的参数据
+			for(var key in param){
+				  if(sparam.length>0){sparam+=",";}
+				   sparam+=key+"="+param[key];
+			}
+			var deleteparam ="PROJECT_PLAN_NUMBER="+"<%=contractid%>"+",objecttype=settletradition";
+			var deleteresult=RunJavaMethodTrans("com.tenwa.officetempalte.controller.QutationAction","deletedevtion",deleteparam);
+			var result=RunJavaMethodTrans("com.tenwa.officetempalte.action.CreateOfficeAction","createOfficeByTemplate",sparam);
+			RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","wordToPdfAnnex","contract_id=<%=contractid%>,PLAN_LIST=settletradition,FlowUnid=<%=sFlowUnid%>");
+		if(bIsInsert)
+		{
+			beforeInsert();
+		}
+		beforeUpdate();
+		as_save("myiframe0");
+		reloadSelf();
+	}
+
+	function stamp(){
+// 		var flie = getItemValue(0,getRow(0),"FILENAME");
+// 		if(typeof(flie)=="undefined"||flie==null||flie==""){
+// 			alert("请先生成产权转移单！！");
+// 			return;
+// 		}
+		var result=RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","TcollectionSignA","contract_id=<%=contractid%>,FlowUnid=<%=sFlowUnid%>,flagType=settletradition");
+		
+		location.reload();
+		
+	}
+</script>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=Info07;Describe=自定义函数;]~*/%>
+	<script type="text/javascript">
+	<%/*~[Describe=执行插入操作前执行的代码;]~*/%>
+	function beforeInsert()
+	{
+		setItemValue(0,0,"InputUserID","<%=CurUser.getUserID()%>");
+		setItemValue(0,0,"InputOrgID","<%=CurUser.getOrgID()%>");
+		setItemValue(0,0,"InputTime","<%=StringFunction.getTodayNow()%>");
+		bIsInsert = false;
+	}
+	
+	
+	<%/*~[Describe=执行更新操作前执行的代码;]~*/%>
+	function beforeUpdate()
+	{
+		setItemValue(0,0,"UpdateUserID","<%=CurUser.getUserID()%>");
+		setItemValue(0,0,"UpdateOrgID","<%=CurUser.getOrgID()%>");
+		setItemValue(0,0,"UpdateTime","<%=StringFunction.getTodayNow()%>");
+	}
+	</script>
+<%/*~END~*/%>
+
+ 
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=Info08;Describe=页面装载时，进行初始化;]~*/%>
+<script type="text/javascript">	
+	function initRow(){
+		if (getRowCount(0) == 0) //如果没有找到对应记录，则新增一条，并设置字段默认值
+		{ 
+			setItemValue(0,0,"FlowUnid","<%=sFlowUnid%>");
+			//设置自动获取日期为当前日期
+			setItemValue(0,0,"Accept_Date","<%=StringFunction.getToday()%>");  
+			bIsInsert = true;
+		}
+	}
+	initRow();
+</script>	
+<%/*~END~*/%>
+
+
+
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/QuotationList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/QuotationList.jsp
index 33adca868..cf47c4d37 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/QuotationList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/QuotationList.jsp
@@ -21,6 +21,8 @@
 			docname = "结清模板";
 		}else if("transfer".equals(docname)){
 			docname = "产权转移证书";
+		}else if("settletradition".equals(docname)){
+			docname = "提前结清（传统）";
 		};
 		String sTempletNo = CurPage.getParameter("TempletNo");//模板号
 			sTempletNo = "DevolutionList";
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LCCondtionForProject/LCCondtion.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LCCondtionForProject/LCCondtion.jsp
index fea2d3f21..0aa09b7d0 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LCCondtionForProject/LCCondtion.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LCCondtionForProject/LCCondtion.jsp
@@ -11,6 +11,7 @@
 	}else{
 		isShowButton=true;
 	}
+  
 	ASObjectModel doTemp = new ASObjectModel("LCConditionTemp");
 	if(null!=ishistory&&ishistory.equals("true")){
 		   doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataListHistory");
@@ -22,6 +23,9 @@
 	dwTemp.Style="1";      	     //--设置为Grid风格--
 	dwTemp.ReadOnly = "1";	
 	dwTemp.setPageSize(50);
+	if("ProjectCreditFlow".equals(CurPage.getParameter("FlowNo"))||"ProjectRecreditFlow".equals(CurPage.getParameter("FlowNo"))){
+		isShowButton=true;
+	}
 	if(isShowForaml.equals("true")){ 
 		 dwTemp.genHTMLObjectWindow(sProjectId);
 	}else{
diff --git a/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchivingInfoTemp.jsp b/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchivingInfoTemp.jsp
index 8652646d9..a2660ff14 100644
--- a/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchivingInfoTemp.jsp
+++ b/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchivingInfoTemp.jsp
@@ -22,12 +22,13 @@
 	
 	String sButtons[][] = {
 		{"true","All","Button","保存","保存所有修改","as_save(0)","","","",""},
-		{String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""}
+		{"true","All","Button","返回","返回列表","returnList()","","","",""}
 	};
 	sButtonPosition = "south";
 %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
 <script type="text/javascript">
 $(function(){
+	 setItemValue(0,getRow(),"ARCHIVING_PERSON","<%=CurUser.getUserName()%>");
 	 setItemValue(0,getRow(),"INPUTUSERID","<%=inputusername%>");
 	 setItemValue(0,getRow(),"UPDATEUSERID","<%=inputusername%>");
 	 setItemValue(0,getRow(),"INPUTORGID","<%=inputorgname%>");
@@ -42,7 +43,7 @@ $(function(){
 		setItemValue(0,getRow(),"UPDATETIME",updatetime);
 });
 	function returnList(){
-		 AsControl.OpenView("<%=sPrevUrl%>", "","_self","");
+		 AsControl.OpenView("/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchivingListTemp.jsp", "","_self","");
 	}
 </script>
 <%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchivingList_CTTemp.jsp b/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchivingList_CTTemp.jsp
new file mode 100644
index 000000000..3715052a3
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchivingList_CTTemp.jsp
@@ -0,0 +1,37 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%	
+	/*
+        Author: undefined 2018-07-17
+        Content: 
+        History Log: 
+    */
+	ASObjectModel doTemp = new ASObjectModel("LbFileArchivingListTemp");
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+	dwTemp.Style="1";      	     //--设置为Grid风格--
+	dwTemp.ReadOnly = "1";	 //只读模式
+	dwTemp.setPageSize(10);
+	dwTemp.genHTMLObjectWindow("");
+
+	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
+	String sButtons[][] = {
+		{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
+		{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
+		{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
+	};
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<script type="text/javascript">
+	function newRecord(){
+		 var sUrl = "/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchiving_CTInfo.jsp";
+		 AsControl.OpenView(sUrl,'','_self','');
+	}
+	function viewAndEdit(){
+		 var sUrl = "/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchiving_CTInfo.jsp";
+		 var sPara = getItemValue(0,getRow(0),'ID');
+		 if(typeof(sPara)=="undefined" || sPara.length==0 ){
+			alert("参数不能为空！");
+			return ;
+		 }
+		AsControl.OpenView(sUrl,'SerialNo=' +sPara ,'_self','');
+	}
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchiving_CTInfo.jsp b/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchiving_CTInfo.jsp
new file mode 100644
index 000000000..cf5a798a7
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchiving_CTInfo.jsp
@@ -0,0 +1,49 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
+	/*
+        Author: undefined 2018-07-17
+        Content: 示例详情页面
+        History Log: 
+    */
+	String sPrevUrl = CurPage.getParameter("PrevUrl");
+	if(sPrevUrl == null) sPrevUrl = "";
+	String inputuserid = CurUser.getUserID();
+	String inputusername = CurUser.getUserName();
+	String inputorgid = CurOrg.getOrgID();
+	String inputorgname = CurOrg.getOrgName();
+	
+	String sTempletNo = "LbFileArchivingInfoTemp";//--模板号--
+	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+	doTemp.setColTips("", "");
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+	dwTemp.Style = "2";//freeform
+	//dwTemp.ReadOnly = "-2";//只读模式
+	dwTemp.genHTMLObjectWindow(CurPage.getParameter("SerialNo"));
+	
+	String sButtons[][] = {
+		{"true","All","Button","保存","保存所有修改","as_save(0)","","","",""},
+		{"true","All","Button","返回","返回列表","returnList()","","","",""}
+	};
+	sButtonPosition = "south";
+%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<script type="text/javascript">
+$(function(){
+	 setItemValue(0,getRow(),"ARCHIVING_PERSON","<%=CurUser.getUserName()%>");
+	 setItemValue(0,getRow(),"INPUTUSERID","<%=inputusername%>");
+	 setItemValue(0,getRow(),"UPDATEUSERID","<%=inputusername%>");
+	 setItemValue(0,getRow(),"INPUTORGID","<%=inputorgname%>");
+	 setItemValue(0,getRow(),"UPDATEORGID","<%=inputorgname%>");
+	 var date = new Date();
+		var updatetime = date.toJSON().substring(0,10).replace(/-/g,"/");//+" "+date.getHours()+":"+date.getMinutes()+":"+date.getSeconds();
+		var inputtime = date.toJSON().substring(0,10).replace(/-/g,"/");//+" "+date.getHours()+":"+date.getMinutes()+":"+date.getSeconds();
+		var inputtimes = getItemValue(0,getRow(),"INPUTTIME");
+		 if(inputtimes==null||inputtimes==""){	
+		setItemValue(0,getRow(),"INPUTTIME",inputtime);
+		} 
+		setItemValue(0,getRow(),"UPDATETIME",updatetime);
+});
+	function returnList(){
+		 AsControl.OpenView("/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchivingList_CTTemp.jsp", "","_self","");
+	}
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/ActualPaymentTempList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/ActualPaymentTempList.jsp
index 00a1ea762..6d0ffe8d0 100644
--- a/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/ActualPaymentTempList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/ActualPaymentTempList.jsp
@@ -65,6 +65,10 @@
 			}
 		}
 		$('.list_gridCell_standard.list_div_pagecount').text(FormatKNumber(sumethod6,2));
+		$('.list_smallcount_color').children('.list_all_no').children('.list_gridCell_narrow').text("电汇小计");
+		$('table tr th').eq(1).children('.list_gridCell_narrow').width(50);
+		$('.list_all_no').children('.list_gridCell_narrow').width(50);
+		$('#myiframe0_static').width(399);
 	})
 	
 	function setColRequired(){
diff --git a/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionRentNotifyAdjust.jsp b/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionRentNotifyAdjust.jsp
index 152f7ce14..76948ebdb 100644
--- a/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionRentNotifyAdjust.jsp
+++ b/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionRentNotifyAdjust.jsp
@@ -143,9 +143,18 @@
 
 		}
 		
-		
 		function stamp(){
-			var result=RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","TcollectionSignA","FlowUnid=<%=flowunid%>,flagType=AdjustmentNotice");
+			var filename = getItemValue(0,getRow(),"FILENAME");
+			if(filename==""){
+				alert("请先生成租金调整通知书！！");	
+				return;
+			};
+			var result=RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","TcollectionSignA","FlowUnid=<%=flowunid%>,flagType=AdjustmentNotice,contract_id="+getItemValue(0,getRow(),"ID"));
+			if("success"==result){
+				alert("盖章成功！！");
+			}else{
+				alert("盖章失败！！");
+			}
 		}
 </script>
 <%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
index 3d6e7fc4f..625f5564f 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
@@ -676,6 +676,7 @@
 				<attribute name="inputtime" label="鐧昏鏃堕棿" type="STRING" length="32"/>
 				<attribute name="updatetime" label="鏇存柊鏃堕棿" type="STRING" length="32"/>
 			    <attribute name="linkman" label="鑱旂郴浜�" type="STRING" length="32"/>
+			    <attribute name="mailbox" label="閭" type="STRING" length="32"/>
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -1923,6 +1924,7 @@
 				<attribute name="inputtime" label="鐧昏鏃堕棿" type="STRING" length="32"/>
 				<attribute name="updatetime" label="鏇存柊鏃堕棿" type="STRING" length="32"/>
 				<attribute name="linkman" label="鑱旂郴浜�" type="STRING" length="32"/>
+				<attribute name="mailbox" label="閭" type="STRING" length="32"/>
 			</attributes>
 			<manager>
 				<managerProperties>
diff --git a/WebContent/fileTemplate/鎶ヤ环鏂规.xlsx b/WebContent/fileTemplate/鎶ヤ环鏂规.xlsx
deleted file mode 100644
index 824ed5f1f..000000000
Binary files a/WebContent/fileTemplate/鎶ヤ环鏂规.xlsx and /dev/null differ
diff --git a/WebContent/fileTemplate/绉熼噾鏀粯閫氱煡涔�.docx b/WebContent/fileTemplate/绉熼噾鏀粯閫氱煡涔�.docx
index 7063cfea1..bfad62567 100644
Binary files a/WebContent/fileTemplate/绉熼噾鏀粯閫氱煡涔�.docx and b/WebContent/fileTemplate/绉熼噾鏀粯閫氱煡涔�.docx differ
diff --git a/WebContent/fileTemplate/琛ㄥ崟8锛氱粨娓呰瘉鏄�(1).docx b/WebContent/fileTemplate/琛ㄥ崟8锛氱粨娓呰瘉鏄�(1).docx
new file mode 100644
index 000000000..79986d837
Binary files /dev/null and b/WebContent/fileTemplate/琛ㄥ崟8锛氱粨娓呰瘉鏄�(1).docx differ
diff --git a/WebContent/money/sourceOfFunds.jsp b/WebContent/money/sourceOfFunds.jsp
index d36ddfb92..35fb6af9d 100644
--- a/WebContent/money/sourceOfFunds.jsp
+++ b/WebContent/money/sourceOfFunds.jsp
@@ -5,21 +5,58 @@
         Content: 
         History Log: 
     */
+    String userid=CurUser.getUserID();
+	String department=CurUser.getOrgID();
 	ASObjectModel doTemp = new ASObjectModel("sourceOfFunds");
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
 	dwTemp.Style="1";      	     //--设置为Grid风格--
 	dwTemp.ReadOnly = "1";	 //只读模式
 	dwTemp.setPageSize(10);
 	dwTemp.genHTMLObjectWindow("");
-
+	dwTemp.MultiSelect = true;
+	doTemp.setLockCount(2);
 	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
 	String sButtons[][] = {
 		{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
 		{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
 		{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0)","","","","btn_icon_delete",""},
+		{"true","","Button","数据导入","数据导入","importExcel()","","","","btn_icon_import",""},
+		{"true","","Button","批量修改","批量修改","MultiUpdate()","","","","btn_icon_detail",""},
 	};
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">
+	function MultiUpdate(){
+		 var id = getItemValueArray(0,'id');
+		 if(id.length == 0){
+			 AsDebug.showMessage("提示：", "请先选择要修改的数据！");
+		 }else {
+		 id = JSON.stringify(id).replace(/,/g,"@");
+	 AsDialog.PopView("/Tenwa/Core/OfficeTemplate/TemplateManager/BFTemplateTest/uppdateMessage.jsp","",
+    			{width:"850px",height:"170px",title:"批量修改"},function(sparam){
+    				if(sparam.length>0){
+    				updateMessage(sparam,id);
+    				}
+    				reloadSelf();});
+		 }
+	}
+	
+	function updateMessage(sparam,ids){
+		 var res=RunJavaMethodTrans("com.tenwa.lease.app.message.UpdateMessageHandler","MultiUpdate","sparam="+sparam+",ids="+ids);
+	}
+
+function importExcel(){
+	var importCondition={};//导入配置
+      importCondition["templateNo"]="7148746b2023454c80f86d16d8ae8c75";//导入的模板编号必填
+      //增加其他配置参数
+        importCondition["inputuserid"]="<%=userid%>";;
+       importCondition["inputorgid"]="<%=department%>";
+      var sparam=JSON.stringify(importCondition).replace(/,/g,"@");//生成模板的参数据
+      AsDialog.PopView("/Tenwa/Core/OfficeTemplate/TemplateManager/BFTemplateTest/uploadExcel.jsp","importparam="+sparam,
+    	    			{width:"500px",height:"40px",title:"上传Excel"},function(){
+    	    				reloadSelf();});
+	
+
+}
 	function newRecord(){
 		 var sUrl = "/money/sourceOfFundsInfo.jsp";
 		 AsControl.OpenView(sUrl,'','_self','');
diff --git a/src/com/tenwa/channelportal/action/ContractSignAction.java b/src/com/tenwa/channelportal/action/ContractSignAction.java
index bdb6702e5..8865f3a12 100644
--- a/src/com/tenwa/channelportal/action/ContractSignAction.java
+++ b/src/com/tenwa/channelportal/action/ContractSignAction.java
@@ -1626,6 +1626,8 @@ public void wordToPdfJar(JBOTransaction tx){
 				 DOCRELATIVE=bom.createQuery(" OBJECTTYPE='TriditionCollection' and plan_number=:plan_number").setParameter("plan_number",PAYMENT_NUMBER).getSingleResult(false);
 			}else if("TriditionSuspension".equals(PLAN_LIST)){
 				DOCRELATIVE=bom.createQuery(" OBJECTTYPE='TriditionSuspension' and FLOW_UNID=:flowunid ").setParameter("flowunid",FlowUnid).getSingleResult(false);
+			}else if("settletradition".equals(PLAN_LIST)){
+				DOCRELATIVE=bom.createQuery(" OBJECTTYPE='settletradition' and FLOW_UNID=:flowunid ").setParameter("flowunid",FlowUnid).getSingleResult(false);
 			}else{
 				DOCRELATIVE=bom.createQuery("plan_number=:plan_number and plan_list=:plan_list").setParameter("plan_number",PAYMENT_NUMBER).setParameter("plan_list", PLAN_LIST).getSingleResult(false);
 			}
@@ -2452,7 +2454,7 @@ public String claimSign(JBOTransaction tx) throws Exception {
 		if("transfer".equals(flagType)){
 			DOCRELATIVE=bom.createQuery(" OBJECTTYPE='transfer' and FLOW_UNID=:flowunid and CONTRACT_ID=:contractid ").setParameter("flowunid",FlowUnid).setParameter("contractid",contract_id).getSingleResult(false);
 		}else if("AdjustmentNotice".equals(flagType)){
-			DOCRELATIVE=bom.createQuery(" OBJECTTYPE='AdjustmentNotice' and FLOW_UNID=:flowunid ").setParameter("flowunid",FlowUnid).getSingleResult(false);
+			DOCRELATIVE=bom.createQuery(" OBJECTTYPE='AdjustmentNotice' and FLOW_UNID=:flowunid and CONTRACT_ID=:contractid ").setParameter("flowunid",FlowUnid).setParameter("contractid",contract_id).getSingleResult(false);
 		}else if("TriditionCollection".equals(flagType)){
 			DOCRELATIVE=bom.createQuery("plan_number=:plan_number and objecttype='TriditionCollection' ").setParameter("plan_number",PAYMENT_NUMBER).getSingleResult(false);
 		}else if("TriditionSuspension".equals(flagType)){
diff --git a/src_core/com/tenwa/comm/dataRightmanager/DataRightManager.java b/src_core/com/tenwa/comm/dataRightmanager/DataRightManager.java
index effa0c6d6..4abe253bc 100644
--- a/src_core/com/tenwa/comm/dataRightmanager/DataRightManager.java
+++ b/src_core/com/tenwa/comm/dataRightmanager/DataRightManager.java
@@ -60,11 +60,11 @@ public class DataRightManager {
 	public static String getRightConditionByProj(ASUser curUser,String table) throws JBOException{
 		
 		StringBuilder sb=new StringBuilder(" and ("); 
-		sb.append(getRightCondition(curUser,table,"PROJECT_REGISTRAR","PROJECT_DEPT"))
-			.append(" or ")
-			.append(getRightCondition(curUser,table,"PROJECT_MANAGE","PROJECT_DEPT"))
-			.append(" or ")
-			.append(getRightCondition(curUser,table,"PROJECT_ASSIST","PROJECT_DEPT"))
+//		sb.append(getRightCondition(curUser,table,"PROJECT_REGISTRAR","PROJECT_DEPT"))
+//			.append(" or ")
+			sb.append(getRightCondition(curUser,table,"PROJECT_MANAGE","PROJECT_DEPT"))
+//			.append(" or ")
+//			.append(getRightCondition(curUser,table,"PROJECT_ASSIST","PROJECT_DEPT"))
 			.append(")");
 		return sb.toString();
 	}
diff --git a/src_core/com/tenwa/officetempalte/importcallback/impl/LCsourceOfFundCallBack.java b/src_core/com/tenwa/officetempalte/importcallback/impl/LCsourceOfFundCallBack.java
new file mode 100644
index 000000000..491a9eee5
--- /dev/null
+++ b/src_core/com/tenwa/officetempalte/importcallback/impl/LCsourceOfFundCallBack.java
@@ -0,0 +1,88 @@
+package com.tenwa.officetempalte.importcallback.impl;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import jbo.com.tenwa.entity.comm.own.LC_SOURCE_OF_FUNDS;
+import jbo.sys.CODE_LIBRARY;
+
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.BizObjectManager;
+import com.amarsoft.are.jbo.BizObjectQuery;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.are.jbo.JBOTransaction;
+import com.amarsoft.awe.util.Transaction;
+import com.amarsoft.context.ASUser;
+import com.tenwa.comm.exception.BusinessException;
+/**
+ * 
+ * Author: guoshanglei 2017年5月11日
+ * Tester:
+ * Describe:
+ * History Log:
+ */
+public class LCsourceOfFundCallBack extends BaseImportExcelCallBack{
+	//读取数据运行run方法
+	@Override
+	public void run(ASUser CurUser, BizObject importObject,
+			Map<String, String> model, Integer rowIndex, JBOTransaction tx,
+			Transaction Sqlca) throws Exception {
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd hh:mm:ss");
+			
+			String FlowUnid = model.get("FlowUnid");//流程编号
+			String templateNo=model.get("templateNo");//模版编号
+			String INPUTUSERID = CurUser.getUserID();//获取登记人
+			String INPUTORGID = CurUser.getOrgID();//获取登记部门
+			String INPUTTIME = sdf.format(new Date()).toString();//格式化登记时间
+			
+			
+			String contract_num=importObject.getAttribute("contract_no").toString();
+			BizObjectManager bom = JBOFactory.getBizObjectManager(LC_SOURCE_OF_FUNDS.CLASS_NAME);
+			List<BizObject> bolist=bom.createQuery("CONTRACT_NO=:contractno").setParameter("contractno", contract_num).getResultList(false);
+			if(bolist.size()>0){
+				throw new BusinessException("合同号为"+contract_num+"的合同信息已存在！");
+			}
+			String ifLoanMoneyCode="money03";
+			String ifLoanMoney=importObject.getAttribute("if_loan_money").toString();
+			if(ifLoanMoney==null||"".equals(ifLoanMoney)){
+			}else if(ifLoanMoney.indexOf("部分借入")>=0){
+				ifLoanMoneyCode="money01";
+			}else if(ifLoanMoney.indexOf("全部借入")>=0){
+				ifLoanMoneyCode="money02";
+			} else {
+			}
+			
+			
+			importObject.setAttributeValue("IF_LOAN_MONEY", ifLoanMoneyCode);//设置制造商ID
+			
+			importObject.setAttributeValue("LOAN_PRINCIPAL", importObject.getAttribute("loan_principal").toString());//设置流程编号
+			
+			importObject.setAttributeValue("LOAN_RATE", importObject.getAttribute("loan_rate").toString());//设置交易价格
+			
+			importObject.setAttributeValue("LEASE_ACC_NAME", importObject.getAttribute("lease_acc_name").toString());//初始化登记人
+			importObject.setAttributeValue("CONTRACT_NO", contract_num);//初始化登记部门
+			importObject.setAttributeValue("LOAN_BANK", importObject.getAttribute("loan_bank").toString());//初始化登记时间
+			importObject.setAttributeValue("LOAN_CONTRACT_NO", importObject.getAttribute("loan_contract_no").toString());//初始化登记时间
+			importObject.setAttributeValue("BUSINESSTYPE", importObject.getAttribute("businesstype").toString());//初始化登记时间
+			
+			importObject.setAttributeValue("INPUTUSERID",INPUTUSERID );//初始化登记时间
+			importObject.setAttributeValue("INPUTORGID",INPUTORGID );//初始化登记时间
+			importObject.setAttributeValue("INPUTTIME", INPUTTIME);//初始化登记时间
+	}
+
+	//数据保存进数据库前runBefor运行
+	@Override
+	public void runBefore(ASUser CurUser, Map<String, String> model,List<BizObject> importObjects,
+			JBOTransaction tx, Transaction Sqlca) throws Exception {
+
+	}
+
+	//数据保存进数据库后runAfter运行
+	@Override
+	public void runAfter(ASUser CurUser, Map<String, String> model,List<BizObject> importObjects,
+			JBOTransaction tx, Transaction Sqlca) throws Exception {
+	
+	}
+}
\ No newline at end of file
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentCarTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentCarTradition.java
index ebf50b945..d0db5af40 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentCarTradition.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentCarTradition.java
@@ -26,18 +26,18 @@ public class CreateVoucherActualPaymentCarTradition extends BaseBussiness{
 		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 EQUIP=null;						// 设备款
+		String EQUIPNOTAX=null;					// 设备款(不含税)
+		String EQUIPTAX=null;					// 设备款(税金)
+		String INSURANCE_PREMIUM_OTHER=null;	// 保险+其他
+		String INSURANCE_PREMIUM_OTHER_NOTAX=null;// 保险+其他(不含税)
+		String INSURANCE_PREMIUM_OTHER_TAX=null;// 保险+其他(税金)
+		String EQUIP_INSURACE_PREMIUM_OTHER=null;// 设备款+保险+其他
+		String FIRST_PAYMENT=null; 				// 首付款
+		String FIRST_PAYMENT_NOTAX=null; 		// 首付款(不含税)
+		String FIRST_PAYMENT_TAX=null; 			// 首付款(税金)
+		String EQUIP_PREMIUM_OTHER_SUBFIRST=null;// 设备款+保险 + 其他-首付款
+		String ACCOUNT_DATE=null; 				// 记账日期
 		String FACT_DATE=null; 					// 实际付款日期
 		String CONTRACT_ID=null; 				// 合同id
 		String CONTRACT_NUMBER=null; 			// 合同编号
@@ -50,11 +50,16 @@ public class CreateVoucherActualPaymentCarTradition extends BaseBussiness{
 		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 ";
+		sql="SELECT LFIT1.EQUIP,ROUND(LFIT1.EQUIP / getTax (LCI.LEAS_FORM,'本金',LCI.`INPUTTIME`),2) AS EQUIPNOTAX,(LFIT1.EQUIP - ROUND(LFIT1.EQUIP / getTax(LCI.LEAS_FORM,'本金',LCI.`INPUTTIME`),2)) AS EQUIPTAX,(LFIT4.INSURANCE_PREMIUM + LFIT2.OTHER_MONEY) AS INSURANCE_PREMIUM_OTHER,ROUND((LFIT4.INSURANCE_PREMIUM + LFIT2.OTHER_MONEY)/getTax(LCI.LEAS_FORM,'本金',LCI.INPUTTIME),2) AS INSURANCE_PREMIUM_OTHER_NOTAX,((LFIT4.INSURANCE_PREMIUM + LFIT2.OTHER_MONEY) - ROUND((LFIT4.INSURANCE_PREMIUM + LFIT2.OTHER_MONEY)/getTax(LCI.LEAS_FORM,'本金',LCI.INPUTTIME),2)) AS INSURANCE_PREMIUM_OTHER_TAX,(LFIT1.EQUIP + LFIT4.INSURANCE_PREMIUM + LFIT2.OTHER_MONEY) AS EQUIP_INSURACE_PREMIUM_OTHER,LFIT3.FIRST_PAYMENT,ROUND(LFIT3.FIRST_PAYMENT/getTax(LCI.LEAS_FORM,'本金',LCI.INPUTTIME),2) AS FIRST_PAYMENT_NOTAX,(LFIT3.FIRST_PAYMENT - ROUND(LFIT3.FIRST_PAYMENT/getTax(LCI.LEAS_FORM,'本金',LCI.INPUTTIME),2)) AS FIRST_PAYMENT_TAX,(LFIT1.EQUIP + LFIT4.INSURANCE_PREMIUM + LFIT2.OTHER_MONEY - LFIT3.FIRST_PAYMENT) AS EQUIP_PREMIUM_OTHER_SUBFIRST,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LFIT1.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,LFIT1.ACC_NUMBER FROM LC_CALC_CONDITION LCCT LEFT JOIN LB_CONTRACT_INFO LCI ON LCCT.CONTRACT_ID = LCI.`ID` LEFT JOIN (SELECT FLOWUNID,MAX(CONTRACT_ID) AS CONTRACT_ID,MAX(ACC_NUMBER) AS ACC_NUMBER,SUM(FACT_MONEY) AS EQUIP FROM LC_FUND_INCOME_TEMP GROUP BY FLOWUNID) LFIT1 ON LFIT1.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,FACT_MONEY AS OTHER_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype29') LFIT2 ON LFIT2.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,FACT_MONEY AS FIRST_PAYMENT,SETTLE_METHOD FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype5') LFIT3 ON LFIT3.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,FACT_MONEY AS INSURANCE_PREMIUM,SETTLE_METHOD FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype21') LFIT4 ON LFIT4.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 WHERE LCI.BUSINESSTYPE = '3' AND LFIT1.FLOWUNID=:FLOWUNID ";
 		
+		// 非差额放款部分
+		if("PZ2018092500000198".equals(VOUCHERNO) || "PZ2018092600000236".equals(VOUCHERNO)){
+			sql+=" AND LFIT3.SETTLE_METHOD !='settlemethod11'";
+		}else{// 差额部分
+			sql+=" AND LFIT3.SETTLE_METHOD='settlemethod11'";
+		}
 		param.clear();
 		map.put("FLOWUNID", FlowUnid);
 		
@@ -69,17 +74,17 @@ public class CreateVoucherActualPaymentCarTradition extends BaseBussiness{
 		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();// 设备款(税金)
+			EQUIP=dataList.get(i).get("EQUIP").toString();// 设备款
+			EQUIPNOTAX=dataList.get(i).get("EQUIPNOTAX").toString();// 设备款(不含税)
+			EQUIPTAX=dataList.get(i).get("EQUIPTAX").toString();// 设备款(税金)
+			INSURANCE_PREMIUM_OTHER=dataList.get(i).get("INSURANCE_PREMIUM_OTHER").toString();// 保险+其他
+			INSURANCE_PREMIUM_OTHER_NOTAX=dataList.get(i).get("INSURANCE_PREMIUM_OTHER_NOTAX").toString();// 保险+其他(不含税)
+			INSURANCE_PREMIUM_OTHER_TAX=dataList.get(i).get("INSURANCE_PREMIUM_OTHER_TAX").toString();// 保险+其他(税金)
+			EQUIP_INSURACE_PREMIUM_OTHER=dataList.get(i).get("EQUIP_INSURACE_PREMIUM_OTHER").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();
+			FIRST_PAYMENT_NOTAX=dataList.get(i).get("FIRST_PAYMENT_NOTAX").toString();// 不含税首付款
+			FIRST_PAYMENT_TAX=dataList.get(i).get("FIRST_PAYMENT_TAX").toString();// 首付款税金
+			EQUIP_PREMIUM_OTHER_SUBFIRST=dataList.get(i).get("EQUIP_PREMIUM_OTHER_SUBFIRST").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
@@ -93,36 +98,19 @@ public class CreateVoucherActualPaymentCarTradition extends BaseBussiness{
 			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("EQUIP",EQUIP);
+			param.put("EQUIPNOTAX",EQUIPNOTAX);
+			param.put("EQUIPTAX",EQUIPTAX);
+			param.put("INSURANCE_PREMIUM_OTHER",INSURANCE_PREMIUM_OTHER);
+			param.put("INSURANCE_PREMIUM_OTHER_NOTAX",INSURANCE_PREMIUM_OTHER_NOTAX);
+			param.put("INSURANCE_PREMIUM_OTHER_TAX",INSURANCE_PREMIUM_OTHER_TAX);
+			param.put("EQUIP_INSURACE_PREMIUM_OTHER",EQUIP_INSURACE_PREMIUM_OTHER);
 			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("EQUIP_PREMIUM_OTHER_SUBFIRST",EQUIP_PREMIUM_OTHER_SUBFIRST);
 			param.put("ACCOUNT_DATE",ACCOUNT_DATE);
 			param.put("FACT_DATE",FACT_DATE);
 			param.put("CONTRACT_ID",CONTRACT_ID);
@@ -136,16 +124,22 @@ public class CreateVoucherActualPaymentCarTradition extends BaseBussiness{
         	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"); 
+        	// 定义辅助账信息
+        	if("PZ2018092500000197".equals(VOUCHERNO) || "PZ2018092600000235".equals(VOUCHERNO)){
+            	// 融资租赁资产
+        		param.put("LEASFORMASSET", "10"); 
         		// 业务一部
             	param.put("DEPT", "01"); 
-            	// 传统融资租赁收入
+            	// 汽车融资租赁收入
+            	param.put("LEASINCOMEFORM", "05"); 
+            }else {
+            	// 融资租赁资产
+        		param.put("LEASFORMASSET", "04"); 
+        		// 业务一部
+            	param.put("DEPT", "01"); 
+            	// 汽车融资租赁收入
             	param.put("LEASINCOMEFORM", "05"); 
             }
             
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentTradition.java
index 9a49bc4e4..0717df99d 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentTradition.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentTradition.java
@@ -26,18 +26,20 @@ public class CreateVoucherActualPaymentTradition extends BaseBussiness{
 		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 EQUIP=null;						// 设备款
+		String EQUIPNOTAX=null;					// 设备款(不含税)
+		String EQUIPTAX=null;					// 设备款(税金)
+		String OTHER_MONEY=null;				// 其他款
+		String OTHERNOTAX=null; 				// 其它金额(不含税)
+		String OTHERTAX=null;					// 其它金额(税金)
+		String EQUIP_OTHER=null; 				// 设备款+其他
+		String FIRST_PAYMENT=null; 				// 首付款
+		String GUARANTY=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 HANDLING_CHARGE_MONEY_NOTAX=null;// 手续费(不含税)
+		String HANDLING_CHARGE_MONEY_TAX=null;  // 手续费(税金)
+		String OTHERS_MATH=null; 				// 设备款+其他-首付款-保证金-手续费
+		String ACCOUNT_DATE=null; 				// 记账日期
 		String FACT_DATE=null; 					// 实际付款日期
 		String CONTRACT_ID=null; 				// 合同id
 		String CONTRACT_NUMBER=null; 			// 合同编号
@@ -50,11 +52,22 @@ public class CreateVoucherActualPaymentTradition extends BaseBussiness{
 		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 ";
+		sql="SELECT LFIT1.EQUIP,ROUND(LFIT1.EQUIP / getTax(LCI.LEAS_FORM,'本金',LCI.`INPUTTIME`),2) AS EQUIPNOTAX,(LFIT1.EQUIP - ROUND(LFIT1.EQUIP/getTax(LCI.LEAS_FORM,'本金',LCI.`INPUTTIME`),2)) AS EQUIPTAX,LFIT2.OTHER_MONEY,ROUND(LFIT2.OTHER_MONEY/getTax(LCI.LEAS_FORM,'本金',LCI.`INPUTTIME`),2) AS OTHERNOTAX,(LFIT2.OTHER_MONEY-ROUND(LFIT2.OTHER_MONEY/getTax(LCI.LEAS_FORM,'本金',LCI.`INPUTTIME`),2)) AS OTHERTAX,(LFIT1.EQUIP + LFIT2.OTHER_MONEY) AS EQUIP_OTHER,LFIT3.FIRST_PAYMENT,LFIT4.GUARANTY,LFIT5.HANDLING_CHARGE_MONEY,ROUND(LFIT5.HANDLING_CHARGE_MONEY/getTax(LCI.LEAS_FORM,'手续费',LCI.INPUTTIME),2) AS HANDLING_CHARGE_MONEY_NOTAX,(LFIT5.HANDLING_CHARGE_MONEY -ROUND(LFIT5.HANDLING_CHARGE_MONEY/getTax(LCI.LEAS_FORM,'手续费',LCI.INPUTTIME),2)) AS HANDLING_CHARGE_MONEY_TAX,(LFIT1.EQUIP + LFIT2.OTHER_MONEY - LFIT3.FIRST_PAYMENT - LFIT4.GUARANTY - LFIT5.HANDLING_CHARGE_MONEY) AS OTHERS_MATH,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LFIT1.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,LFIT1.ACC_NUMBER FROM LC_CALC_CONDITION LCCT LEFT JOIN LB_CONTRACT_INFO LCI ON LCCT.CONTRACT_ID=LCI.`ID` LEFT JOIN(SELECT FLOWUNID,MAX(CONTRACT_ID) AS CONTRACT_ID,MAX(ACC_NUMBER) AS ACC_NUMBER,SUM(FACT_MONEY) AS EQUIP FROM LC_FUND_INCOME_TEMP GROUP BY FLOWUNID)LFIT1 ON LFIT1.CONTRACT_ID=LCI.ID LEFT JOIN(SELECT CONTRACT_ID,FACT_MONEY AS OTHER_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE='feetype29')LFIT2 ON LFIT2.CONTRACT_ID=LCI.ID LEFT JOIN(SELECT CONTRACT_ID,FACT_MONEY AS FIRST_PAYMENT,SETTLE_METHOD FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE='feetype5')LFIT3 ON LFIT3.CONTRACT_ID=LCI.ID LEFT JOIN(SELECT CONTRACT_ID,FACT_MONEY AS GUARANTY,SETTLE_METHOD FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE='feetype2')LFIT4 ON LFIT4.CONTRACT_ID=LCI.ID LEFT JOIN(SELECT CONTRACT_ID,FACT_MONEY AS HANDLING_CHARGE_MONEY,SETTLE_METHOD FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE='feetype1')LFIT5 ON LFIT5.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 WHERE LCI.BUSINESSTYPE='2' AND LFIT1.FLOWUNID=:FLOWUNID ";
 		
+		// 非差额放款部分
+		if("PZ2018092500000161".equals(VOUCHERNO) || "PZ2018092600000225".equals(VOUCHERNO)){
+			sql+=" AND (LFIT3.SETTLE_METHOD !='settlemethod11' AND LFIT4.SETTLE_METHOD !='settlemethod11' AND LFIT5.SETTLE_METHOD !='settlemethod11')";
+		}else if("PZ2018092500000162".equals(VOUCHERNO) || "PZ2018092600000226".equals(VOUCHERNO) || "PZ2018092500000163".equals(VOUCHERNO) || "PZ2018092600000227".equals(VOUCHERNO)) {// 差额-经销商支付的预付款(首付)/给经销商放款-首付冲抵--回租
+			sql+=" AND LFIT3.SETTLE_METHOD='settlemethod11'";
+		}else if("PZ2018092500000164".equals(VOUCHERNO) || "PZ2018092600000229".equals(VOUCHERNO) || "PZ2018092500000165".equals(VOUCHERNO) || "PZ2018092600000230".equals(VOUCHERNO)) {// 客户记录保证金/给经销商放款-保证金冲抵
+			sql+=" AND LFIT4.SETTLE_METHOD='settlemethod11'";
+		}else if("PZ2018092500000166".equals(VOUCHERNO) || "PZ2018092600000231".equals(VOUCHERNO) || "PZ2018092500000167".equals(VOUCHERNO) || "PZ2018092600000232".equals(VOUCHERNO)) {// 收到客户手续费 / 给经销商放款-手续费冲抵
+			sql+=" AND LFIT5.SETTLE_METHOD='settlemethod11'";
+		}else if("PZ2018092500000169".equals(VOUCHERNO) || "PZ2018092600000233".equals(VOUCHERNO)) {// 给经销商放款-差额放款
+			sql+=" AND (LFIT3.SETTLE_METHOD ='settlemethod11' OR LFIT4.SETTLE_METHOD ='settlemethod11' OR LFIT5.SETTLE_METHOD ='settlemethod11')";
+		}
 		param.clear();
 		map.put("FLOWUNID", FlowUnid);
 		
@@ -69,17 +82,19 @@ public class CreateVoucherActualPaymentTradition extends BaseBussiness{
 		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();// 设备款(税金)
+			EQUIP=dataList.get(i).get("EQUIP").toString();// 设备款
+			EQUIPNOTAX=dataList.get(i).get("EQUIPNOTAX").toString();// 设备款(不含税)
+			EQUIPTAX=dataList.get(i).get("EQUIPTAX").toString();// 设备款(税金)
+			OTHER_MONEY=dataList.get(i).get("OTHER_MONEY").toString();// 其他金额
+			OTHERNOTAX=dataList.get(i).get("OTHERNOTAX").toString();// 其他金额(不含税)
+			OTHERTAX=dataList.get(i).get("OTHERTAX").toString();// 其他金额(税金)
+			EQUIP_OTHER=dataList.get(i).get("EQUIP_OTHER").toString();// 设备款+其他
 			FIRST_PAYMENT=dataList.get(i).get("FIRST_PAYMENT").toString();// 首付款
+			GUARANTY=dataList.get(i).get("GUARANTY").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();// 其他金额(税金)
+			OTHERS_MATH=dataList.get(i).get("OTHERS_MATH").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
@@ -93,36 +108,22 @@ public class CreateVoucherActualPaymentTradition extends BaseBussiness{
 			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("EQUIP",EQUIP);
+			param.put("EQUIPNOTAX",EQUIPNOTAX);
+			param.put("EQUIPTAX",EQUIPTAX);
+			param.put("OTHER_MONEY",OTHER_MONEY);
+			param.put("OTHERNOTAX",OTHERNOTAX);
+			param.put("OTHERTAX",OTHERTAX);
+			param.put("EQUIP_OTHER",EQUIP_OTHER);
 			param.put("FIRST_PAYMENT",FIRST_PAYMENT);
+			param.put("OTHER_MONEY",OTHER_MONEY);
+			param.put("GUARANTY",GUARANTY);
 			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("OTHERS_MATH",OTHERS_MATH);
 			param.put("ACCOUNT_DATE",ACCOUNT_DATE);
 			param.put("FACT_DATE",FACT_DATE);
 			param.put("CONTRACT_ID",CONTRACT_ID);
@@ -136,12 +137,25 @@ public class CreateVoucherActualPaymentTradition extends BaseBussiness{
         	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)){
+        	if("PZ2018092500000159".equals(VOUCHERNO) || "PZ2018092600000223".equals(VOUCHERNO)){
         		// 融资租赁资产
+        		param.put("LEASFORMASSET", "06"); 
+        		// 业务一部
+            	param.put("DEPT", "01"); 
+            	// 传统融资租赁收入
+            	param.put("LEASINCOMEFORM", "06"); 
+            }else if("PZ2018092500000160".equals(VOUCHERNO) || "PZ2018092600000224".equals(VOUCHERNO)){
+            	// 融资租赁资产
+        		param.put("LEASFORMASSET", "10"); 
+        		// 业务一部
+            	param.put("DEPT", "01"); 
+            	// 传统融资租赁收入
+            	param.put("LEASINCOMEFORM", "06"); 
+            }else {
+            	// 融资租赁资产
         		param.put("LEASFORMASSET", "02/03/05/06"); 
         		// 业务一部
             	param.put("DEPT", "01"); 
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucherTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucherTradition.java
new file mode 100644
index 000000000..dbd93efaf
--- /dev/null
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucherTradition.java
@@ -0,0 +1,26 @@
+package com.tenwa.voucher.CreateVoucherProcess.CreateVoucherMethodSettle;
+
+import com.amarsoft.awe.util.Transaction;
+import com.tenwa.flow.baseBussion.BaseBussiness;
+import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherOnhireTradition;
+/**
+ * 传统/汽车类传统起租生成凭证
+ * @author xiezhiwen
+ */
+public class ContractOnhireVoucherTradition  extends BaseBussiness {
+
+	public Object run(Transaction Sqlca) throws Exception {
+		this.initBussinessParam(Sqlca);
+		String FlowUnid=this.getAttribute("FlowUnid").toString();
+		CreateVoucherOnhireTradition cvot=new CreateVoucherOnhireTradition();
+		// 传统
+		System.out.println(0/0);
+		cvot.CreateVoucher(FlowUnid, "PZ2018092500000170"); //客户支付的应收账款总金额 --回租
+		cvot.CreateVoucher(FlowUnid, "PZ2018092800000247"); //客户支付的应收账款总金额 --直租
+		// 汽车类传统
+		cvot.CreateVoucher(FlowUnid, "PZ2018092500000202"); //客户支付的应收账款总金额 --回租
+		cvot.CreateVoucher(FlowUnid, "PZ2018092800000248"); //客户支付的应收账款总金额 --直租
+		
+		return "true";
+	}
+}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherOnhireTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherOnhireTradition.java
new file mode 100644
index 000000000..9c5ac9764
--- /dev/null
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherOnhireTradition.java
@@ -0,0 +1,139 @@
+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 CreateVoucherOnhireTradition 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 OTHERSMONEY=null;	// 车款-首付款+保险+其他
+		String EQUIP_SUBFIRST=null;					// 车款-首付款
+		String INSURANCE_PREMIUM_ADD_OTHER=null;				// 保险+其他
+		String INTEREST=null;						// 利息
+		String INTERESTNOTAX=null; 					// 利息(不含税)
+		String 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 sql="";
+		
+		if("PZ2018092500000170".equals(VOUCHERNO) || "PZ2018092800000247".equals(VOUCHERNO)) {
+			sql="SELECT (LCCT.EQUIP_AMT - LCCT.FIRST_PAYMENT + LCCT.INSURANCE_PREMIUM +LCCT.OTHER_MONEY) AS OTHERSMONEY,(LCCT.EQUIP_AMT - LCCT.FIRST_PAYMENT ) AS EQUIP_SUBFIRST,( LCCT.INSURANCE_PREMIUM +LCCT.OTHER_MONEY) AS INSURANCE_OTHER,LRPT.INTEREST,ROUND(LRPT.INTEREST / getTax (LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2) AS INTERESTNOTAX,(LRPT.INTEREST - ROUND(LRPT.INTEREST / getTax (LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2)) AS 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 DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT FLOWUNID,MIN(CONTRACT_ID) AS CONTRACT_ID,MIN(ACC_NUMBER) AS ACC_NUMBER FROM LC_FUND_INCOME_TEMP GROUP BY FLOWUNID) LFIT ON LFIT.CONTRACT_ID=LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LCCT.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,SUM(INTEREST) AS INTEREST FROM LC_RENT_PLAN_TEMP GROUP BY FLOWUNID) LRPT ON LRPT.FLOWUNID = LCCT.FLOWUNID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID = LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID = LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE='2' AND LFIT.FLOWUNID=:FLOWUNID ";
+		}else {
+			
+			sql="SELECT (LCCT.EQUIP_AMT - LCCT.FIRST_PAYMENT + LCCT.INSURANCE_PREMIUM +LCCT.OTHER_MONEY) AS OTHERSMONEY,(LCCT.EQUIP_AMT - LCCT.FIRST_PAYMENT ) AS EQUIP_SUBFIRST,( LCCT.INSURANCE_PREMIUM +LCCT.OTHER_MONEY) AS INSURANCE_OTHER,LRPT.INTEREST,ROUND(LRPT.INTEREST / getTax (LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2) AS INTERESTNOTAX,(LRPT.INTEREST - ROUND(LRPT.INTEREST / getTax (LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2)) AS 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 DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT FLOWUNID,MIN(CONTRACT_ID) AS CONTRACT_ID,MIN(ACC_NUMBER) AS ACC_NUMBER FROM LC_FUND_INCOME_TEMP GROUP BY FLOWUNID) LFIT ON LFIT.CONTRACT_ID=LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LCCT.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,SUM(INTEREST) AS INTEREST FROM LC_RENT_PLAN_TEMP GROUP BY FLOWUNID) LRPT ON LRPT.FLOWUNID = LCCT.FLOWUNID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID = LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID = LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE 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++){
+			OTHERSMONEY=dataList.get(i).get("OTHERSMONEY").toString();// 车款-首付款+保险+其他
+			EQUIP_SUBFIRST=dataList.get(i).get("EQUIP_SUBFIRST").toString();// 车款-首付款
+			INSURANCE_PREMIUM_ADD_OTHER=dataList.get(i).get("INSURANCE_PREMIUM_ADD_OTHER").toString();// 保险+其他
+			INTEREST=dataList.get(i).get("INTEREST").toString();// 利息
+			INTERESTNOTAX=dataList.get(i).get("INTERESTNOTAX").toString();// 利息(不含税)
+			TAX=dataList.get(i).get("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();// 银行账号
+
+			// 将数据封装到定义好的map集合中
+			param.put("OTHERSMONEY",OTHERSMONEY);
+			param.put("EQUIP_SUBFIRST",EQUIP_SUBFIRST);
+			param.put("INSURANCE_PREMIUM_ADD_OTHER",INSURANCE_PREMIUM_ADD_OTHER);
+			param.put("INTEREST",INTEREST);
+			param.put("INTERESTNOTAX",INTERESTNOTAX);
+			param.put("TAX",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("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/VoucherGetMoneyForTradition/ContractGetMoneyToCautionMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToCautionMoney.java
index 4a524b036..75109516c 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToCautionMoney.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToCautionMoney.java
@@ -15,8 +15,8 @@ public class ContractGetMoneyToCautionMoney implements VoucherJavaParamService{
 		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);
+		String GUARANTY=param.get("GUARANTY")==null?"0.00":param.get("GUARANTY");
+		returnValue.put("MONEY",GUARANTY);
 		return returnValue;
 	}
 }
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquip.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquip.java
index b167ec291..808ee199c 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquip.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquip.java
@@ -15,8 +15,8 @@ public class ContractGetMoneyToEquip implements VoucherJavaParamService{
 		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);
+		String EQUIP=param.get("EQUIP")==null?"0.00":param.get("EQUIP");
+		returnValue.put("MONEY",EQUIP);
 		return returnValue;
 	}
 }
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddInsuranceAddOtherSubFirst.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddInsuranceAddOtherSubFirst.java
index 7ac999967..d04e0f50f 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddInsuranceAddOtherSubFirst.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddInsuranceAddOtherSubFirst.java
@@ -15,8 +15,9 @@ public class ContractGetMoneyToEquipAddInsuranceAddOtherSubFirst implements Vouc
 		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);
+		returnValue.put("FUNDTYPE","01");
+		String EQUIP_PREMIUM_OTHER_SUBFIRST=param.get("EQUIP_PREMIUM_OTHER_SUBFIRST")==null?"0.00":param.get("EQUIP_PREMIUM_OTHER_SUBFIRST");
+		returnValue.put("MONEY",EQUIP_PREMIUM_OTHER_SUBFIRST);
 		return returnValue;
 	}
 }
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddOthers.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddOthers.java
index dbb16374e..8e66546d8 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddOthers.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddOthers.java
@@ -15,14 +15,9 @@ 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());
+		// 设备款+其他金额
+		String EQUIP_OTHER=param.get("EQUIP_OTHER")==null?"0.00":param.get("EQUIP_OTHER");
+		returnValue.put("MONEY",EQUIP_OTHER);
 		return returnValue;
 	}
 }
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipNoTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipNoTax.java
index d743e1d8b..dd14fd0df 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipNoTax.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipNoTax.java
@@ -15,8 +15,8 @@ public class ContractGetMoneyToEquipNoTax implements VoucherJavaParamService{
 		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);
+		String EQUIPNOTAX=param.get("EQUIPNOTAX")==null?"0.00":param.get("EQUIPNOTAX");
+		returnValue.put("MONEY",EQUIPNOTAX);
 		return returnValue;
 	}
 }
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipSubFirst.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipSubFirst.java
new file mode 100644
index 000000000..35e67cf9c
--- /dev/null
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipSubFirst.java
@@ -0,0 +1,21 @@
+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 ContractGetMoneyToEquipSubFirst 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_SUBFIRST=param.get("EQUIP_SUBFIRST")==null?"0.00":param.get("EQUIP_SUBFIRST");
+		returnValue.put("MONEY",EQUIP_SUBFIRST);
+		return returnValue;
+	}
+}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipTax.java
index 20aa09da3..ca9e17315 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipTax.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipTax.java
@@ -15,8 +15,8 @@ public class ContractGetMoneyToEquipTax implements VoucherJavaParamService{
 		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);
+		String EQUIPTAX=param.get("EQUIPTAX")==null?"0.00":param.get("EQUIPTAX");
+		returnValue.put("MONEY",EQUIPTAX);
 		return returnValue;
 	}
 }
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToINTEREST.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToINTEREST.java
new file mode 100644
index 000000000..263990866
--- /dev/null
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToINTEREST.java
@@ -0,0 +1,21 @@
+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;
+/**
+ * 获取INTEREST
+ * @author xiezhiwen
+ */
+public class ContractGetMoneyToINTEREST 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("FUNDTYPE","02");
+		returnValue.put("MONEY",param.get("INTEREST"));
+		return returnValue;
+	}
+}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOther.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOther.java
index 5ccac5085..7f498e928 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOther.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOther.java
@@ -15,8 +15,8 @@ public class ContractGetMoneyToInsuranceAddOther implements VoucherJavaParamServ
 		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);
+		String INSURANCE_PREMIUM_OTHER=param.get("INSURANCE_PREMIUM_OTHER")==null?"0.00":param.get("INSURANCE_PREMIUM_OTHER");
+		returnValue.put("MONEY",INSURANCE_PREMIUM_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
index 1c7109ae7..778dec909 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOtherNoTax.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOtherNoTax.java
@@ -15,8 +15,8 @@ public class ContractGetMoneyToInsuranceAddOtherNoTax implements VoucherJavaPara
 		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);
+		String INSURANCE_PREMIUM_OTHER_NOTAX=param.get("INSURANCE_PREMIUM_OTHER_NOTAX")==null?"0.00":param.get("INSURANCE_PREMIUM_OTHER_NOTAX");
+		returnValue.put("MONEY",INSURANCE_PREMIUM_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
index 79defb5d9..487f23ccb 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOtherTax.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOtherTax.java
@@ -15,8 +15,8 @@ public class ContractGetMoneyToInsuranceAddOtherTax implements VoucherJavaParamS
 		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);
+		String INSURANCE_PREMIUM_OTHER_TAX=param.get("INSURANCE_PREMIUM_OTHER_TAX")==null?"0.00":param.get("INSURANCE_PREMIUM_OTHER_TAX");
+		returnValue.put("MONEY",INSURANCE_PREMIUM_OTHER_TAX);
 		return returnValue;
 	}
 }
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoneyNoTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoneyNoTax.java
index 06cc158e3..37cab07a1 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoneyNoTax.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoneyNoTax.java
@@ -14,6 +14,7 @@ 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("FUNDTYPE","02");
 		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
index 3f3dc12ac..b8f5ab032 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoneyTax.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoneyTax.java
@@ -14,6 +14,7 @@ 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("FUNDTYPE","02");
 		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
index 6ba47bc76..69a796e86 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOther.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOther.java
@@ -1,6 +1,5 @@
 package com.tenwa.voucher.CreateVoucherProcess.VoucherGetMoneyForTradition;
 
-import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOtherNoTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOtherNoTax.java
index 46d5feade..48f72774e 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOtherNoTax.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOtherNoTax.java
@@ -15,8 +15,8 @@ public class ContractGetMoneyToOtherNoTax implements VoucherJavaParamService{
 		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);
+		String OTHERNOTAX=param.get("OTHERNOTAX")==null?"0.00":param.get("OTHERNOTAX");
+		returnValue.put("MONEY",OTHERNOTAX);
 		return returnValue;
 	}
 }
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOtherTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOtherTax.java
index be577072a..b417d773c 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOtherTax.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOtherTax.java
@@ -15,8 +15,8 @@ public class ContractGetMoneyToOtherTax implements VoucherJavaParamService{
 		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);
+		String OTHERTAX=param.get("OTHERTAX")==null?"0.00":param.get("OTHERTAX");
+		returnValue.put("MONEY",OTHERTAX);
 		return returnValue;
 	}
 }
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOthersMath.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOthersMath.java
index 3df614451..95d183658 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOthersMath.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOthersMath.java
@@ -15,20 +15,8 @@ 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());
+		String OTHERS_MATH=param.get("OTHERS_MATH")==null?"0.00":param.get("OTHERS_MATH");
+		returnValue.put("MONEY",OTHERS_MATH);
 		return returnValue;
 	}
 }
diff --git a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java
index 163bfa481..ce68e79da 100644
--- a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java
+++ b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java
@@ -225,6 +225,7 @@ public class CreateVoucherServiceImpl {
 		for(BizObject bo:subList){
 			Map<String,String> subData=new HashMap<String, String>();
 			String subId=bo.getAttribute("LOAN_SUBJECT").getString();
+			
 			BizObject sub=JBOFactory.createBizObjectQuery(LV_STACTS_CONFIG.CLASS_NAME,"id=:id").setParameter("id", subId).getSingleResult(false);
 			subData.put("F2", sub.getAttribute("SUBJECTS_CODE").getString());
 			if(sub.getAttribute("SUBJECTS_CODE").getString().endsWith("****")){
@@ -267,7 +268,6 @@ public class CreateVoucherServiceImpl {
 				abs=abs.replaceAll(para, StringUtil.nullToString( param.get(para.replaceAll("#", ""))));
 			}
 			
-			
 			Map<String,String> dataTemp=new HashMap<String, String>();
 			VoucherParamServiceImpl psi=new VoucherParamServiceImpl();
 			//获取数据
@@ -360,6 +360,49 @@ public class CreateVoucherServiceImpl {
 			if(sub.getAttribute("AUXILIARY_TYPE").getString().length()>0){
 				subData.putAll(this.getAuxiliaryData(tx, param, sub.getAttribute("AUXILIARY_TYPE").getString()));
 			}
+			
+			// 获取直租/回租类型
+			String LEAS_FORM = param.get("LEAS_FORM");
+			// 获取当前凭证借贷序号
+			String SORT_NUMBER = bo.getAttribute("SORT_NUMBER").getString();
+			// 汽车类应收账款总金额根据分录配置辅助核算值---除了没有的和其他(10), 其他都是默认汽车(04)
+			if("PZ2018071000000005".equals(voucherid) || "PZ2018080300000069".equals(voucherid)) {
+				if("01".equals(LEAS_FORM)) {//直租
+					if("5".equals(SORT_NUMBER)) {
+						subData.put("LEASFORMASSET", "10");
+					}else if("1".equals(SORT_NUMBER) || "2".equals(SORT_NUMBER) || "6".equals(SORT_NUMBER) || "7".equals(SORT_NUMBER)) {
+						subData.remove("LEASFORMASSET");
+					}
+				}else {// 回租
+					if("4".equals(SORT_NUMBER)){
+						subData.put("LEASFORMASSET", "10");
+					}else if("1".equals(SORT_NUMBER) || "2".equals(SORT_NUMBER) || "6".equals(SORT_NUMBER)){
+						subData.remove("LEASFORMASSET");
+					}
+				}
+			}
+			
+			// 传统应收账款总金额 辅助账调整
+			if("PZ2018092500000170".equals(voucherid) || "PZ2018092800000247".equals(voucherid)) {
+				if("4".equals(SORT_NUMBER)) {
+					subData.put("LEASFORMASSET", "10");
+				}else if("1".equals(SORT_NUMBER) || "2".equals(SORT_NUMBER) || "6".equals(SORT_NUMBER)) {
+					subData.remove("LEASFORMASSET");
+				}
+			}
+			
+			// 汽车传统应收账款总金额 辅助账调整
+			if("PZ2018092500000202".equals(voucherid) || "PZ2018092800000248".equals(voucherid)) {
+				if("3".equals(SORT_NUMBER) || "5".equals(SORT_NUMBER)) {
+					// 传统融资租赁收入
+					subData.put("LEASINCOMEFORM", "03"); 
+					subData.put("LEASFORMASSET", "04");
+				}else if("4".equals(SORT_NUMBER)) {
+					subData.put("LEASFORMASSET", "10");
+				}else {
+					subData.remove("LEASFORMASSET");
+				}
+			}
 			list.add(subData);
 		}
 		return list;
diff --git a/src_tenwa/com/tenwa/customer/controller/partner/NewPartnerCompanyController.java b/src_tenwa/com/tenwa/customer/controller/partner/NewPartnerCompanyController.java
index 3b22e4a29..2f7394999 100644
--- a/src_tenwa/com/tenwa/customer/controller/partner/NewPartnerCompanyController.java
+++ b/src_tenwa/com/tenwa/customer/controller/partner/NewPartnerCompanyController.java
@@ -174,7 +174,7 @@ public class NewPartnerCompanyController{
 			BizObject newCustomerType = typeManager.newObject();
 			newCustomerType.setAttributeValue("customerid",newCustomer.getAttribute("customerid").getString());
 			newCustomerType.setAttributeValue("custtype",partnerType);
-			newCustomerType.setAttributeValue("custstatus","status02");
+			newCustomerType.setAttributeValue("custstatus","status04");
 			newCustomerType.setAttributeValue("status","valid");
 			newCustomerType.setAttributeValue("isoriginal","yes");
 			newCustomerType.setAttributeValue("inputuserid", userId);
diff --git a/src_tenwa/com/tenwa/lease/app/message/UpdateMessageHandler.java b/src_tenwa/com/tenwa/lease/app/message/UpdateMessageHandler.java
new file mode 100644
index 000000000..1a3a8c721
--- /dev/null
+++ b/src_tenwa/com/tenwa/lease/app/message/UpdateMessageHandler.java
@@ -0,0 +1,61 @@
+package com.tenwa.lease.app.message;
+
+import com.amarsoft.are.jbo.JBOTransaction;
+import com.amarsoft.awe.util.SqlObject;
+import com.amarsoft.awe.util.Transaction;
+
+
+public class UpdateMessageHandler {
+	private String sparam;
+	private String ids;
+	public String getIds() {
+		return ids;
+	}
+
+	public void setIds(String ids) {
+		this.ids = ids;
+	}
+
+	public String getSparam() {
+		return sparam;
+	}
+
+	public void setSparam(String sparam) {
+		this.sparam = sparam;
+	}
+	
+	public String MultiUpdate(JBOTransaction tx) throws Exception{
+		String[] paramArray=sparam.split("@");
+		String[] keyArray={"if_loan_money","loan_bank","loan_contract_no","loan_principal","loan_rate"};
+		this.setIds(ids.substring(1, ids.length()-1).replaceAll("\"", ""));
+		String[] idArray=ids.split("@");
+		
+		StringBuffer sql=new StringBuffer("update lc_source_of_funds set ");
+		StringBuffer setSQLStr=new StringBuffer ("");
+		String setSQL="";
+		StringBuffer idbuffer=new StringBuffer ("");
+		for(int i=0;i<paramArray.length;i++){
+			if(paramArray[i]!=null&&!"".equals(paramArray[i])) {
+				setSQLStr.append(keyArray[i]+"='"+paramArray[i]+"'"+" @");
+			}
+		}
+		for(int i=0;i<idArray.length;i++){
+			idbuffer.append("'"+idArray[i]+"'");
+			if(i!=idArray.length-1)idbuffer.append(",");
+		}
+		String idstr=" where id in ("+idbuffer+")";
+		setSQL=setSQLStr.substring(0, setSQLStr.length()-1).replaceAll("@", ",");
+		sql.append(setSQL);
+		sql.append(idstr);
+		try{
+		Transaction Sqlca =null;
+		Sqlca =  Transaction.createTransaction(tx);
+		SqlObject asql = new SqlObject(sql.toString());		
+		Sqlca.executeSQL(asql);
+			return "true";
+		}catch(Exception e){
+			e.printStackTrace();
+			return "false";
+		}
+	}
+}