diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/LBContractDevolutionInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/LBContractDevolutionInfo.jsp
index 53e1541d7..2599345b0 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/LBContractDevolutionInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/LBContractDevolutionInfo.jsp
@@ -87,6 +87,7 @@
 	<%
 	String sButtons[][] = {
 			{"true","All","Button","保存","保存所有修改","saveRecord()","","","","btn_icon_save"},
+			{"true","All","Button","生成电子章","盖公司电子章","stamp()","","","",""},
 		};
 	sButtonPosition = "north";
 	%>
@@ -118,9 +119,10 @@
 			param["templateNo"]="a9335f5624124b6db29f0d721fc8b61c";
 			
 			//生成文件关联关系
-			tempParam["OBJECTTYPE"]="产权转移单";
+			tempParam["OBJECTTYPE"]="transfer";
 			tempParam["FLOW_UNID"]="<%=sFlowUnid%>";
 			tempParam["PROJ_ID"]="<%=projectid%>";
+			tempParam["ID"]="<%=contractid%>";
 			tempParam["CONTRACT_ID"]="<%=contractid%>";
 			tempParam["contract_number"]="<%=contract_number%>";
 			//生成模板固定参数
@@ -133,10 +135,10 @@
 				  if(sparam.length>0){sparam+=",";}
 				   sparam+=key+"="+param[key];
 			}
-			var deleteparam ="PROJECT_PLAN_NUMBER="+"<%=contractid%>"+",objecttype=产权转移单";
+			var deleteparam ="PROJECT_PLAN_NUMBER="+"<%=contractid%>"+",objecttype=transfer";
 			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=transfer");
+			RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","wordToPdfAnnex","contract_id=<%=contractid%>,PLAN_LIST=transfer,FlowUnid=<%=sFlowUnid%>");
 		if(bIsInsert)
 		{
 			beforeInsert();
@@ -146,6 +148,17 @@
 		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=transfer");
+		
+		location.reload();
+		
+	}
 </script>
 <%/*~END~*/%>
 
diff --git a/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionRentNotifyAdjust.jsp b/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionRentNotifyAdjust.jsp
new file mode 100644
index 000000000..7b4c448a1
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionRentNotifyAdjust.jsp
@@ -0,0 +1,148 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_simplelist.jspf"%>
+<%@ page import="com.tenwa.doc.action.DocListInitAction" %>
+<%@ page import="com.amarsoft.app.lc.workflow.action.GetFlowAction" %>
+<%@ page import="com.amarsoft.app.util.*"  %>
+<%
+	/*
+        Author: undefined 2016-09-01
+        Content: 
+        History Log: 
+    */
+ 		String flowunid = CurPage.getParameter("FlowUnid");
+		BizObject flow = GetFlowAction.getFlowBussinessObject(flowunid);
+		String projid = flow.getAttribute("proj_id").getString();
+		String contract_id = flow.getAttribute("contract_id").getString();
+		String ishistory = CurPage.getParameter("ishistory");
+		String nodeNo=CurPage.getParameter("NodeNo");
+		String RightType = CurPage.getParameter("RightType");
+		
+		String sTempletNo = CurPage.getParameter("TempletNo");//模板号
+			sTempletNo = "AdjustmentNotice";
+		String userName = CurUser.getUserName();
+
+		String compClientID = request.getParameter("CompClientID");
+		ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+		doTemp.setVisible("ACTION", true);
+		ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,
+				request);
+		dwTemp.Style = "1"; //--设置为Grid风格--
+		dwTemp.ReadOnly = "1";
+		dwTemp.setPageSize(50);
+// 		dwTemp.genHTMLObjectWindow(docname+","+contract_id);
+
+		//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
+		String sButtons[][] =null;
+		sButtons=new String[][]{
+				{"true","All","Button","生成租金通知书","生成租金通知书","generateQuotation()","","","","btn_icon_generate"},
+				{"true","All","Button","公司盖章","公司盖章","stamp()","","","",""},
+		};
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<script type="text/javascript">
+
+		//在加载完表格后调用
+		function afterSearch(){
+			  var ishistory = "<%=ishistory%>";
+			  var RightType = "<%=RightType%>";
+				for(var i=0;i<getRowCount(0);i++){
+					var html="";
+						html+='<a onclick=downloadFile(\''+getItemValue(0,i,"V.attrid")+'\')><font color="blue">'+getObj(0,i,"FILENAME").innerHTML+'</font></a>';
+					getObj(0,i,"FILENAME").innerHTML=html;
+				};
+					for(var i=0;i<getRowCount(0);i++){
+						html='<a class="btn_icon_detail" onclick="viewOffice()">&nbsp</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+						if((null ==RightType||RightType!="ReadOnly")&&(null==ishistory||ishistory!="true")){
+						html+=' <a class="btn_icon_edit" onclick="editOffice()">&nbsp;</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <a class="btn_icon_delete"onclick="deleteFile()">&nbsp;</a>&nbsp;&nbsp;&nbsp; ';
+						}
+						getObj(0,i,"ACTION").innerHTML=html;
+					}
+					 setColumnWidth(0,"ACTION",150); 
+		}
+
+		
+		function viewOffice(){
+			var id = getItemValue(0,getRow(),"V.attrid");
+			var filename = getItemValue(0,getRow(),"FILENAME");
+			var  filetype=filename.substr(filename.indexOf(".")+1);
+			var status=1;
+			  AsDialog.PopView("/Tenwa/Core/OfficeTemplate/OnlineOperation/online/editOfficeOnLine.jsp","filetype="+filetype+"&status="+status+"&id="+id+"&CompClientID=<%=compClientID%>","dialogWidth=1024px;dialogHeight=1000px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(sPhaseInfo){
+			    	if(typeof(sPhaseInfo)=="undefined" || sPhaseInfo=="" || sPhaseInfo==null || sPhaseInfo=="null" || sPhaseInfo=="_CANCEL_") {
+						return;
+					}else if(sPhaseInfo == "Success" || sPhaseInfo == "success"){
+						alert("提交成功!");
+				        reloadSelf();
+					}else{
+						alert("提交失败!");
+					}
+			    },"查看文档");
+		}
+		
+
+		function editOffice(){
+			var id = getItemValue(0,getRow(),"V.attrid");
+			var filename = getItemValue(0,getRow(),"FILENAME");
+			var  filetype=filename.substr(filename.indexOf(".")+1);
+			var status=2;
+			  AsDialog.PopView("/Tenwa/Core/OfficeTemplate/OnlineOperation/online/editOfficeOnLine.jsp","filetype="+filetype+"&status="+status+"&id="+id+"&CompClientID=<%=compClientID%>","dialogWidth=1024px;dialogHeight=1000px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(sPhaseInfo){
+			    	if(typeof(sPhaseInfo)=="undefined" || sPhaseInfo=="" || sPhaseInfo==null || sPhaseInfo=="null" || sPhaseInfo=="_CANCEL_") {
+						return;
+					}else if(sPhaseInfo == "Success" || sPhaseInfo == "success"){
+						alert("提交成功!");
+				        reloadSelf();
+					}else{
+						alert("提交失败!");
+					}
+			    },"编辑文档");
+		}
+
+		
+		function deleteFile(){
+			var id = getItemValue(0,getRow(),"V.attrid");
+			var sParams="attId="+id;
+			var sReturnInfo = RunJavaMethodTrans("com.tenwa.doc.action.DocListAction","deleteFile",sParams);
+			reloadSelf();
+		}
+
+		
+		function downloadFile(id){
+			if(!frames["downloadTemplate"]) $("<iframe name='downloadTemplate' style='display:none;'></iframe>").appendTo("body");
+			window.open(sWebRootPath+"/servlet/view/docDownloadServlet?CompClientID=<%=sCompClientID%>&sqlString=save@"+id, "downloadTemplate");
+		}
+		function generateQuotation()
+		{
+			var param={};
+			var tempParam={};
+			var sparam="";
+			//模板号
+// 			param["templateNo"]="e1fc3afacfbc46fea0a881ac20de23cc";
+			param["templateNo"]="e14dcf655fb14161be8b1ff7be472cd8";
+			//生成文件关联关系
+			tempParam["OBJECTTYPE"]="AdjustmentNotice";
+			tempParam["FLOW_UNID"]="<%=flowunid%>";
+			tempParam["PROJ_ID"]="<%=projid%>";
+			tempParam["contract_id"]="<%=contract_id%>";
+			//生成模板固定参数
+			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 deleteresult=RunJavaMethodTrans("com.tenwa.officetempalte.controller.RentNotinyDeleteAction","deletequtation","plan_number="+plan_number+",plan_list="+plan_list);
+			var result=RunJavaMethodTrans("com.tenwa.officetempalte.action.CreateOfficeAction","createOfficeByTemplate",sparam);
+			//word转pdf
+			var id = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","wordToPdfAnnex","FlowUnid=<%=flowunid%>,PLAN_LIST=AdjustmentNotice");
+			
+			reloadSelf();
+
+		}
+		
+		
+		function stamp(){
+			var result=RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","TcollectionSignA","FlowUnid=<%=flowunid%>,flagType=AdjustmentNotice");
+		}
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/etc/app/component/component-config.xml b/WebContent/WEB-INF/etc/app/component/component-config.xml
index d7f6179ff..36fdf165e 100644
--- a/WebContent/WEB-INF/etc/app/component/component-config.xml
+++ b/WebContent/WEB-INF/etc/app/component/component-config.xml
@@ -428,7 +428,7 @@
 			</Rule>
 		</Rules>
 	</Component>
-	<Component FORMAT="1" ID="even_interest" NAME="均息法" PRODUCT_TYPE="car_product" STATUS="1" TYPE="PRD0301">
+	<Component FORMAT="1" ID="even_interest" NAME="均息法" PRODUCT_TYPE="" STATUS="1" TYPE="PRD0301">
 		<!-- <Parameters>
 			<Parameter ARIGHTTYPE="All" DISPLAYNAME="默认还款日" MAXIMUMVALUE="28" MINIMUMVALUE="1" PARAMETERID="DefaultDueDay" PARAMETERNAME="默认还款日" PRIGHTTYPE="All" SORTNO="" VALUE=""/>
 			<Parameter ARIGHTTYPE="Required" DISPLAYNAME="还款周期" OPTIONALVALUE="1,2,6" OPTIONALVALUENAME="按月,按季,指定周期" PARAMETERID="PayFrequencyType" PARAMETERNAME="还款周期" PRIGHTTYPE="Required" SORTNO="" VALUE="1" VALUENAME="按月"/>
@@ -1081,7 +1081,7 @@
 	<Component FORMAT="1" ID="FIRST_PAYMENT" NAME="首付款" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Hide"/></Parameters></Component>
 	<Component FORMAT="1" ID="HANDLING_CHARGE_MONEY" NAME="手续费" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="收取方式" PARAMETERID="PoundageStyle" PARAMETERNAME="手续费计算方式" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否参与融资" PARAMETERID="FINAN" PARAMETERNAME="是否参与融资" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否差额放款" PARAMETERID="isBalance" PARAMETERNAME="是否差额放款" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="分摊方式" PARAMETERID="oneOrMore" PARAMETERNAME="分摊方式" PRIGHTTYPE="Required"/></Parameters></Component>
 	<Component FORMAT="1" ID="CAUTION_MONEY" NAME="保证金" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="显示次序" PARAMETERID="DISPLAY_ORDER" PARAMETERNAME="显示次序" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="保证金计算方式" PARAMETERID="DepositStyle" PARAMETERNAME="保证金计算方式" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否差额放款" PARAMETERID="isBalance" PARAMETERNAME="是否差额放款" PRIGHTTYPE="Required"/></Parameters></Component>
-	<Component FORMAT="1" ID="MANAGEMENT_MONEY" NAME="管理费" PRODUCT_TYPE="business_product" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="显示次序" PARAMETERID="DISPLAY_ORDER" PARAMETERNAME="显示次序" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与融资" PARAMETERID="FINAN" PARAMETERNAME="是否参与融资" PRIGHTTYPE="Required"/></Parameters></Component>
+	<Component FORMAT="1" ID="MANAGEMENT_MONEY" NAME="管理费" PRODUCT_TYPE="business_product" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="显示次序" PARAMETERID="DISPLAY_ORDER" PARAMETERNAME="显示次序" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="是否参与融资" PARAMETERID="FINAN" PARAMETERNAME="是否参与融资" PRIGHTTYPE="None"/></Parameters></Component>
 	
 	<Component FORMAT="1" ID="OTHER_INCOME" NAME="其他收入" PRODUCT_TYPE="business_product" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="显示次序" PARAMETERID="DISPLAY_ORDER" PARAMETERNAME="显示次序" PRIGHTTYPE="Required"/></Parameters></Component>
 	<Component FORMAT="1" ID="OTHER_EXPENDITURE" NAME="其他支出" STATUS="2" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="显示次序" PARAMETERID="DISPLAY_ORDER" PARAMETERNAME="显示次序" PRIGHTTYPE="Required"/></Parameters></Component>
diff --git a/WebContent/fileTemplate/鍑虹浜轰骇鏉冭浆绉昏瘉涔�.docx b/WebContent/fileTemplate/鍑虹浜轰骇鏉冭浆绉昏瘉涔�.docx
new file mode 100644
index 000000000..fa19c6801
Binary files /dev/null and b/WebContent/fileTemplate/鍑虹浜轰骇鏉冭浆绉昏瘉涔�.docx differ
diff --git a/WebContent/fileTemplate/绉熼噾璋冩暣閫氱煡涔�.docx b/WebContent/fileTemplate/绉熼噾璋冩暣閫氱煡涔�.docx
new file mode 100644
index 000000000..ca3fa9ef3
Binary files /dev/null and b/WebContent/fileTemplate/绉熼噾璋冩暣閫氱煡涔�.docx differ
diff --git a/calc/com/tenwa/reckon/product/ProductCondition.java b/calc/com/tenwa/reckon/product/ProductCondition.java
index 3005a1e75..779efad36 100644
--- a/calc/com/tenwa/reckon/product/ProductCondition.java
+++ b/calc/com/tenwa/reckon/product/ProductCondition.java
@@ -8,6 +8,7 @@ import java.util.Map.Entry;
 import java.util.Vector;
 
 import jbo.com.tenwa.lease.comm.CONFIGURATE;
+import jbo.prd.BUSINESS_TYPE;
 import jbo.sys.CODE_LIBRARY;
 import apx.com.amarsoft.als.apzl.apply.business.loan.product.ProductBaseLoanTools;
 
@@ -587,9 +588,16 @@ public class ProductCondition {
 				doTemp.setColumnAttribute("FREE_DEFA_INTER_DAY","colreadonly", "1");
 			}
 		}*/
+		BizObject bo1 = JBOFactory.createBizObjectQuery(BUSINESS_TYPE.CLASS_NAME,"typeno=:productId")
+				.setParameter("productId",productId).getSingleResult(false);
+		String attribute2=(bo1==null)?"":bo1.getAttribute("ATTRIBUTE2").getString();
 		BizObject bo = JBOFactory.createBizObjectQuery(CONFIGURATE.CLASS_NAME,"ATTR_ID=:attrId")
 				.setParameter("attrId","免罚息天数配置").getSingleResult(false);
-		String day = (bo==null)?"":bo.getAttribute("ATTR_VALUE").getString();
+		String day="0";
+		if(attribute2!=""&&"car_product".equals(attribute2)){
+			day = (bo==null)?"":bo.getAttribute("ATTR_VALUE").getString();
+		}
+		
 		doTemp.setDefaultValue("FREE_DEFA_INTER_DAY", day);
 		
 		if(map.containsKey("PENALTY_RATE_DAY")){//罚息日利率
diff --git a/src/com/tenwa/channelportal/action/ContractSignAction.java b/src/com/tenwa/channelportal/action/ContractSignAction.java
index 18be8a6cf..918ecd294 100644
--- a/src/com/tenwa/channelportal/action/ContractSignAction.java
+++ b/src/com/tenwa/channelportal/action/ContractSignAction.java
@@ -75,6 +75,7 @@ public class ContractSignAction{
 	public HttpRequestAppService requestService;
 	public String PAYMENT_NUMBER;
 	public String PLAN_LIST;
+	public String Ttype;
 	private static Logger logger=Logger.getLogger(ContractSignAction.class);
 	@SuppressWarnings("deprecation")
 	public static String getConfigRequestUrl() throws Exception{
@@ -199,6 +200,12 @@ public class ContractSignAction{
 	public void setPLAN_LIST(String pLAN_LIST) {
 		PLAN_LIST = pLAN_LIST;
 	}
+	public String getTtype() {
+		return Ttype;
+	}
+	public void setTtype(String ttype) {
+		Ttype = ttype;
+	}
 	/**
 	 * 自然人电子签约
 	 * 
@@ -1611,6 +1618,10 @@ public void wordToPdfJar(JBOTransaction tx){
 				DOCRELATIVE=bom.createQuery("plan_number=:plan_number and objecttype='AdjustInterst' ").setParameter("plan_number",PAYMENT_NUMBER).getSingleResult(false);
 			}else if("ChangeCar".equals(PLAN_LIST)){
 				DOCRELATIVE=bom.createQuery(" OBJECTTYPE='ChangeCar' and FLOW_UNID=:flowunid and CONTRACT_ID=:contractid ").setParameter("flowunid",FlowUnid).setParameter("contractid",contract_id).getSingleResult(false);
+			}else if("transfer".equals(PLAN_LIST)){
+				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(PLAN_LIST)){
+				DOCRELATIVE=bom.createQuery(" OBJECTTYPE='AdjustmentNotice' 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);
 			}
@@ -2421,5 +2432,102 @@ public String claimSign(JBOTransaction tx) throws Exception {
 	    }
 		return "success";
 	}
+	
+	/**
+	 * 传统合同盖章
+	 * @param tx
+	 * @return
+	 * @throws Exception
+	
+	 */
+	public String TcollectionSignA(JBOTransaction tx) throws Exception {
+		requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl());
+		String libraryid="";
+		BizObjectManager bom=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME);
+		BizObject DOCRELATIVE = null;
+		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);
+		}else{
+			DOCRELATIVE=bom.createQuery("plan_number=:plan_number and objecttype LIKE '%打印催款函%' ").setParameter("plan_number",PAYMENT_NUMBER).getSingleResult(false);
+		}
+		if (DOCRELATIVE != null) {
+			String DOCRELATIVEid=DOCRELATIVE.getAttribute("id").toString();
+			BizObjectManager bom1=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCLIBRARY.CLASS_NAME);
+			libraryid=bom1.createQuery("relative_id=:relative_id").setParameter("relative_id", DOCRELATIVEid).getSingleResult(false).getAttribute("id").toString();
+		}
+		BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOCATTRIBUTE.CLASS_NAME, tx);
+		ContractSignInfo con = null;
+		BizObject bo = null;
+		String info="";
+		try{
+			info = libraryid + "@" + libraryid+"@"+flagType;
+			//获取需要盖章的文件信息
+			Map<String,ContractSignInfo> map=new HashMap<String,ContractSignInfo>();
+			bo = contBom.createQuery("library_id=:libraryid").setParameter("libraryid", libraryid).getSingleResult(true);
+			if(bo != null){
+				id = bo.getAttribute("id").toString();
+				con = new ContractSignInfo();
+				con.setFileid(id);
+				con.setFilename(bo.getAttribute("FILENAME").toString());
+				String makefullPath = bo.getAttribute("FULLPATH").toString();
+				File file = new File(makefullPath);
+				if (!file.exists()) {
+					throw new RuntimeException("要读取的文件不存在");
+				}
+				con.setInputfile(BASE64.encodeImgageToBase64(file));
+				map.put(info, con);
+				Map<String, String> resultMap = null;
+				resultMap = requestService.createPaymentofHireSign(map);
+				if (!resultMap.containsKey("error")) {
+					for (String key : resultMap.keySet()) {
+						if (key.indexOf("contract_") == -1) {
+							contract_id = resultMap.get(key);
+						}
+					}
+				} else {
+					return "error";
+				}
+			}
+			if (bo != null) {
+				Map<String, String> map1 = new HashMap<String, String>();
+				map1.put(contract_id, bo.getAttribute("FULLPATH").toString());
+				Map<String, String> result1 = requestService.downloadDoc(map1);
+				if (!result1.containsKey("error")) {
+					for (String contractId : map1.keySet()) {
+						try {
+							if ("success".equals(result1.get(contractId))) {
+								String fileString = result1.get("file_" + contractId);
+								InputStream fileInput = BASE64.encodeFileToBase64(fileString);
+								OutputStream fileOut = new FileOutputStream(map1.get(contractId));// TODO
+								byte[] buffByte = new byte[1024];
+								int size = 0;
+								while ((size = fileInput.read(buffByte)) != -1) {
+									fileOut.write(buffByte, 0, size);
+								}
+								fileInput.close();
+								fileOut.close();
+							} else if ("error".equals(result1.get(contractId))) {
+								return "error";
+							}
+						} catch (Exception e) {
+							e.printStackTrace();
+		
+						}
+					}
+				} else {
+					return "error";
+				}
+			} else {
+				return "error";
+			}
+		
+			return "success";
+		} catch (Exception e) {
+			e.printStackTrace();
+			return "error";
+		}
+	}
 
 }
\ No newline at end of file
diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/DeleteDiscountOccupy.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/DeleteDiscountOccupy.java
index 9008c0df3..b2b25b24f 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/DeleteDiscountOccupy.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/DeleteDiscountOccupy.java
@@ -21,10 +21,14 @@ public class DeleteDiscountOccupy extends BaseBussiness {
 		String projectId=this.getAttribute("ProjectId").toString();
 		BizObjectManager ldoManage = JBOFactory.getBizObjectManager(LB_DISCOUNT_OCCUPY.CLASS_NAME,Sqlca);
 		BizObject ldo = ldoManage.createQuery("project_id=:projectid").setParameter("projectid", projectId).getSingleResult(true);
-        if(ldo!=null){
+		String sMessage="";
+		if(ldo!=null){
         	ldoManage.deleteObject(ldo);
+        	sMessage="true";
+        }else{
+        	sMessage="false";
         }
-		String sMessage="true"; 
+		
 		return sMessage;
 	}
 }
diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/InsertDiscountOccupy.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/InsertDiscountOccupy.java
new file mode 100644
index 000000000..f0400ca2e
--- /dev/null
+++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/InsertDiscountOccupy.java
@@ -0,0 +1,50 @@
+package com.tenwa.lease.flow.project.commbusiness;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import jbo.com.tenwa.lease.comm.CAR_RECLAIM;
+import jbo.com.tenwa.lease.comm.CAR_RECLAIM_TEMP;
+import jbo.com.tenwa.lease.comm.LB_DISCOUNT_OCCUPY;
+
+import com.amarsoft.app.util.ProductParamUtil;
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.BizObjectManager;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.awe.util.SqlObject;
+import com.amarsoft.awe.util.Transaction;
+import com.amarsoft.context.ASUser;
+import com.tenwa.comm.exception.BusinessException;
+import com.tenwa.comm.util.jboutil.DataOperatorUtil;
+import com.tenwa.flow.baseBussion.BaseBussiness;
+
+public class InsertDiscountOccupy extends BaseBussiness {
+	@Override
+	public Object run(Transaction Sqlca) throws Exception {
+		this.initBussinessParam(Sqlca);
+		String uuid = UUID.randomUUID().toString();
+		String curUserID=this.getAttribute("CurUserID").toString();
+		String flowUnid=this.getAttribute("FlowUnid").toString();
+		String productId=this.getAttribute("ProductId").toString();
+		Map<String, String> discount = ProductParamUtil.getProductComponentAllParameters(productId, "PRD0315", "DISCOUNT");
+		if(!discount.isEmpty() && !"".equals(discount.get("DISCOUNT_ALL")) && !"".equals(discount.get("CostType08"))) {
+			synchronized (this) {
+				String discountAll = discount.get("DISCOUNT_ALL");
+				String discountValue = discount.get("CostType08");
+				Transaction tran = Transaction.createTransaction(Sqlca);
+				String result = tran.getString(new SqlObject("select case when " + discountAll + "-ifnull(sum(discount), 0) >= " + discountValue + " then '0' else '1' end from lb_discount_occupy where product_id = '" +productId+ "'"));
+				if("0".equals(result)) {
+					ASUser user = ASUser.getUser(curUserID, tran);
+					tran.executeSQL(new SqlObject("insert into lb_discount_occupy(id, product_id, flowunid, project_id, discount, inputuserid, inputorgid, inputtime) "
+							+ "	values (replace(uuid(),'-',''), '" + productId + "', '" + flowUnid + "', '" + uuid.replaceAll("-", "") + "',"
+							+ " " + discountValue + ", '" + curUserID + "', '" + user.getOrgID() + "', replace(now(),'-','/'))"));
+				} else {
+					throw new BusinessException("产品额度已用完");
+				}
+			}
+		}
+		String sMessage="true";
+		return sMessage;
+	}
+}
diff --git a/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java b/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java
index e70fdc136..19e4c6fd9 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java
@@ -79,10 +79,11 @@ public class BusinessApprovalStartAction extends BaseFlowStartAction{
 					Transaction tran = Transaction.createTransaction(tx);
 					String result = tran.getString(new SqlObject("select case when " + discountAll + "-ifnull(sum(discount), 0) >= " + discountValue + " then '0' else '1' end from lb_discount_occupy where product_id = '" + this.getProductId() + "'"));
 					if("0".equals(result)) {
-						ASUser user = ASUser.getUser(this.CurUserID, tran);
+						//客户需求由新增申请时插入改为在经销商提交到信审时插入
+						/*ASUser user = ASUser.getUser(this.CurUserID, tran);
 						tran.executeSQL(new SqlObject("insert into lb_discount_occupy(id, product_id, flowunid, project_id, discount, inputuserid, inputorgid, inputtime) "
 								+ "	values (replace(uuid(),'-',''), '" + this.getProductId() + "', '" + flowBussiness.getAttribute("flow_unid").toString() + "', '" + uuid.replaceAll("-", "") + "',"
-								+ " " + discountValue + ", '" + this.CurUserID + "', '" + user.getOrgID() + "', replace(now(),'-','/'))"));
+								+ " " + discountValue + ", '" + this.CurUserID + "', '" + user.getOrgID() + "', replace(now(),'-','/'))"));*/
 					} else {
 						this.setError_message("failed@产品额度已用完");
 						throw new BusinessException("产品额度已用完");