diff --git a/WebContent/Common/WorkFlow/FlowBackSubmitDialog.jsp b/WebContent/Common/WorkFlow/FlowBackSubmitDialog.jsp
index 79a787ca5..e2e5b5d4e 100644
--- a/WebContent/Common/WorkFlow/FlowBackSubmitDialog.jsp
+++ b/WebContent/Common/WorkFlow/FlowBackSubmitDialog.jsp
@@ -21,6 +21,7 @@
 	String phaseNo=ft.PhaseNo;
 	String objectNo=ft.ObjectNo;
 	String flowState = ft.FlowState;
+	String approvalOpinions = Sqlca.getString("select fo.inputuser from FLOW_TASK O,FLOW_OPINION fo where O.SERIALNO=fo.serialno and O.OBJECTNO='"+objectNo+"' and O.ENDTIME is null");
 	//会签历史纪录阶段号问题
 	tx.commit();
 	
@@ -163,6 +164,16 @@
 		}
 	}
 	function backMethod(){
+		var flowNo="<%=flowNo%>";
+		var phaseNo = "<%=phaseNo%>";
+		if("FundPaymentCarFlow"==flowNo && "0020"==phaseNo){
+			var approvalOpinions="<%=approvalOpinions%>";
+			if(approvalOpinions==null || approvalOpinions=="null" || approvalOpinions.length<=0){
+				alert("请先填写审批意见！！！");
+				parent.AsDialog.ClosePage("_CANCEL_");
+				return;
+			}
+		}
 		if(document.getElementById("stepapprove").checked){
 			commitAction();
 		}else if(document.getElementById("directsubmit").checked){
diff --git a/WebContent/Tenwa/Comm/DocList/PayDocListFkBak.jsp b/WebContent/Tenwa/Comm/DocList/PayDocListFkBak.jsp
new file mode 100644
index 000000000..d7d8fab35
--- /dev/null
+++ b/WebContent/Tenwa/Comm/DocList/PayDocListFkBak.jsp
@@ -0,0 +1,254 @@
+<%@ 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.ProductParamUtil" %>
+<%@ page import="jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT" %>
+<%	
+	/*
+        Author: undefined 2016-09-01
+        Content: 
+        History Log: 
+    */
+	String objectno = CurPage.getParameter("FlowUnid");
+	String flowunid="";
+	String contractId = CurPage.getParameter("ContractId");
+	String projectId = CurPage.getParameter("ProjectId");
+	System.out.println("contractId=" + contractId);
+	//将空值转化为空字符串
+	BizObjectManager fbo = JBOFactory.getBizObjectManager(FLOW_BUSSINESS_OBJECT.CLASS_NAME);
+
+	String sSql =	" select ldl.flow_unid " +
+			" from LB_DOCLIBRARY ld " +
+			" LEFT JOIN LB_DOCRELATIVE ldl on ld.relative_id=ldl.id " +
+			" where ldl.proj_id='"+ projectId +"' and ldl.objecttype='FundPaymentCarFlow' and ldl.flow_unid <> '"+objectno+"' " +
+			" GROUP BY ldl.flow_unid ";
+	ASResultSet rs = null;
+	rs = Sqlca.getASResultSet(sSql);
+	while (rs.next()) {
+		flowunid = DataConvert.toString(rs.getString("flow_unid"));
+	}
+	rs.getStatement().close();
+
+	String flowstate=CurPage.getParameter("flowstate");
+    String CustomerType=CurPage.getParameter("CustomerType");
+	String carAttributes=CurPage.getParameter("carAttributes");//获取车类型
+    if(flowunid==""||flowunid==null){
+    	flowunid="flowunid";
+    }
+    
+	BizObject flow=GetFlowAction.getFlowBussinessObject(flowunid);//流程对象
+	
+    String sObjectType = "FlowPayDocListDelete";//付款申请
+
+    String ishistory=CurPage.getParameter("IsHistory");
+    String nodeNo=CurPage.getParameter("NodeNo");
+	String RightType= "ReadOnly";
+	String username=CurUser.getUserName();
+    String phaseNo = CurPage.getParameter("PhaseNo");
+    String apply = CurPage.getParameter("ApplyType");
+    
+    String type= "fundPay";
+    if(type==null)type="";
+
+	List<Object> list = ProductParamUtil.getProductDocInfo(CurPage.getParameter("ProductId"),"PRD0412");//方案类型
+	String types="";
+	String docList="";
+	for(int i=0;i<list.size();i++){
+		Map<String,Object> map=(Map<String,Object>)list.get(i);
+		if(sObjectType.equals(map.get("FLOW_INFO").toString())){
+			types=map.get("TYPE").toString();
+			if("SingleRow".equals(types)){
+				docList=map.get("DOCLIST").toString();
+			}else{
+				List l=(List)map.get("DOCCONFIG");
+				docList=l.toString();
+			}
+		}
+	}
+	String docClassItemno=docList;
+
+    String[] itemnos=docClassItemno.split(",");
+    String s="";
+    String classItemno ="";
+    for(int i=0;i<itemnos.length;i++){
+    	s+="'"+itemnos[i]+"',";
+    }
+    if(s.length()>0){
+    	s=s.substring(0, s.length()-1);
+    	classItemno = s.replace(",", "@");
+    }
+	String compClientID = request.getParameter("CompClientID");
+
+	ASObjectModel doTemp = new ASObjectModel("FlowPayDocListDelete");
+	doTemp.setVisible("operation", false);
+//	String otherWhere = "and rela.proj_id='"+ projectId +"'and rela.flow_unid='"+ flowunid +"' and rela.objecttype='FundPaymentCarFlow'";
+//	String otherWhere =  and rela.proj_id='4e0962e029a8473492f784732a004e2e' and (rela.contract_id='' or rela.contract_id is null or rela.contract_id='d6bd7d316ea24b7bbfad1bc9f83b2b56') ;
+	String otherWhere = "and rela.proj_id='"+ projectId +"' and rela.objecttype='FundPaymentCarFlow'";
+	doTemp.appendJboWhere(otherWhere);
+	doTemp.setLockCount(2);
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+	dwTemp.Style="1";      	     //--设置为Grid风格--
+	dwTemp.ReadOnly = "1";//只读模式
+	isShowButton=false;
+	dwTemp.setPageSize(500);
+	dwTemp.genHTMLObjectWindow(flowunid);
+	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
+	String sButtons[][] =null;
+	
+		sButtons=new String[][]{
+				{"true","","Button","保存","保存所有修改","saveRecord()","","","",""},
+				{"true","","Button","批量下载","批量下载","downloadZipFile()","","","","btn_icon_down"},
+		};
+	
+%>
+<script type="text/javascript">
+ var rowSpan="One_Classify";
+</script>
+<%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<script type="text/javascript">
+
+window.onload=function(){
+	/* var RowCount = getRowCount(0);
+	for(var i=0;i<RowCount;i++){
+		if($("#INPUT_myiframe0_Doc_Nature_"+i+"_2").text()=="必备"){
+			$("#INPUT_myiframe0_Doc_Nature_"+i+"_2").attr("style","color:red");
+		}
+	} */
+	
+	heping();
+	$("#DWTD").width( document.body.offsetWidth  - 10);
+	$("#DWTD").width( document.body.offsetHeight  - 20);
+	document.getElementById('DWTD').innerHTML = '<div style="width:'+(document.body.offsetWidth  - 10)+'px;height:'+(document.body.offsetHeight  - 40)+'px;overflow: scroll;">'+document.getElementById('DWTD').innerHTML+'</div>';
+}
+function heping(){
+	$("#TR_Right_myiframe0_0").attr("class","color_zebra1");
+	huanhang("Doc_Name");
+}
+
+function huanhang(col){
+	var tab=document.getElementById("myiframe0");
+	var a= getColIndex(0,col);
+	for(var i=0;i<tab.rows.length-1;i++){
+		$("#INPUT_myiframe0_"+col+"_"+i+"_"+a).parent().attr("style","white-space: pre-wrap;");
+	}
+}
+
+function selectFile(){
+	objectinfo={};
+	objectinfo.title="附件一览"
+	AsControl.OpenTab("/Tenwa/Comm/Document/LBDocumentList.jsp","ObjectNo=20170427000001",objectinfo);
+}
+function saveRecord(){
+	as_save("myiframe0","heping()");
+	location.reload();
+}
+//在加载完表格后调用
+function afterSearch(){
+	var sRightType="<%=RightType%>";
+	var sObjectType="<%=sObjectType%>";//该流程类型
+	var isReview="<%=CurPage.getParameter("isReview")%>";
+	var username="<%=username%>";
+	for(var i=0;i<getRowCount(0);i++){
+		if(getObj(0,i,"operation")!=null&&getObj(0,i,"operation")!="null"){
+			getObj(0,i,"operation").innerHTML='<a class="box"  onclick="upload(\''+getItemValue(0,i,"id")+'\')" style={color:#000;text-decoration:underline;}><font color="blue">上传</font></a>';
+		}
+		var filelist=getObj(0,i,"filelist").innerHTML;
+		var obj=eval('('+filelist+')');
+		var html="";
+		for(var file in obj){
+			html+='<a onclick=downloadFile(\''+obj[file]['id']+'\')><font color="blue">'+obj[file]['filename']+'</font></a>';
+			html+='【上传时间:'+obj[file]['inputtime']+'】';
+			html+='【上传人:'+obj[file]['inputuser']+'】';
+// 			html+='【大小:'+Math.floor(obj[file]['FileSize']/1024*100)/100+'kb】<a class="btn_icon_detail" onclick="editOffice(\''+obj[file]['id']+'\',\''+obj[file]['filename']+'\',\''+sRightType+'\')">&nbsp;</a> ';
+			if(isReview!="true"&&sRightType!="ReadOnly"&&(sObjectType==obj[file]['objecttype'])&&username==obj[file]['inputuser']&&"ANYBACK"!="<%=flowstate%>"){
+				html+='<a class="btn_icon btn_icon_close" onclick="deleteFile(\''+obj[file]['id']+'\');">&nbsp;</a>';
+			}
+			if(obj[file]['image']=="true"){
+				html+='<a class="btn_icon btn_icon_search" onclick="showImage(\''+obj[file]['id']+'\',\''+obj[file]['filename']+'\');">&nbsp;</a>';
+			}
+			if(obj[file]['word']=="true"){
+				html+='<a class="btn_icon btn_icon_search" onclick="showWord(\''+obj[file]['id']+'\',\''+obj[file]['filename']+'\');">&nbsp;</a>';
+			}
+			if(obj[file]['pdf']=="true"){
+				html+='<a class="btn_icon btn_icon_search" onclick="showPDF(\''+obj[file]['id']+'\',\''+obj[file]['filename']+'\');">&nbsp;</a>';
+			}
+			html+='</br>';
+		}
+		getObj(0,i,"filelist").innerHTML=html;
+		getObj(0,i,"filelist").style["white-space"]="pre-wrap";
+		if($("#INPUT_myiframe0_Doc_Nature_"+i+"_2").text()=="必备"){
+			$("#INPUT_myiframe0_Doc_Nature_"+i+"_2").attr("style","color:red");
+		}
+	};
+}
+function showPDF(id,name){
+	var sUrl="/Tenwa/Comm/DocList/showPDF.jsp";
+	var param="attrid="+id;
+	AsControl.OpenPage(sUrl,param,"","");
+}
+function showWord(id,name){
+	var sUrl="/Tenwa/Comm/DocList/showWord.jsp";
+	var param="attrid="+id;
+	AsControl.OpenPage(sUrl,param,"","");
+}
+function showImage(id,name){
+	var sUrl="/Tenwa/Comm/DocList/showImage.jsp";
+	var param="attrid="+id+"&flowunid=<%=flowunid%>";
+	AsDialog.PopView(sUrl,param,"dialogWidth=1080px;dialogHeight=500px;",function(message){
+		
+	},name);
+}
+function editOffice(id,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 upload(id){
+	//saveRecord();
+	
+	var param="Library_id="+id + "&ObjectType=<%=sObjectType%>";
+ 	var sUrl="/Tenwa/Comm/DocList/DocListInfoNew.jsp";
+	AsDialog.PopView(sUrl,param,"dialogWidth=800px;dialogHeight=500px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(message){
+		var str=RunJavaMethodTrans("com.tenwa.doc.action.DocListAction","updateBussinessCheck","library_id="+id+",BussinessCheck=DocCheck_0");
+ 		reloadSelf();
+// 		location.reload();
+		heping();
+	},"上传附件");
+}
+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 deleteFile(id){
+	var sParams="attId="+id+",BussinessCheck=DocCheck_2";
+	var sReturnInfo = RunJavaMethodTrans("com.tenwa.doc.action.DocListAction","deleteAttr",sParams);
+	reloadSelf();
+	heping();
+}
+function downloadZipFile(){
+    var objectType="<%=sObjectType%>";
+    var projectId="<%=projectId%>";
+    var classItemnos="<%=classItemno%>";
+    var sParams="projectId="+projectId+",classItemnos="+classItemnos+",objectType="+objectType;
+    var ids = RunJavaMethodTrans("com.tenwa.doc.action.DocListAction","getLibraryIds",sParams);
+	var filePath="<%=CurConfig.getConfigure("FileSavePath")%>";
+	var param="&flowunid=<%=flowunid%>&type=<%=type%>&ids="+ids+"&proj_id="+projectId;
+	if(!frames["downloadTemplate"]) $("<iframe name='downloadTemplate' style='display:none;'></iframe>").appendTo("body");
+	window.open(sWebRootPath+"/servlet/view/docFlowDownloadZipServlet?CompClientID=<%=sCompClientID%>&filePath="+filePath+param, "downloadTemplate");
+}
+
+
+
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Core/InvoiceManager/InvoiceTJ/TaxCodeInfo.jsp b/WebContent/Tenwa/Core/InvoiceManager/InvoiceTJ/TaxCodeInfo.jsp
index a812dacaa..ef905d6f7 100644
--- a/WebContent/Tenwa/Core/InvoiceManager/InvoiceTJ/TaxCodeInfo.jsp
+++ b/WebContent/Tenwa/Core/InvoiceManager/InvoiceTJ/TaxCodeInfo.jsp
@@ -40,7 +40,7 @@
 <%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=Info04;Describe=定义按钮;]~*/%>
 <%
 	String sButtons[][] = {
-		{"true","All","Button","保存","保存","as_save(0)","","","","btn_icon_save"},
+		{"true","All","Button","保存","保存","as_save(0,'parent.AsDialog.ClosePage()')","","","","btn_icon_save"},
 		{"true","","Button","返回","返回列表页面","parent.AsDialog.ClosePage()","","","","btn_icon_return"}
 	};
 	sButtonPosition = "south";
diff --git a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BankType/BankTypeConfigInfo.jsp b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BankType/BankTypeConfigInfo.jsp
index eb09bddac..bf8d447d6 100644
--- a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BankType/BankTypeConfigInfo.jsp
+++ b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BankType/BankTypeConfigInfo.jsp
@@ -44,6 +44,7 @@
 //0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
 		String sButtons[][] = {
 		{"true","All","Button","保存","保存所有修改","saveRecord()","","","","btn_icon_save"},
+		{"true","All","Button","删除","删除","deleteRecord()","","","","btn_icon_delete",""},
 		{"true","","Button","返回","返回列表页面","parent.AsDialog.ClosePage()","","","","btn_icon_return"}
 	};
 	sButtonPosition = "south";
@@ -72,6 +73,17 @@
 			setItemValue(0,0,'bank_name',sReturn[1]);
 		},"选择银行名称");
 	}
+	
+	function deleteRecord(){
+		var id = getItemValue(0,getRow(),'id');
+		if(typeof(id)=="undefined" || id.length==0 ){
+			alert("新增页面无法删除！！！");
+			return ;
+	 	}
+		if(confirm('确实要删除吗?')){
+			as_delete(0,'parent.AsDialog.ClosePage()');
+		}
+	}
 </script>
 <%/*~END~*/%>
 
diff --git a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BankType/BankTypeConfigList.jsp b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BankType/BankTypeConfigList.jsp
index 94c49f607..22876f09b 100644
--- a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BankType/BankTypeConfigList.jsp
+++ b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BankType/BankTypeConfigList.jsp
@@ -38,7 +38,7 @@
 		{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
 		//{"true","","Button","详情","详情","view()","","","","btn_icon_detail",""},
 		{"true","All","Button","修改","修改","edit()","","","","btn_icon_edit",""},
-		{"true","All","Button","删除","删除","deleteRecord()","","","","btn_icon_delete",""},
+		{"false","All","Button","删除","删除","deleteRecord()","","","","btn_icon_delete",""},
 	};
 %>
 <%/*~END~*/%>
diff --git a/WebContent/Tenwa/Gps/LmGpsOrderInfo.jsp b/WebContent/Tenwa/Gps/LmGpsOrderInfo.jsp
index 1920b571e..1f04aa4ad 100644
--- a/WebContent/Tenwa/Gps/LmGpsOrderInfo.jsp
+++ b/WebContent/Tenwa/Gps/LmGpsOrderInfo.jsp
@@ -1,6 +1,7 @@
 <%@ page contentType="text/html; charset=GBK"%>
-<%@ page import="java.math.BigDecimal"%>
-<%@ page import="com.tenwa.apzl.comm.GpsEnum" %>
+<%@ page import="com.tenwa.apzl.comm.GpsEnum"%>
+<%@ page import="com.tenwa.comm.exception.BusinessException" %>
+<%@ page import="java.math.BigDecimal" %>
 <%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
 	/*
         Author: undefined 2019-07-11
@@ -15,14 +16,25 @@
 	String PhaseNo = CurPage.getParameter("PhaseNo");
 	String flowunid = CurPage.getParameter("ObjectNo");
 	String compClientID = request.getParameter("CompClientID");
-	String frameNumber = Sqlca.getString("select FRAME_NUMBER from LB_EQUIPMENT_CAR_TEMP where FLOWUNID='"+flowunid+"' and car_attribute='head' ");
+	ASResultSet rs2 = Sqlca.getResultSet2("select FRAME_NUMBER,model from LB_EQUIPMENT_CAR_TEMP where FLOWUNID='" + flowunid + "' and car_attribute='head' limit 1");
+	String frameNumber="",model ="";
+	if(rs2.next()){
+		frameNumber = rs2.getString("FRAME_NUMBER");
+		model = rs2.getString("model");
+	}else{
+	    throw new BusinessException("车辆信息不存在!");
+	}
 	String id = Sqlca.getString("select id from LM_GPS_ORDER_TEMP where APPLY_NO='"+ProjectNo+"'");
-	
 	String contact_name = Sqlca.getString("select CONTACT_NAME from GPS_config_info where isenable='1' ");//派工联系人
 	String contact_phone = Sqlca.getString("select CONTACT_PHONE from GPS_config_info where isenable='1' ");//派工联系人电话
-	
-	String distributor_id = Sqlca.getString("select distributor_id from lb_project_info where id='"+ProjectId+"'");//获取经销商ID
-	String distributor_name = Sqlca.getString("select distributor_name from distributor_info where distributor_no='"+distributor_id+"'");//获取经销名称
+	System.out.println("经销商orgId=" + CurUser.getOrgID());
+	//如果部门是南京直销的话 CurUser.getOrgID()== 8006014 拉车单位显示南京直销
+	String distributor_name = "安鹏汽车业务直销部（江苏）";
+	if(!"8006014".equals(CurUser.getOrgID())){
+		System.out.println("经销商id不等于【8006014】，经销商id=" + CurUser.getOrgID());
+		String distributor_id = Sqlca.getString("select distributor_id from lb_project_info where id='"+ProjectId+"'");//获取经销商ID
+		distributor_name = Sqlca.getString("select distributor_name from distributor_info where distributor_no='"+distributor_id+"'");//获取经销名称
+	}
 
 	BigDecimal incomNuber = new BigDecimal(Sqlca.getString("select INCOME_NUMBER from LC_CALC_CONDITION_TEMP where FLOWUNID='"+flowunid+"'"));
 	List<String> images = new ArrayList<String>();
@@ -31,13 +43,11 @@
 	while(res.next()){
 		images.add(res.getString("URL"));
 	}
-	
+
 	String period = incomNuber.divide(new BigDecimal("12"),0,BigDecimal.ROUND_UP).toString();
 	String sTempletNo = "LmGpsOrderInfo";//--模板号--
 	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
 	if(GpsEnum.ZR.getCode().equals(source)){
-		doTemp.setColumnAttribute("CARTYPE", "COLVISIBLE", "1");
-		doTemp.setColumnAttribute("CARTYPE", "COLREQUIRED", "1");
 		doTemp.setColumnAttribute("USERNAME", "COLVISIBLE", "1");
 		doTemp.setColumnAttribute("USERNAME", "COLREQUIRED", "1");
 		doTemp.setColumnAttribute("USERPHONE", "COLVISIBLE", "1");
@@ -51,7 +61,7 @@
 	String [][] sButtons;
 	if("0010".equals(PhaseNo)){
 		sButtons = new String[][]{
-			{"true","All","Button","提交工单","提交工单","if(getItemValue(0,getRow(),'STATUS')!='7'){alert('不可重复提交！');return;}as_save(0,'submitOrder()')","","","",""},
+			{"true","All","Button","提交工单","提交工单","if(getItemValue(0,getRow(),'STATUS')!='7'){alert('不可重复提交！');return;}$('body').find('input:text').each(function(){$(this).val(this.value.trim())});as_save(0,'submitOrder()')","","","",""},
 			{"true","All","Button","查询工单","查询工单","queryOrder()","","","",""},
 			{"true","All","Button","修改工单","修改工单","alterOrder()","","","",""},
 			{"true","All","Button","取消工单","取消工单","cancelOrder()","","","",""},
@@ -75,13 +85,15 @@
 		setItemValue(0,getRow(0),"PICCONTACT_NAME",'<%=contact_name%>');
 		setItemValue(0,getRow(0),"PICCONTACT_PHONE",'<%=contact_phone%>');
 		setItemValue(0,getRow(0),"CAR_ACCOUNT",'<%=distributor_name%>');
+
 		if('<%=source%>'=='1'){
             setItemValue(0,getRow(0),"SHOPNAME",'<%=distributor_name%>');//2020-11-11 yjf 修改门店取值为拉车账号
+            setItemValue(0,getRow(0),"CARTYPE",'<%=model%>');//2020-11-13 yjf 从设备表中获取车型数据
 		}
 		setItemValue(0,getRow(0),"SOURCE",'<%=source%>');
 
 		var status = getItemValue(0,getRow(),"STATUS");
-		
+
 		if('<%=frameNumber%>'!='null'&&(status=='7'||status=='1'||status=='8'))
 			setItemValue(0,getRow(0),"CAR_VIN",'<%=frameNumber%>');
 		if('<%=id%>'!='null')
@@ -93,33 +105,37 @@
 		  	<%}%>
 		  	window.parent.editImage(ul);
 		<%}%>
-		
+
 	    time = document.getElementById("INSTALL_TIME");
 	    //当前时间
 	    var thisDate = new Date();
-	    thisDate.setHours(thisDate.getHours()+2); 
-	    thisDate.setMinutes(thisDate.getMinutes()+10); 
+	    thisDate.setHours(thisDate.getHours()+2);
+	    thisDate.setMinutes(thisDate.getMinutes()+10);
 	    //最晚安装时间17:30
 	    var latestDate = new Date();
 	    latestDate.setHours(17);
 	    latestDate.setMinutes(30);
 	    if(thisDate.getTime() > latestDate.getTime()){
 	    	thisDate.setHours(thisDate.getHours()+24);
-	    	thisDate.setHours(8); 
-	    	thisDate.setMinutes(0); 
+	    	thisDate.setHours(8);
+	    	thisDate.setMinutes(0);
 	    	thisDate.setSeconds(0);
 	    }
-	    
+
 	    var dateStr = thisDate.Format("yyyy-MM-dd hh:mm:ss");
 		time.setAttribute("onclick","SelectDate(this,'yyyy-MM-dd hh:mm:ss','"+dateStr+"','2118/08/01')");
 	})
-	
+
 	function submitOrder(){
-		var result =AsControl.RunJavaMethodTrans("com.tenwa.gps.GpsController","createOrder","applyNo=<%=ProjectNo%>,flowUnid=<%=flowunid%>,projectId=<%=ProjectId%>,userId=<%=userId%>,source=<%=source%>");
-		alert(result)
-		location.reload();
+        try{
+			var result =AsControl.RunJavaMethodTrans("com.tenwa.gps.GpsController","createOrder","applyNo=<%=ProjectNo%>,flowUnid=<%=flowunid%>,projectId=<%=ProjectId%>,userId=<%=userId%>,source=<%=source%>");
+			alert(result);
+            location.reload();
+        }catch (err){
+            alert(err)
+		}
 	}
-	
+
 	function queryOrder(){
 		var orderNo = getItemValue(0,getRow(),"ORDER_NO");
 		var status = getItemValue(0,getRow(),"STATUS");
@@ -132,7 +148,7 @@
 		alert(result)
 		location.reload();
 	}
-	
+
 	//省市
 	function selectRegionCode(){
 		var sCity = getItemValue(0,getRow(),"ADDRESS_CODE");
@@ -150,12 +166,12 @@
 						sAreaCodeValue = sAreaCodeInfo[0];//-- 行政区划代码
 						sAreaCodeName = sAreaCodeInfo[1];//--行政区划名称
 						setItemValue(0,getRow(),"ADDRESS_CODE",sAreaCodeValue);
-						setItemValue(0,getRow(),"ADDRESS_CODE_SHOW",sAreaCodeName);	
+						setItemValue(0,getRow(),"ADDRESS_CODE_SHOW",sAreaCodeName);
 				}
 			}
 		},'请选择省市');
 	}
-	
+
 	function showGPSImage(){
 		var status = getItemValue(0,getRow(),"STATUS");
 		if(status=='7'){
@@ -168,7 +184,7 @@
         }
 		window.parent.showImage();
 	}
-	
+
 	function alterOrder(){
 		var status = getItemValue(0,getRow(),"STATUS");
 		if(status=='7'){
@@ -198,7 +214,7 @@
 			as_save(0);
 		location.reload();
 	}
-	
+
 	function cancelOrder(){
 		var status = getItemValue(0,getRow(),"STATUS");
 		if(status=='7'){
@@ -211,6 +227,6 @@
 			location.reload();
 		}
 	}
-	
+
 </script>
 <%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcReviewAuditRentPlanByHandleList.jsp b/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcReviewAuditRentPlanByHandleList.jsp
index 9fb3d4c6e..19e44fb92 100644
--- a/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcReviewAuditRentPlanByHandleList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcReviewAuditRentPlanByHandleList.jsp
@@ -29,25 +29,11 @@
 	//	//{"true","All","Button","实时扣款","实时扣款","timelyCollect()","","","","btn_icon_add",""},
 	//	{"true","All","Button","手工核销","手工扣款","afterCollectManage()","","","","btn_icon_add",""},
 		{"true","All","Button","手动刷新","手动刷新","queryBatchCollect()","","","","btn_icon_add",""},
-		{"true","All","Button","通联刷新","手动刷新","TLquery()","","","","btn_icon_add",""},
 	//	//{"true","","Button","退回","审核未通过,退回初审","if(confirm('确定要退回吗?')){viewAndEdit()}","","","","btn_icon_detail",""},
 	};
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">
 
-	window.onload=function(){
-		initFilter();
-	}
-	function initFilter(){
-		
-		filterValues["myiframe0"][TableFactory.getTableColIndexFromDZ("myiframe0",getColIndex(0,"COLLECT_STATUS"))] = "未收款||部分收款"; 
-		setFilterAreaValue(0,"plan_date","<%=plan_date%>");
-		setFilterAreaOption(0,"plan_date","Equals");
-		//submitFilterArea();
-	}
-	
-
-	
 	//批量代收
 	function batchCollect(){
 		//校验所选数据是否是一个主体
@@ -63,14 +49,14 @@
 				}
 			}
 		}
+        var sParm_id = getItemValueArray(0,"id");
+        if(typeof(sParm_id) == "undefined" || sParm_id.length == 0 ){
+            alert("请至少选择一条记录！");
+            return;
+        }
 		if(confirm('确实要执行手动收款操作吗?')){
-			var sParm_id = getItemValueArray(0,"id");
 			var sParm_money = getItemValueArray(0,"collect_money");
-			var sParm_rent = getItemValueArray(0,"rent");
-			if(typeof(sParm_id) == "undefined" || sParm_id.length == 0 ){
-				alert("请至少选择一条记录！");
-				return;
-			}
+			var sParm_rent = getItemValueArray(0,"back_rent");
 			var fileSavePath = "<%=CurConfig.getConfigure("InterfaceFileSavePath")%>";
 			var ids = "";
 			var collect_moneys ="";
@@ -85,7 +71,7 @@
 						return;
 					}
 					if(rent_moneys*100<collect_moneys*100){
-						alert("扣款金额不能大于租金加罚息金额");
+						alert("扣款金额不能大于剩余应还金额");
 						return;
 					}
 					json[sParm_id[0]] = sParm_money[0];
@@ -160,15 +146,12 @@
 				}
 			}
 		}
+		var sParm = getItemValueArray(0, "id");
+		if(typeof(sParm) == "undefined" || sParm.length == 0 ) {
+			alert("请至少选择一条记录！");
+			return;
+		}
 		if(confirm('确实要执行手动刷新操作吗?')){
-			var sParm = getItemValueArray(0, "id");
-			var fileSavePath = "<%=CurConfig.getConfigure("InterfaceFileSavePath")%>";
-			if(typeof(sParm) == "undefined" || sParm.length == 0 )
-			{
-				alert("请至少选择一条记录！");
-				return;
-			 }
-					
 			var ids = "";
 			for(var i = 0;i < sParm.length; i++){
 				if(ids.length == 0){
@@ -177,6 +160,7 @@
 					ids += sParm[i] +"@";
 				}
 			}
+			var fileSavePath = "<%=CurConfig.getConfigure("InterfaceFileSavePath")%>";
 			var parm = "id="+ids+",fileSavePath="+fileSavePath+",inputuserid="+"<%=CurUser.getUserID()%>"+",inputorgid="+"<%=CurUser.getOrgID()%>";
 			
 			//进行拆分调用天津接口或者深圳
@@ -189,16 +173,12 @@
 			}else{
 				alert("未查询到对应的主体方法！");
 			}
-			
-// 			reloadSelf();
-			location.reload();
+            RunJavaMethod("com.tenwa.lease.app.allinpay.service.impl.AllinpayPaymentDo", "queryCollectResult","");
+ 			reloadSelf();
+//			location.reload();
 		}
 		
 	}
-	function TLquery(){
-		debugger;
-		var resTL = RunJavaMethod("com.tenwa.lease.app.allinpay.service.impl.AllinpayPaymentDo", "queryCollectResult","");
-		console.log(resTL);
-	}
+
 </script>
 <%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp
index fb3f61ce1..8c705c6b1 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp
@@ -345,6 +345,13 @@
 		}else{
 			RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","wordToPdf","FlowUnid=<%=flowunid%>,flagType=word");
 <%-- 			if("01"=="<%=customertype%>"||"1"=="<%=CurPage.getParameter("isNetCar")%>"||"BAIC_MOTOR"=="<%=CurPage.getParameter("operationType")%>"||"ZYC"=="<%=CurPage.getParameter("operationType")%>"||"KHSQ"=="<%=CurPage.getParameter("operationType")%>"||"KJZL"=="<%=CurPage.getParameter("operationType")%>"){ --%>
+			var OwmMessage = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","SystemMakeOneDimensionalCode","ProjectId=<%=projectId%>,contract_id=<%=sContractId%>,contractNo=<%=contractNo%>,leasform=<%=leasform%>");
+			if("error"==OwmMessage){
+				RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","companyUpdateDocContractStatus","FlowUnid=<%=flowunid%>"+",ProjectId=<%=projectId%>");
+				alert("生成失败！！！");
+				reloadSelf();
+				return;
+			}
 			if(("01"=="<%=customertype%>"&&"Auto" == "<%=sealType%>" )||("Auto" == "<%=sealType%>" && "Hand" == "<%=signType%>" )){
 				var falg = "";
 				var operationType = "<%=CurPage.getParameter("operationType")%>";
@@ -360,13 +367,7 @@
 					return;
 				}
 			}
-			var OwmMessage = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","SystemMakeOneDimensionalCode","ProjectId=<%=projectId%>,contract_id=<%=sContractId%>,contractNo=<%=contractNo%>,leasform=<%=leasform%>");
-			if("error"==OwmMessage){
-				RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","companyUpdateDocContractStatus","FlowUnid=<%=flowunid%>"+",ProjectId=<%=projectId%>");
-				alert("生成失败！！！");
-				reloadSelf();
-				return;
-			}
+			
 			alert("生成成功");
 		}
 		reloadSelf();
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp
index a213c5511..b14736aa6 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp
@@ -77,6 +77,7 @@
 				setItemValue(0,0,'bank_code',sReturn[0]);
 			}
 			setItemValue(0,0,'bank_type',sReturn[1]);
+			setItemValue(0,0,"bank_name",sReturn[1]);
 		},"选择银行名称");
 	}
 	//根据选择的用户名选择对应的证件号
@@ -286,8 +287,25 @@
 		 }
 		 if (sflag != -1) { 
 			 var name=bankName[sflag].substring(0,bankName[sflag].indexOf("·"));
-			 setItemValue(0,getRow(),"bank_name",name);
-	     } 
+			 if(name.indexOf("邮储") != -1 || name.indexOf("邮政") != -1){
+				 name = "邮政银行";
+			 }
+			 var res = RunJavaMethodTrans("com.tenwa.comm.customerfilterlist.DebitCardAction", "selectBankName", "bank_name="+name);
+			 if("error"!= res){
+				res = res.split("@");
+				var bankCode = getItemValue(0, 0, "bank_code");
+				if("<%=flowNo%>"=="BusinessApplyFlow"||(bankCode!=null&&bankCode!="")){
+					setItemValue(0,0,'bank_code',res[0]);
+				}
+				
+				setItemValue(0,0,'bank_type',res[1]);
+				setItemValue(0,getRow(),"bank_name",res[1]);
+			 }
+	     }else{
+	    	 setItemValue(0,0,'bank_code','');
+			 setItemValue(0,0,'bank_type','');
+			 setItemValue(0,getRow(),"bank_name",'');
+	     }
 		 setErrorTips("acc_number","");
 		 return true;
 	}
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
index 067b1e08f..e4fad4144 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
@@ -4250,6 +4250,7 @@
 				<attribute name="full_code" label="鍚堝苟缂栫爜" type="STRING"/>
 				<attribute name="tax_type" label="鍚嶇О" type="STRING"/>
 				<attribute name="remark" label="绠�绉�" type="STRING"/>
+				<attribute name="lease_form" label="绉熻祦绫诲瀷01鐩寸锛�02鍥炵" type="STRING"/>
 			</attributes>
 			<manager>
 				<managerProperties>
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
index b7125f3e6..817c20dd9 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
@@ -4348,6 +4348,7 @@
 				<attribute name="COLLECT_STATUS" label="BATCH_SN" type="STRING" length="255"/>
 				<attribute name="COLLECT_MSG" label="BATCH_SN" type="STRING" length="255"/>
 				<attribute name="cut_money" label="鎵ｆ閲戦" type="STRING" length="255"/>
+				<attribute name="deduction_type" label="鍗℃墸绫诲瀷" type="STRING" length="10"/>
 				<attribute name="inputuserid" label="鐧昏浜�" type="STRING" length="32"/>
 				<attribute name="inputorgid" label="鐧昏閮ㄩ棬" type="STRING" length="32"/>
 				<attribute name="updateuserid" label="鏇存柊浜�" type="STRING" length="32"/>
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_loan.xml b/WebContent/WEB-INF/etc/jbo/jbo_loan.xml
index 37709a161..7d155026a 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_loan.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_loan.xml
@@ -601,6 +601,71 @@
 				</managerProperties>
 			</manager>
 		</class>
+
+		<class name="vi_manual_dedution" label="鎵嬪伐鎵ｆ淇℃伅" keyAttributes="ID">
+			<attributes>
+				<attribute name="ID" label="鏍囪瘑" type="STRING" length="32"/>
+				<attribute name="contract_id" label="鍚堝悓id" type="STRING" length="32"/>
+				<attribute name="businesstype" label="涓氬姟绫诲瀷" type="STRING" length="32"/>
+				<attribute name="subjectid" label="涓讳綋id" type="STRING" length="32"/>
+				<attribute name="subjectname" label="涓讳綋鍚嶇О" type="STRING" length="32"/>
+				<attribute name="distributor_id" label="缁忛攢鍟唅d" type="STRING" length="32"/>
+				<attribute name="contract_number" label="鍚堝悓缂栧彿" type="STRING" length="32"/>
+				<attribute name="payment_number" label="payment_number" type="STRING" length="32"/>
+				<attribute name="customername" label="瀹㈡埛鍚嶇О" type="STRING" length="32"/>
+				<attribute name="acc_number" label="瀹㈡埛璐﹀彿" type="STRING" length="32"/>
+				<attribute name="plan_list" label="鏈熸" type="STRING" length="32"/>
+				<attribute name="plan_date" label="璁″垝鏃ユ湡" type="STRING" length="32"/>
+				<attribute name="collect_status" label="鎵ｆ鐘舵��" type="STRING" length="32"/>
+				<attribute name="collect_msg" label="鎵ｆ鐘舵�佷俊鎭�" type="STRING" length="32"/>
+				<attribute name="batch_status" label="澶勭悊鐘舵�佷俊鎭�" type="STRING" length="32"/>
+				<attribute name="rent" label="绉熼噾" type="DOUBLE" length="32"/>
+				<attribute name="corpus" label="鏈噾" type="DOUBLE" length="32"/>
+				<attribute name="interest" label="鍒╂伅" type="DOUBLE" length="32"/>
+				<attribute name="penalty" label="缃氭伅" type="DOUBLE" length="32"/>
+				<attribute name="penalty_sum" label="宸茶繕缃氭伅" type="DOUBLE" length="32"/>
+				<attribute name="rent_over" label="绉熼噾浣欓" type="DOUBLE" length="32"/>
+				<attribute name="corpus_over" label="鏈噾浣欓" type="DOUBLE" length="32"/>
+				<attribute name="interest_over" label="鍒╂伅浣欓" type="DOUBLE" length="32"/>
+				<attribute name="penalty_over" label="缃氭伅浣欓" type="DOUBLE" length="32"/>
+				<attribute name="collect_type" label="鎵ｆ绫诲瀷" type="STRING" length="32"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="vi_manual_dedution" />
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
+		</class>
+
+		<class name="VI_YC_RENT_COLLECT" label="鎵ｆ淇℃伅(閭偍)" keyAttributes="ID">
+			<attributes>
+				<attribute name="ID" label="鏍囪瘑" type="STRING" length="32"/>
+				<attribute name="distributor_id" label="缁忛攢鍟唅d" type="STRING" length="32"/>
+				<attribute name="contract_id" label="鍚堝悓涓婚敭ID" type="STRING" length="32"/>
+				<attribute name="payment_number" label="payment_number" type="STRING" length="32"/>
+				<attribute name="customername" label="瀹㈡埛鍚嶇О" type="STRING" length="32"/>
+				<attribute name="acc_number" label="瀹㈡埛璐﹀彿" type="STRING" length="32"/>
+				<attribute name="certid" label="璇佷欢鍙�" type="STRING" length="40"/>
+				<attribute name="collect_type" label="鎵ｆ绫诲瀷" type="STRING" length="32"/>
+				<attribute name="plan_list" label="鏈熸" type="STRING" length="32"/>
+				<attribute name="plan_date" label="璁″垝鏃ユ湡" type="STRING" length="32"/>
+				<attribute name="collect_status" label="鎵ｆ鐘舵��" type="STRING" length="32"/>
+				<attribute name="batch_status" label="澶勭悊鐘舵�佷俊鎭�" type="STRING" length="32"/>
+				<attribute name="rent_over" label="绉熼噾浣欓" type="DOUBLE" length="32"/>
+				<attribute name="corpus_over" label="鏈噾浣欓" type="DOUBLE" length="32"/>
+				<attribute name="interest_over" label="鍒╂伅浣欓" type="DOUBLE" length="32"/>
+				<attribute name="penalty_over" label="缃氭伅浣欓" type="DOUBLE" length="32"/>
+
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="VI_YC_RENT_COLLECT" />
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
+		</class>
+
 		<class name="VI_RENT_COLLECT_4_EBANK" label="鎵ｆ淇℃伅(缃戦摱鏀舵涓撶敤)" keyAttributes="ID">
 			<attributes>
 				<attribute name="ID" label="鏍囪瘑" type="STRING" length="32"/>
@@ -651,6 +716,24 @@
 				</managerProperties>
 			</manager>
 		</class>
+		<class name="BANK_COLLECT_TYPE_CONFIG_LOG" label="閾惰鎵ｆ鏂瑰紡閰嶇疆鏃ュ織琛�" keyAttributes="id">
+			<attributes>
+				<attribute name="id" label="鏍囪瘑" type="STRING" length="32"/>
+				<attribute name="config_id" label="閰嶇疆id" type="STRING" length="32"/>
+				<attribute name="bank_code" label="閾惰浠ｇ爜" type="STRING" length="32"/>
+				<attribute name="bank_name" label="閾惰鍚嶇О" type="STRING" length="32"/>
+				<attribute name="collect_type" label="鎵ｆ鏂瑰紡" type="STRING" length="32"/>
+				<attribute name="operation_type" label="鎿嶄綔绫诲瀷" type="STRING" length="32"/>
+				<attribute name="inputuserid" label="鐧昏浜�" type="STRING" length="32"/>
+				<attribute name="inputtime" label="鐧昏鏃堕棿" type="STRING" length="32"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="bank_collect_type_config_log" />
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
+		</class>
 		<class name="BANK_COLLEC_TYPET_4_CONTRACT" label="鍗曚釜鍚堝悓閾惰鎵ｆ鏂瑰紡閰嶇疆" keyAttributes="id">
 			<attributes>
 				<attribute name="id" label="鏍囪瘑" type="STRING" length="32"/>
diff --git a/src/com/amarsoft/app/awe/config/classmethod/TaxCodeInfoHandler.java b/src/com/amarsoft/app/awe/config/classmethod/TaxCodeInfoHandler.java
new file mode 100644
index 000000000..4faacb36d
--- /dev/null
+++ b/src/com/amarsoft/app/awe/config/classmethod/TaxCodeInfoHandler.java
@@ -0,0 +1,28 @@
+package com.amarsoft.app.awe.config.classmethod;
+
+import jbo.app.tenwa.calc.TAX_CODE_INFO;
+
+import com.amarsoft.are.ARE;
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.JBOException;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.awe.dw.handler.impl.CommonHandler;
+
+public class TaxCodeInfoHandler extends CommonHandler {
+
+	@Override
+	protected boolean validityCheck(BizObject bo, boolean isInsert) {
+		try {
+			BizObject tci=JBOFactory.createBizObjectQuery(TAX_CODE_INFO.CLASS_NAME," tax_type=:tax_type and lease_form=:lease_form").setParameter("tax_type", bo.getAttribute("tax_type").getString()).setParameter("lease_form", bo.getAttribute("lease_form").getString()).getSingleResult(false);
+			if(tci!=null && (isInsert ||  !bo.getAttribute("id").getString().equals(tci.getAttribute("id").getString()))){
+				errors = "该名称在对应的类型形式已存在！！！";
+				return false;
+			}
+		} catch (JBOException e) {
+			ARE.getLog().debug(e);
+			errors = e.getMessage();
+			return false;
+		}
+		return true;
+	}
+}
diff --git a/src/com/amarsoft/app/awe/config/customer/CustomerAccountConfigHandler.java b/src/com/amarsoft/app/awe/config/customer/CustomerAccountConfigHandler.java
new file mode 100644
index 000000000..1ad27eb00
--- /dev/null
+++ b/src/com/amarsoft/app/awe/config/customer/CustomerAccountConfigHandler.java
@@ -0,0 +1,77 @@
+package com.amarsoft.app.awe.config.customer;
+
+import jbo.loan.BANK_COLLECT_TYPE_CONFIG;
+import jbo.loan.BANK_COLLECT_TYPE_CONFIG_LOG;
+
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.BizObjectManager;
+import com.amarsoft.are.jbo.JBOException;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.are.jbo.JBOTransaction;
+import com.amarsoft.are.lang.DataElement;
+import com.amarsoft.awe.dw.handler.impl.CommonHandler;
+import com.tenwa.reckon.util.DateUtil;
+
+public class CustomerAccountConfigHandler extends CommonHandler {
+
+	@Override
+	protected boolean validityCheck(BizObject bo, boolean isInsert) {
+		try {
+			String bankCode=bo.getAttribute("bank_code").getString();
+			
+			BizObject cq=JBOFactory.createBizObjectQuery(BANK_COLLECT_TYPE_CONFIG.CLASS_NAME,"bank_code=:bank_code").setParameter("bank_code", bankCode).getSingleResult(false);
+			if(cq!=null){
+				String id = bo.getAttribute("id") ==null?"":bo.getAttribute("id").getString();
+				if(id.length()==0 || !cq.getAttribute("id").getString().equals(id)){
+					this.errors="该银行已存在扣款渠道，请检查！";
+					return false;
+				}
+			}
+			return true;
+			
+		} catch (JBOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			return false;
+		}
+		
+	}
+	
+	@Override
+	protected void afterInsert(JBOTransaction tx, BizObject bo)
+			throws Exception {
+		// TODO Auto-generated method stub
+		this.saveConfigLog("insert", bo, tx);
+		super.afterInsert(tx, bo);
+	}
+	
+	@Override
+	protected void afterUpdate(JBOTransaction tx, BizObject bo)
+			throws Exception {
+		// TODO Auto-generated method stub
+		this.saveConfigLog("update", bo, tx);
+		super.afterUpdate(tx, bo);
+	}
+	
+	@Override
+	protected void afterDelete(JBOTransaction tx, BizObject bo)
+			throws Exception {
+		// TODO Auto-generated method stub
+		this.saveConfigLog("delete", bo, tx);
+		super.afterDelete(tx, bo);
+	}
+	public void saveConfigLog(String operationType,BizObject bo,JBOTransaction tx) throws Exception{
+		BizObjectManager bctclManage = JBOFactory.getBizObjectManager(BANK_COLLECT_TYPE_CONFIG_LOG.CLASS_NAME,tx);
+		BizObject bctcl = bctclManage.newObject();
+		if(!"insert".equals(operationType)){
+			bctcl.setAttributeValue("config_id", bo.getAttribute("id").getString());
+		}
+		bctcl.setAttributeValue("bank_code", bo.getAttribute("bank_code").getString());
+		bctcl.setAttributeValue("bank_name", bo.getAttribute("bank_name").getString());
+		bctcl.setAttributeValue("collect_type", bo.getAttribute("collect_type").getString());
+		bctcl.setAttributeValue("operation_type",operationType);
+		bctcl.setAttributeValue("inputuserid", bo.getAttribute("updateuserid").getString());
+		bctcl.setAttributeValue("inputtime", DateUtil.getSystemTimeByFormat("yyyy/MM/dd HH:mm:ss"));
+		bctclManage.saveObject(bctcl);
+	}
+}
diff --git a/src/com/tenwa/app/manage/util/ContractSignActionTwoUtil.java b/src/com/tenwa/app/manage/util/ContractSignActionTwoUtil.java
index 79faf6f8e..4c35a7220 100644
--- a/src/com/tenwa/app/manage/util/ContractSignActionTwoUtil.java
+++ b/src/com/tenwa/app/manage/util/ContractSignActionTwoUtil.java
@@ -196,18 +196,18 @@ public class ContractSignActionTwoUtil {
 					personalStamper.setKeyword("乙方（承租人）：");
 					personalStamper.setOffsetX(-0.05);
 					//personalStamper.setOffsetY(-0.02);
+					
+					//申请人添加第二个签字位置
+					Stamper personalStamper2 = new Stamper();
+					personalStamper2.setPage(0);
+					personalStamper2.setType("PERSONAL");
+					personalStamper2.setSignatoryId(personalSignatoryId);
+					personalStamper2.setDocumentId(documentId);
+					personalStamper2.setKeyword("（本人签字并按手印/公司公章）");
+					personalStamper2.setOffsetX(-0.43);
+					//personalStamper2.setOffsetY(-0.02);
+					stampers.add(personalStamper2);
 					if(contractName.indexOf("狮桥") > -1){
-						//申请人添加第二个签字位置
-						Stamper personalStamper2 = new Stamper();
-						personalStamper2.setPage(0);
-						personalStamper2.setType("PERSONAL");
-						personalStamper2.setSignatoryId(personalSignatoryId);
-						personalStamper2.setDocumentId(documentId);
-						personalStamper2.setKeyword("（本人签字并按手印/公司公章）");
-						personalStamper2.setOffsetX(-0.43);
-						//personalStamper2.setOffsetY(-0.02);
-						stampers.add(personalStamper2);
-						
 						//申请人添加第个签字位置
 						Stamper personalStamper3 = new Stamper();
 						personalStamper3.setPage(0);
@@ -241,21 +241,20 @@ public class ContractSignActionTwoUtil {
 						stampers.add(personalStamper5);
 					}
 				}else if("gt".equals(type)){
+					personalStamper.setKeyword("乙方（承租人）：");
+					personalStamper.setOffsetX(-0.05);
+					personalStamper.setOffsetY(-0.075);
+					//共同申请人添加第二个签字位置
+					Stamper personalStamper2 = new Stamper();
+					personalStamper2.setPage(0);
+					personalStamper2.setType("PERSONAL");
+					personalStamper2.setSignatoryId(personalSignatoryId);
+					personalStamper2.setDocumentId(documentId);
+					personalStamper2.setKeyword("(共同承租人)(若有)");
+					personalStamper2.setOffsetX(-0.35);
+					//personalStamper2.setOffsetY(-0.02);
+					stampers.add(personalStamper2);
 					if(contractName.indexOf("狮桥") > -1){
-						personalStamper.setKeyword("乙方（承租人）：");
-						personalStamper.setOffsetX(-0.05);
-						personalStamper.setOffsetY(-0.075);
-						//共同申请人添加第二个签字位置
-						Stamper personalStamper2 = new Stamper();
-						personalStamper2.setPage(0);
-						personalStamper2.setType("PERSONAL");
-						personalStamper2.setSignatoryId(personalSignatoryId);
-						personalStamper2.setDocumentId(documentId);
-						personalStamper2.setKeyword("(共同承租人)(若有)");
-						personalStamper2.setOffsetX(-0.35);
-						//personalStamper2.setOffsetY(-0.02);
-						stampers.add(personalStamper2);
-						
 						//共同申请人添加第三个签字位置
 						Stamper personalStamper3 = new Stamper();
 						personalStamper3.setPage(0);
@@ -266,34 +265,15 @@ public class ContractSignActionTwoUtil {
 						personalStamper3.setOffsetX(-0.01);
 						personalStamper3.setOffsetY(-0.066);
 						stampers.add(personalStamper3);
-					}else{
-						personalStamper.setKeyword("共同申请人（签字/盖章）");
-						//personalStamper.setOffsetX(0.6);
-						personalStamper.setOffsetY(-0.02);
 					}
-					
 				}else if("db".equals(type)){
 					if(dbcont==0){
-						if(contractName.indexOf("狮桥") > -1){
-							personalStamper.setKeyword("丙方 1（保证人）：");
-							personalStamper.setOffsetX(-0.05);
-							//personalStamper.setOffsetY(-0.02);
-						}else{
-							personalStamper.setKeyword("出租人2（盖章）");
-							personalStamper.setOffsetX(0.01);
-							personalStamper.setOffsetY(-0.12);
-						}
-						
+						personalStamper.setKeyword("丙方 1（保证人）：");
+						personalStamper.setOffsetX(-0.05);
 					}else if(dbcont==1){
-						if(contractName.indexOf("狮桥") > -1){
-							personalStamper.setKeyword("丙方 2（保证人）：");
-							personalStamper.setOffsetX(-0.05);
-							//personalStamper.setOffsetY(-0.02);
-						}else{
-							personalStamper.setKeyword("承租人（签字/盖章）：");
-							personalStamper.setOffsetX(-0.01);
-							personalStamper.setOffsetY(-0.12);
-						}
+						personalStamper.setKeyword("丙方 2（保证人）：");
+						personalStamper.setOffsetX(-0.05);
+						//personalStamper.setOffsetY(-0.02);
 					}else if (dbcont==2){
 						if(contractName.indexOf("狮桥") > -1){
 							personalStamper.setKeyword("丙方 3（保证人）：");
diff --git a/src/com/tenwa/lease/app/allinpay/service/impl/AllinpayPaymentQueryRun.java b/src/com/tenwa/lease/app/allinpay/service/impl/AllinpayPaymentQueryRun.java
index 481b1e511..a5eb7cb3d 100644
--- a/src/com/tenwa/lease/app/allinpay/service/impl/AllinpayPaymentQueryRun.java
+++ b/src/com/tenwa/lease/app/allinpay/service/impl/AllinpayPaymentQueryRun.java
@@ -282,6 +282,7 @@ public class AllinpayPaymentQueryRun implements Runnable{
 		blbo.setAttributeValue(LB_BUCKLE_LOG.inputorgid, "system");
 		blbo.setAttributeValue(LB_BUCKLE_LOG.inputtime, StringFunction.getTodayNow());
 		blbo.setAttributeValue(LB_BUCKLE_LOG.updatetime, System.currentTimeMillis());
+		blbo.setAttributeValue(LB_BUCKLE_LOG.deduction_type, "通联扣款");
 		blog.saveObject(blbo);
 	}
 
diff --git a/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java b/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java
index dd0528664..b5a3b3ce5 100644
--- a/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java
+++ b/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java
@@ -268,6 +268,14 @@ public class DebitCardAction {
 	
 	//业务变更是否需要重新签约验证
 	public String checkSign(JBOTransaction tx) throws JBOException{
+		//校验合同文件是否生成的，扣款卡不需要校验是否生成合同文件
+		if(!"AccountChangeApply".equals(applyType)){
+			BizObjectManager ldclManager = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME);
+			List<BizObject> ldcls = ldclManager.createQuery("select * from O where file_flag='yes' and ( flow_unid=:flowunid or contract_id=:contractid ) ").setParameter("flowunid", FlowUnid).setParameter("contractid", contractid).getResultList(false);
+			if(ldcls.size()>0){
+				return "false";
+			}
+		}
 		//校验通联卡扣
 		if("BContractApproveApply".equals(applyType) || "BContractChangeApply".equals(applyType)||"AccountChangeApply".equals(applyType)){
 			BizObjectManager lcsshManage = JBOFactory.getFactory().getManager(LB_CARD_SIGN_STATUS_HIS.CLASS_NAME);
@@ -291,14 +299,7 @@ public class DebitCardAction {
 				}
 			}
 		}
-		//校验合同文件是否生成的，扣款卡不需要校验是否生成合同文件
-		if(!"AccountChangeApply".equals(applyType)){
-			BizObjectManager ldclManager = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME);
-			List<BizObject> ldcls = ldclManager.createQuery("select * from O where file_flag='yes' and ( flow_unid=:flowunid or contract_id=:contractid ) ").setParameter("flowunid", FlowUnid).setParameter("contractid", contractid).getResultList(false);
-			if(ldcls.size()>0){
-				return "false";
-			}
-		}
+		
 		BizObjectManager cahManage = JBOFactory.getFactory().getManager(CUSTOMER_ACCOUNT_HIS.CLASS_NAME);
 		List<BizObject> cahs = cahManage.createQuery(" sign_status='Y' and account=:account and acc_number=:acc_number and  certid=:certid ")
 		.setParameter("account", account).setParameter("acc_number", acc_number).setParameter("certid", certId).getResultList(false);
@@ -444,6 +445,16 @@ public class DebitCardAction {
 		return "获取状态失败！";
 	}
 	
+	//根据名称显示数据字典的银行名称
+	public String selectBankName(JBOTransaction tx) throws Exception{
+		String sql="SELECT bank_code,bank_name from bank_code where is_use='Y' and  LOCATE(bank_name,'"+bank_name+"')>0";
+		List<Map<String, String>> data = DataOperatorUtil.getDataBySql(tx, sql, null);
+		if(data!=null&& data.size()>0){
+			return data.get(0).get("bank_code")+"@"+data.get(0).get("bank_name");
+		}
+		return "error";
+	}
+	
 	public String getMobile() {
 		return mobile;
 	}
diff --git a/src_core/com/tenwa/doc/cache/DocListCache.java b/src_core/com/tenwa/doc/cache/DocListCache.java
index 12462fc39..3e038943e 100644
--- a/src_core/com/tenwa/doc/cache/DocListCache.java
+++ b/src_core/com/tenwa/doc/cache/DocListCache.java
@@ -13,6 +13,51 @@ import com.amarsoft.dict.als.manage.NameManager;
 
 public class DocListCache {
 
+	public static String getDeleteFile(String libraryid) throws Exception{
+
+		@SuppressWarnings("unchecked")
+		List<BizObject> list=JBOFactory.getBizObjectManager("jbo.app.tenwa.doc.LB_DOCATTRIBUTE").createQuery("Library_Id=:libraryid ").setParameter("libraryid", libraryid).getResultList(false);
+
+		StringBuffer sb=new StringBuffer();
+		sb.append("{");
+		for(int i=0;i<list.size();i++){
+			BizObject bo=list.get(i);
+			sb.append("\"" +i+"\""+":{");
+			String type=bo.getAttribute("CONTENT_TYPE").getString();
+			if(type.indexOf("image")>=0){
+				sb.append("\"image\":\""+true+"\",");
+			}else{
+				sb.append("\"image\":\""+false+"\",");
+			}
+			if(type.indexOf("application/msword")>=0||type.indexOf("application/vnd.openxmlformats-officedocument.wordprocessingml.document")>=0||type.indexOf("application/vnd.ms-excel")>=0||type.indexOf("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")>=0){
+				sb.append("\"word\":\""+true+"\",");
+			}else{
+				sb.append("\"word\":\""+false+"\",");
+			}
+			if(type.indexOf("application/pdf")>=0){
+				sb.append("\"pdf\":\""+true+"\",");
+			}else{
+				sb.append("\"pdf\":\""+false+"\",");
+			}
+			sb.append("\"id\":\""+bo.getAttribute("id").getString()+"\",");
+			sb.append("\"objecttype\":\""+bo.getAttribute("objecttype").getString()+"\",");
+			sb.append("\"filename\":\""+bo.getAttribute("FileName").getString()+"\",");
+			sb.append("\"inputtime\":\""+bo.getAttribute("inputtime").getString()+"\",");
+			sb.append("\"inputuser\":\""+NameManager.getUserName(bo.getAttribute("InputUserId").getString())+"\",");
+			sb.append("\"content_type\":\""+bo.getAttribute("content_type").getString()+"\",");
+			sb.append("\"filepath\":\""+bo.getAttribute("filepath").getString()+"\",");
+			sb.append("\"FileSize\":\""+bo.getAttribute("FileSize").getString()+"\"");
+
+			sb.append("},");
+		}
+		if(sb.length()>1){
+			sb.deleteCharAt(sb.length() - 1);
+		}
+		sb.append("}");
+
+		return sb.toString();
+	}
+
 	public static String getFile(String libraryid) throws Exception{
 		
 		@SuppressWarnings("unchecked")
diff --git a/src_jbo/jbo/app/tenwa/calc/TAX_CODE_INFO.java b/src_jbo/jbo/app/tenwa/calc/TAX_CODE_INFO.java
index 316b24a06..4255569f7 100644
--- a/src_jbo/jbo/app/tenwa/calc/TAX_CODE_INFO.java
+++ b/src_jbo/jbo/app/tenwa/calc/TAX_CODE_INFO.java
@@ -33,4 +33,8 @@ public interface TAX_CODE_INFO{
 	* 简称 STRING(20)<br>
 	*/
 	public static final String remark = "remark";
+	/**
+	* 租赁类型01直租，02回租 STRING(20)<br>
+	*/
+	public static final String lease_form = "lease_form";
 }
\ No newline at end of file
diff --git a/src_jbo/jbo/com/tenwa/lease/comm/LB_BUCKLE_LOG.java b/src_jbo/jbo/com/tenwa/lease/comm/LB_BUCKLE_LOG.java
index a116acf72..46a70a34a 100644
--- a/src_jbo/jbo/com/tenwa/lease/comm/LB_BUCKLE_LOG.java
+++ b/src_jbo/jbo/com/tenwa/lease/comm/LB_BUCKLE_LOG.java
@@ -45,6 +45,10 @@ public interface LB_BUCKLE_LOG{
 	* 扣款金额 STRING(255)<br>
 	*/
 	public static final String cut_money = "cut_money";
+	/**
+	 * 卡扣类型 STRING(10)<br>
+	 */
+	public static final String deduction_type = "deduction_type";
 	/**
 	* 登记人 STRING(32)<br>
 	*/
diff --git a/src_jbo/jbo/loan/BANK_COLLECT_TYPE_CONFIG_LOG.java b/src_jbo/jbo/loan/BANK_COLLECT_TYPE_CONFIG_LOG.java
new file mode 100644
index 000000000..d5cf297a9
--- /dev/null
+++ b/src_jbo/jbo/loan/BANK_COLLECT_TYPE_CONFIG_LOG.java
@@ -0,0 +1,48 @@
+package jbo.loan;
+
+import java.lang.String;
+
+/**
+* 银行扣款方式配置日志表 - JBO命名常量类<br><br>
+* Note: This file is generated by ADE tools, <em>dont</em> modify it.<br>
+
+*/
+public interface BANK_COLLECT_TYPE_CONFIG_LOG{
+	/**
+	* 银行扣款方式配置日志表<br><br>
+	* 代表本类映射的BizObjectClass
+	*/
+	public static final String CLASS_NAME = "jbo.loan.BANK_COLLECT_TYPE_CONFIG_LOG";
+	/**
+	* 标识 STRING(32)<br>
+	*/
+	public static final String id = "id";
+	/**
+	* 配置id STRING(32)<br>
+	*/
+	public static final String config_id = "config_id";
+	/**
+	* 银行代码 STRING(32)<br>
+	*/
+	public static final String bank_code = "bank_code";
+	/**
+	* 银行名称 STRING(32)<br>
+	*/
+	public static final String bank_name = "bank_name";
+	/**
+	* 扣款方式 STRING(32)<br>
+	*/
+	public static final String collect_type = "collect_type";
+	/**
+	* 操作类型 STRING(32)<br>
+	*/
+	public static final String operation_type = "operation_type";
+	/**
+	* 登记人 STRING(32)<br>
+	*/
+	public static final String inputuserid = "inputuserid";
+	/**
+	* 登记时间 STRING(32)<br>
+	*/
+	public static final String inputtime = "inputtime";
+}
\ No newline at end of file
diff --git a/src_jbo/jbo/loan/VI_YC_RENT_COLLECT.java b/src_jbo/jbo/loan/VI_YC_RENT_COLLECT.java
new file mode 100644
index 000000000..f9c47f944
--- /dev/null
+++ b/src_jbo/jbo/loan/VI_YC_RENT_COLLECT.java
@@ -0,0 +1,76 @@
+package jbo.loan;
+
+import java.lang.String;
+
+/**
+* 扣款信息(邮储) - JBO命名常量类<br><br>
+* Note: This file is generated by ADE tools, <em>dont</em> modify it.<br>
+
+*/
+public interface VI_YC_RENT_COLLECT{
+	/**
+	* 扣款信息(邮储)<br><br>
+	* 代表本类映射的BizObjectClass
+	*/
+	public static final String CLASS_NAME = "jbo.loan.VI_YC_RENT_COLLECT";
+	/**
+	* 标识 STRING(32)<br>
+	*/
+	public static final String ID = "ID";
+	/**
+	* 经销商id STRING(32)<br>
+	*/
+	public static final String distributor_id = "distributor_id";
+	/**
+	* payment_number STRING(32)<br>
+	*/
+	public static final String payment_number = "payment_number";
+	/**
+	* 客户名称 STRING(32)<br>
+	*/
+	public static final String customername = "customername";
+	/**
+	* 客户账号 STRING(32)<br>
+	*/
+	public static final String acc_number = "acc_number";
+	/**
+	* 证件号 STRING(40)<br>
+	*/
+	public static final String certid = "certid";
+	/**
+	* 扣款类型 STRING(32)<br>
+	*/
+	public static final String collect_type = "collect_type";
+	/**
+	* 期次 STRING(32)<br>
+	*/
+	public static final String plan_list = "plan_list";
+	/**
+	* 计划日期 STRING(32)<br>
+	*/
+	public static final String plan_date = "plan_date";
+	/**
+	* 扣款状态 STRING(32)<br>
+	*/
+	public static final String collect_status = "collect_status";
+	/**
+	* 处理状态信息 STRING(32)<br>
+	*/
+	public static final String batch_status = "batch_status";
+	/**
+	* 租金余额 DOUBLE(32)<br>
+	*/
+	public static final String rent_over = "rent_over";
+	/**
+	* 本金余额 DOUBLE(32)<br>
+	*/
+	public static final String corpus_over = "corpus_over";
+	/**
+	* 利息余额 DOUBLE(32)<br>
+	*/
+	public static final String interest_over = "interest_over";
+	/**
+	* 罚息余额 DOUBLE(32)<br>
+	*/
+	public static final String penalty_over = "penalty_over";
+}
\ No newline at end of file
diff --git a/src_jbo/jbo/loan/vi_manual_dedution.java b/src_jbo/jbo/loan/vi_manual_dedution.java
new file mode 100644
index 000000000..19b2304cb
--- /dev/null
+++ b/src_jbo/jbo/loan/vi_manual_dedution.java
@@ -0,0 +1,116 @@
+package jbo.loan;
+
+import java.lang.String;
+
+/**
+* 手工扣款信息 - JBO命名常量类<br><br>
+* Note: This file is generated by ADE tools, <em>dont</em> modify it.<br>
+
+*/
+public interface vi_manual_dedution{
+	/**
+	* 手工扣款信息<br><br>
+	* 代表本类映射的BizObjectClass
+	*/
+	public static final String CLASS_NAME = "jbo.loan.vi_manual_dedution";
+	/**
+	* 标识 STRING(32)<br>
+	*/
+	public static final String ID = "ID";
+	/**
+	* 合同id STRING(32)<br>
+	*/
+	public static final String contract_id = "contract_id";
+	/**
+	* 业务类型 STRING(32)<br>
+	*/
+	public static final String businesstype = "businesstype";
+	/**
+	* 主体id STRING(32)<br>
+	*/
+	public static final String subjectid = "subjectid";
+	/**
+	* 主体名称 STRING(32)<br>
+	*/
+	public static final String subjectname = "subjectname";
+	/**
+	* 经销商id STRING(32)<br>
+	*/
+	public static final String distributor_id = "distributor_id";
+	/**
+	* 合同编号 STRING(32)<br>
+	*/
+	public static final String contract_number = "contract_number";
+	/**
+	* payment_number STRING(32)<br>
+	*/
+	public static final String payment_number = "payment_number";
+	/**
+	* 客户名称 STRING(32)<br>
+	*/
+	public static final String customername = "customername";
+	/**
+	* 客户账号 STRING(32)<br>
+	*/
+	public static final String acc_number = "acc_number";
+	/**
+	* 期次 STRING(32)<br>
+	*/
+	public static final String plan_list = "plan_list";
+	/**
+	* 计划日期 STRING(32)<br>
+	*/
+	public static final String plan_date = "plan_date";
+	/**
+	* 扣款状态 STRING(32)<br>
+	*/
+	public static final String collect_status = "collect_status";
+	/**
+	* 扣款状态信息 STRING(32)<br>
+	*/
+	public static final String collect_msg = "collect_msg";
+	/**
+	* 处理状态信息 STRING(32)<br>
+	*/
+	public static final String batch_status = "batch_status";
+	/**
+	* 租金 DOUBLE(32)<br>
+	*/
+	public static final String rent = "rent";
+	/**
+	* 本金 DOUBLE(32)<br>
+	*/
+	public static final String corpus = "corpus";
+	/**
+	* 利息 DOUBLE(32)<br>
+	*/
+	public static final String interest = "interest";
+	/**
+	* 罚息 DOUBLE(32)<br>
+	*/
+	public static final String penalty = "penalty";
+	/**
+	* 已还罚息 DOUBLE(32)<br>
+	*/
+	public static final String penalty_sum = "penalty_sum";
+	/**
+	* 租金余额 DOUBLE(32)<br>
+	*/
+	public static final String rent_over = "rent_over";
+	/**
+	* 本金余额 DOUBLE(32)<br>
+	*/
+	public static final String corpus_over = "corpus_over";
+	/**
+	* 利息余额 DOUBLE(32)<br>
+	*/
+	public static final String interest_over = "interest_over";
+	/**
+	* 罚息余额 DOUBLE(32)<br>
+	*/
+	public static final String penalty_over = "penalty_over";
+	/**
+	* 扣款类型 STRING(32)<br>
+	*/
+	public static final String collect_type = "collect_type";
+}
\ No newline at end of file
diff --git a/src_sql/procedure/PROC_calc_tax_tj.sql b/src_sql/procedure/PROC_calc_tax_tj.sql
index ef6a94af2..516cbbc4e 100644
--- a/src_sql/procedure/PROC_calc_tax_tj.sql
+++ b/src_sql/procedure/PROC_calc_tax_tj.sql
@@ -33,7 +33,7 @@ BEGIN
   `vib`.`invoice_money` AS `invoice_money`,
   `cl`.`itemname`       AS `tax_type`,
   `vib`.`tax_no`        AS `tax_no`,
-  `tci`.`code`          AS `tax_code`,
+   case lci.leas_form  when '02' then  `tci`.`code` when '01' then `tci1`.`code` end          AS `tax_code`,
   `ca`.`CERTID`         AS `cert_id`,
   `ca`.`account`        AS `account`,
   `ca`.`acc_number`     AS `acc_number`,
@@ -54,7 +54,9 @@ FROM (((((((`apzl`.`vi_li_invoice_tj_base` `vib`
       ON (((`cl`.`codeno` = 'tax_type')
            AND (`cl`.`itemno` = `vib`.`tax_no`))))
    LEFT JOIN `apzl`.`tax_code_info` `tci`
-     ON ((`tci`.`tax_type` = `cl`.`itemno`)))
+     ON ((`tci`.`tax_type` = `cl`.`itemno` and tci.`lease_form`='02'))
+     LEFT JOIN `apzl`.`tax_code_info` `tci1` on `tci1`.`tax_type` = `cl`.`itemno` and tci1.`lease_form`='01'
+     )
 WHERE ((`vib`.`tax_no` IN('rent','interest','penalty','feetype1','feetype4','feetype30'))
        )
 ;
diff --git a/src_sql/view/vi_lc_splitting_pay_list.sql b/src_sql/view/vi_lc_splitting_pay_list.sql
index 9b489c339..d01fbd6a6 100644
--- a/src_sql/view/vi_lc_splitting_pay_list.sql
+++ b/src_sql/view/vi_lc_splitting_pay_list.sql
@@ -42,7 +42,7 @@ WHERE ((`o`.`CORPUS_SP` IS NOT NULL)
              OR (`o`.`COLLECT_STATUS` = '代偿'))
        AND ((`o`.`splitting_status` = 'N')
              OR ISNULL(`o`.`splitting_status`))
-		AND ISNULL(lccc.id)
+		AND ISNULL(lccc.id) AND O.COLLECT_STATUS<>'提前结清'
              )
 )$$
 
diff --git a/src_sql/鎶曚骇SQL/v20201022/tft_20201022.sql b/src_sql/鎶曚骇SQL/v20201022/tft_20201022.sql
index 912823e6d..a71bd5c6a 100644
--- a/src_sql/鎶曚骇SQL/v20201022/tft_20201022.sql
+++ b/src_sql/鎶曚骇SQL/v20201022/tft_20201022.sql
@@ -181,6 +181,58 @@ Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescr
 delete from AWE_DO_CATALOG where dono='VILCRentPlanList';
 Insert Into AWE_DO_CATALOG (dono,doname,dodescribe,dotype,doclass,isinuse,colcount,modeid,jboclass,jbofrom,jbowhere,jbogroup,jboorder,businessprocess,exportflag,inputuser,inputtime,updateuser,updatetime,remark,isvalidate,parent) Values ('VILCRentPlanList','租金计划视图表',null,'30120',null,'1','1','default','jbo.loan.VI_RENT_COLLECT_4_EBANK','O left join jbo.com.tenwa.lease.comm.LB_EQUIPMENT_CAR lec on O.contract_id=lec.contract_id and lec.car_attribute=''head''  left join jbo.com.tenwa.lease.comm.LB_CAR_LICENSE_PLATE_INFO lcl on lec.contract_id=lcl.contract_id and lec.frame_number=lcl.frame_number','O.businesstype=:businessType and O.subjectid=:subjectId and v.DATE_FORMAT(O.plan_date,''%Y%m'') <= v.DATE_FORMAT(v.SYSDATE(),''%Y%m'') and rent_over>0','','','com.tenwa.flow.rent.rentincome.VILCRentPlanListHandler',null,'SYS_Designer','2017/06/04 20:29:52','SYS_Designer','2020/11/18 10:15:22','','1','');
 
+-- 需要在贝贝的代码后面执行
+-- 银行名称中添加是否启用字段 
+Alter table bank_code add column is_use varchar(1) NULL COMMENT '是否使用' after bank_name; 
+delete from  SELECT_CATALOG where selname='selectBankType';
+Insert Into SELECT_CATALOG (selname,seltype,seldescribe,seltablename,selprimarykey,selbrowsemode,selargs,selhidefield,selcode,selfieldname,selfielddisp,selreturnvalue,selfilterfield,isinuse,mutilorsingle,attribute1,attribute2,attribute3,attribute4,attribute5,inputuser,inputorg,inputtime,updateuser,updatetime,remark) Values ('selectBankType','Sql','查询银行名称','bank_code','bank_code','Grid','','','SELECT bank_code,bank_name from bank_code where is_use=''Y''','银行编号,银行名称','','bank_code@bank_name','bank_name','1','Single','','','','','','SYS_Designer','','2020/10/21 18:46:44','SYS_Designer','2020/12/10 09:45:21','');
+update bank_code set is_use='N';
+update bank_code set is_use='Y' where bank_name in ('工商银行','中国银行','建设银行','农业银行','招商银行','交通银行','邮政银行','兴业银行','平安银行','民生银行','中信银行','光大银行','广发银行','浦发银行','华夏银行','北京银行','上海银行','渤海银行','恒丰银行');
+
+-- 添加银行扣款渠道配置操作日志
+CREATE TABLE bank_collect_type_config_log (
+  id varchar(32) DEFAULT NULL COMMENT 'id',
+  config_id varchar(32) DEFAULT NULL COMMENT '配置表',
+  bank_code varchar(10) DEFAULT NULL COMMENT '银行编码',
+  bank_name varchar(20) DEFAULT NULL COMMENT '银行名称',
+  collect_type varchar(10) DEFAULT NULL COMMENT '扣款渠道',
+  operation_type varchar(10) DEFAULT NULL COMMENT '操作类型',
+  inputuserid varchar(20) DEFAULT NULL COMMENT '登记人',
+  inputtime varchar(20) DEFAULT NULL COMMENT '登记时间'
+) ENGINE=InnoDB DEFAULT CHARSET=gbk;
+delee from AWE_DO_CATALOG where dono='BankCollectTypeConfigInfo';
+Insert Into AWE_DO_CATALOG (dono,doname,dodescribe,dotype,doclass,isinuse,colcount,modeid,jboclass,jbofrom,jbowhere,jbogroup,jboorder,businessprocess,exportflag,inputuser,inputtime,updateuser,updatetime,remark,isvalidate,parent) Values ('BankCollectTypeConfigInfo','银行扣款方式配置',null,'30020',null,'1','1','default','jbo.loan.BANK_COLLECT_TYPE_CONFIG','O','id=:id','','','com.amarsoft.app.awe.config.customer.CustomerAccountConfigHandler',null,'SYS_Designer','2020/10/22 11:42:42','SYS_Designer','2020/12/10 14:36:40','','0','');
+
+-- 税率编码维护添加主体字段
+Alter table tax_code_info add column lease_form varchar(5) NULL COMMENT '赁类型01直租，02回租' after remark; 
+-- 税率编码维护list页面添加租赁类型字段
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('taxCodeList','0045','0045','1','O','lease_form','lease_form','String','','租赁类型','','1','FlatSelect','1','1','Code','leas_form','','20','1','0','0','1','0',0,'','','','SYS_Designer','2020/12/11 09:49:25','SYS_Designer','2020/12/11 10:50:03','0','','1','','','','');
+-- 税率编码维护info页面添加校验和字段
+delete from AWE_DO_CATALOG where dono='taxCodeInfo';
+Insert Into AWE_DO_CATALOG (dono,doname,dodescribe,dotype,doclass,isinuse,colcount,modeid,jboclass,jbofrom,jbowhere,jbogroup,jboorder,businessprocess,exportflag,inputuser,inputtime,updateuser,updatetime,remark,isvalidate,parent) Values ('taxCodeInfo','税率编码信息',null,'30',null,'1','1','default','jbo.app.tenwa.calc.TAX_CODE_INFO','O','id=:id','','','com.amarsoft.app.awe.config.classmethod.TaxCodeInfoHandler',null,'SYS_Designer','2020/07/30 16:05:18','SYS_Designer','2020/12/11 10:46:12','','0','');
+delete from awe_do_library where dono='taxCodeInfo';
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('taxCodeInfo','0010','0010','1','O','id','id','String','','id','','1','Text','1','1','','','',null,'0','0','0','1','0',0,'','','','SYS_Designer','2020/07/30 16:05:18','SYS_Designer','2020/12/11 10:46:12','','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('taxCodeInfo','0020','0020','1','O','code','code','String','','编码','','1','Text','1','1','','','',null,'1','0','1','1','0',0,'','','','SYS_Designer','2020/07/30 16:05:18','SYS_Designer','2020/12/11 10:46:12','0','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('taxCodeInfo','0030','0030','1','O','full_code','full_code','String','','合并编码','','1','Text','1','1','','','',null,'1','0','1','1','0',0,'','','','SYS_Designer','2020/07/30 16:05:18','SYS_Designer','2020/12/11 10:46:12','0','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('taxCodeInfo','0040','0040','1','O','tax_type','tax_type','String','','名称','','1','Select','1','1','Code','tax_type','',null,'1','0','1','1','0',0,'','','','SYS_Designer','2020/07/30 16:05:18','SYS_Designer','2020/12/11 10:46:12','0','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('taxCodeInfo','0045','0045','1','O','lease_form','lease_form','String','','租赁类型','','1','Select','1','1','Code','leas_form','','20','1','0','1','1','0',0,'','','','SYS_Designer','2020/12/11 09:51:16','SYS_Designer','2020/12/11 10:51:43','0','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('taxCodeInfo','0050','0050','1','O','remark','remark','String','','简称','','1','Text','1','1','','','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2020/07/30 16:05:18','SYS_Designer','2020/12/11 10:46:12','','','1','','','','');
+
+-- 添加扣款渠道数据字典
+Insert Into CODE_CATALOG (codeno,sortno,codetypeone,codetypetwo,codename,codedescribe,codeattribute,inputuser,inputorg,inputtime,updateuser,updatetime,remark) Values ('DeductionCollect','00217700','1.基础配置','扣款渠道','','','','SYS_Designer',null,'2020/12/11 15:56:58','SYS_Designer','2020/12/11 15:56:58','');
+Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescribe,itemattribute,relativecode,attribute1,attribute2,attribute3,attribute4,attribute5,attribute6,attribute7,attribute8,inputuser,inputorg,inputtime,updateuser,updatetime,remark,helptext) Values ('DeductionCollect','TLcollect','通联扣款','','0020','1','','','','','','','','','','','','SYS_Designer',null,'2020/12/11 15:59:56','SYS_Designer','2020/12/11 15:59:56','','');
+Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescribe,itemattribute,relativecode,attribute1,attribute2,attribute3,attribute4,attribute5,attribute6,attribute7,attribute8,inputuser,inputorg,inputtime,updateuser,updatetime,remark,helptext) Values ('DeductionCollect','YCcollect','邮储扣款','','0030','1','','','','','','','','','','','','SYS_Designer',null,'2020/12/11 15:59:56','SYS_Designer','2020/12/11 15:59:56','','');
+Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescribe,itemattribute,relativecode,attribute1,attribute2,attribute3,attribute4,attribute5,attribute6,attribute7,attribute8,inputuser,inputorg,inputtime,updateuser,updatetime,remark,helptext) Values ('DeductionCollect','YLcollect','银联扣款','','0010','1','','','','','','','','','','','','SYS_Designer',null,'2020/12/11 15:56:58','SYS_Designer','2020/12/11 15:59:56','','');
+
+delete from awe_do_library where dono='BankCollectTypeConfigList' and colindex='1030';
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BankCollectTypeConfigList','1030','1030','1','O','collect_type','collect_type','String','','扣款方式','','1','Select','1','1','Code','DeductionCollect','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2020/10/22 11:40:33','SYS_Designer','2020/12/11 16:37:03','0','','1','','','','');
+delete from awe_do_library where dono='BankCollectTypeConfigInfo' and colindex='1030';
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BankCollectTypeConfigInfo','1030','1030','1','O','collect_type','collect_type','String','','扣款方式','','1','Select','1','1','Code','DeductionCollect','',null,'1','0','1','1','0',0,'','','','SYS_Designer','2020/10/22 11:42:42','SYS_Designer','2020/12/11 16:37:21','0','','1','','','','');
+
+
+
+
+
 
 
 
diff --git a/src_sql/鎶曚骇SQL/v20201022/zhanglei20201210_宸蹭笂绾�.sql b/src_sql/鎶曚骇SQL/v20201022/zhanglei20201210_宸蹭笂绾�.sql
new file mode 100644
index 000000000..588a6028d
--- /dev/null
+++ b/src_sql/鎶曚骇SQL/v20201022/zhanglei20201210_宸蹭笂绾�.sql
@@ -0,0 +1,132 @@
+
+
+-- 添加页签
+INSERT INTO `apzl`.`prd_nodeinfo`(`nodeid`, `nodename`, `sortno`, `isinuse`, `itemdescribe`, `inputuserid`, `inputorgid`, `inputtime`, `updateuserid`, `updatetime`, `initscript`, `exportscript`, `phasescript`, `deletescript`, `remark`, `formalClass`, `querycondition`) VALUES ('990002', '付款申请资料清单', '990002', '1', '/Tenwa/Comm/DocList/PayDocListFk.jsp', 'administrator', '8009001', '2020/11/25', 'administrator', '2020/11/25', '', '', '', '', '', '', '');
+
+-- 修改档案基本信息
+DELETE from  awe_do_catalog where dono='LbContactInfo' ;
+INSERT INTO `apzl`.`awe_do_catalog`(`dono`, `doname`, `dodescribe`, `dotype`, `doclass`, `isinuse`, `colcount`, `modeid`, `jboclass`, `jbofrom`, `jbowhere`, `jbogroup`, `jboorder`, `businessprocess`, `exportflag`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `remark`, `isvalidate`, `parent`) VALUES ('LbContactInfo', '档案基本信息', NULL, '30090', NULL, '1', '2', 'default', 'jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO_TEMP', 'O LEFT JOIN jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO lci ON O.CONTRACT_NO=lci.CONTRACT_NO LEFT JOIN jbo.com.tenwa.lease.comm.LB_UNION_LESSEE lul ON lci.id=lul.contract_id LEFT JOIN jbo.app.tenwa.customer.CUSTOMER_INFO ci ON ci.customerid=lul.customer_id LEFT JOIN jbo.app.tenwa.customer.CUSTOMER_PERSON cp ON lul.customer_id=cp.customerid LEFT JOIN jbo.app.tenwa.customer.CUSTOMER_COMPANY cc ON cc.customerid=lul.customer_id', 'FLOWUNID=:FLOWUNID', NULL, NULL, NULL, NULL, 'SYS_Designer', '2018/05/28 15:23:01', 'SYS_Designer', '2018/05/31 09:42:29', NULL, '1', NULL);
+
+-- 增加合同基本信息分组
+INSERT INTO `apzl`.`awe_do_group`(`dono`, `dockid`, `dockname`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `inputorg`, `sortno`, `grouphead`, `groupfoot`, `groupbody`, `colcount`, `styleid`, `isexpand`, `groupbody1`, `groupbody2`) VALUES ('LbContactInfo', '0020', '合同基本信息', 'SYS_Designer', '2018/07/02 20:47:46', 'SYS_Designer', '2018/07/02 20:47:46', NULL, '0020', NULL, NULL, NULL, 2, NULL, NULL, NULL, NULL);
+
+-- 添加合同基本信息字段
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('LbContactInfo', '0412', '0412', '1', '', 'ci.customertype', 'customertype', 'String', '', '客户类型', '', '1', 'Text', '1', '1', '', '', '', NULL, '0', '0', '0', '1', '0', 0, '', '', '', 'SYS_Designer', '2020/07/30 14:08:24', 'administrator', '2020/07/22 14:03:33', '', '', '1', '', '', '', '');
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('LbContactInfo', '0413', '0413', '1', '', 'ci.customername', 'FULLNAME_CP', 'String', '', '姓名', '', '1', 'Text', '1', '1', '', '', '', NULL, '1', '0', '0', '1', '0', 0, '', '0020', '', 'SYS_Designer', '2020/07/18 18:15:31', '80009U00000001', '2020/09/02 15:19:44', '', '', '1', '', '', '', '');
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('LbContactInfo', '0414', '0414', '1', '', 'cp.CERTTYPE', 'CERTTYPE_CP', 'String', '', '证件类型', '', '1', 'Select', '1', '1', 'Code', 'CertType', '', NULL, '1', '0', '0', '1', '0', 1, '', '0020', '', 'SYS_Designer', '2018/07/18 18:15:31', 'administrator', '2019/07/22 14:03:33', '', '', '1', '', '', '', '');
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('LbContactInfo', '0415', '0415', '1', '', 'cc.certtype', 'CERTTYPE_CC', 'String', '', '证件类型', '', '1', 'Select', '1', '1', 'Code', 'CertType', '', NULL, '1', '0', '0', '1', '0', 1, '', '0020', '', 'SYS_Designer', '2018/07/30 12:50:48', '80009U00000001', '2019/09/02 15:19:44', '', '', '1', '', '', '', '');
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('LbContactInfo', '0418', '0418', '1', '', 'cc.certid', 'CERTID_CC', 'String', '', '证件号码', '', '1', 'Text', '1', '1', '', '', '', NULL, '1', '0', '0', '1', '0', 1, '', '0020', '', 'SYS_Designer', '2020/07/30 12:50:48', '80009U00000001', '2020/09/02 15:19:44', '', '', '1', '', '', '', '');
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('LbContactInfo', '0419', '0419', '1', '', 'cp.CERTID', 'CERTID_CP', 'String', '', '证件号码', '', '1', 'Text', '1', '1', '', '', '', NULL, '1', '0', '0', '1', '0', 1, '', '0020', '', 'SYS_Designer', '2020/07/18 18:15:31', 'administrator', '2020/07/22 14:03:33', '', '', '1', '', '', '', '');
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('LbContactInfo', '0420', '0420', '1', '', 'cp.mobile', 'MOBILE_CP', 'String', '', '手机号', '', '1', 'Text', '1', '1', '', '', '', NULL, '1', '0', '0', '1', '0', 1, '', '0020', '', 'SYS_Designer', '2018/07/18 18:15:31', 'administrator', '2019/07/22 14:03:33', '', '', '1', '', '', '', '');
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('LbContactInfo', '0421', '0421', '1', '', 'cc.tel', 'TEL_CC', 'String', '', '手机号', '', '1', 'Text', '1', '1', '', '', '', NULL, '1', '0', '0', '1', '0', 1, '', '0020', '', 'SYS_Designer', '2020/07/30 12:50:48', 'administrator', '2020/07/22 14:03:33', '', '', '1', '', '', '', '');
+
+
+
+
+-- 添加页签
+INSERT INTO `apzl`.`prd_nodeinfo`(`nodeid`, `nodename`, `sortno`, `isinuse`, `itemdescribe`, `inputuserid`, `inputorgid`, `inputtime`, `updateuserid`, `updatetime`, `initscript`, `exportscript`, `phasescript`, `deletescript`, `remark`, `formalClass`, `querycondition`) VALUES ('990003', '已撤销资料清单', '990003', '1', '/Tenwa/Comm/DocList/PayDocListFkBak.jsp', 'administrator', '8009001', '2020/11/25', 'administrator', '2020/11/25', '', '', '', '', '', '', '');
+
+-- 增加模板【已删除清单】
+INSERT INTO `apzl`.`awe_do_catalog`(`dono`, `doname`, `dodescribe`, `dotype`, `doclass`, `isinuse`, `colcount`, `modeid`, `jboclass`, `jbofrom`, `jbowhere`, `jbogroup`, `jboorder`, `businessprocess`, `exportflag`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `remark`, `isvalidate`, `parent`) VALUES ('FlowPayDocListDelete', '已撤销放款资料', NULL, '30060', NULL, '1', '1', 'default', 'jbo.app.tenwa.doc.LB_DOCLIBRARY', 'O,jbo.app.tenwa.doc.LB_DOCRELATIVE rela', 'rela.id=O.relative_Id', NULL, 'DOC_CLASS_ITEMNO,Serial_Num', NULL, NULL, 'SYS_Designer', '2017/05/15 09:24:29', 'SYS_Designer', '2017/06/11 20:23:40', NULL, '1', NULL);
+
+-- 增加模板【已删除清单】 详细字段
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('FlowPayDocListDelete', '1010', '1121', '1', 'O', 'Serial_Num', 'Serial_Num', 'String', NULL, '序号', NULL, '1', 'Text', '1', '1', NULL, NULL, 'style={width:30px;}', '32', '0', '1', '0', '0', '0', 0, NULL, NULL, NULL, 'SYS_Designer', '2017/05/15 09:24:29', '8006U00000002', '2019/01/14 14:37:30', '0', NULL, '0', NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('FlowPayDocListDelete', '1020', '1020', '1', 'O', 'Doc_Name', 'Doc_Name', 'String', NULL, '资料名称', NULL, '1', 'Text', '1', '1', NULL, NULL, 'style={width:300px;}', '200', '1', '1', '0', '0', '0', 0, NULL, NULL, NULL, 'SYS_Designer', '2017/05/15 09:24:29', '8006U00000002', '2019/01/14 14:37:30', '0', NULL, '0', NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('FlowPayDocListDelete', '1030', '1030', '1', 'O', 'Doc_Nature', 'Doc_Nature', 'String', NULL, '资料性质', NULL, '1', 'Select', '1', '1', 'Code', 'DocNature', 'style={width:70px;}', '64', '1', '1', '0', '0', '0', 0, NULL, NULL, NULL, 'SYS_Designer', '2017/05/15 09:24:29', '8006U00000002', '2019/01/14 14:37:30', '0', NULL, '0', NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('FlowPayDocListDelete', '1040', '1040', '1', 'O', 'Remark', 'Remark', 'String', NULL, '备注', NULL, '1', 'Text', '1', '1', NULL, NULL, 'style={width:200px;}', '200', '1', '0', '0', '0', '0', 0, NULL, NULL, NULL, 'SYS_Designer', '2017/05/15 09:24:29', '8006U00000002', '2019/01/14 14:37:30', '0', NULL, '1', NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('FlowPayDocListDelete', '1045', '1045', '1', 'O', 'OPERATE_CHECK', 'OPERATE_CHECK', 'String', NULL, '运营确认', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '32', '0', '0', '0', '1', '0', 0, NULL, NULL, NULL, 'SYS_Designer', '2017/06/08 17:06:07', '8006U00000002', '2019/01/14 14:37:30', '0', NULL, '1', NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('FlowPayDocListDelete', '1050', '1050', '1', 'O', 'Doc_Type', 'Doc_Type', 'String', NULL, '资料类型', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '32', '0', '0', '0', '0', '0', 0, NULL, NULL, NULL, 'SYS_Designer', '2017/05/15 09:24:29', '8006U00000002', '2019/01/14 14:37:30', '0', NULL, '0', NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('FlowPayDocListDelete', '1060', '1001', '1', 'O', 'One_Classify', 'One_Classify', 'String', NULL, '一级分类', NULL, '1', 'Text', '1', '1', 'Code', 'DocList', NULL, '150', '1', '1', '0', '0', '0', 0, NULL, NULL, NULL, 'SYS_Designer', '2017/05/15 09:24:29', '8006U00000002', '2019/01/14 14:37:30', '0', NULL, '0', NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('FlowPayDocListDelete', '1070', '1002', '1', 'O', 'Two_Classify', 'Two_Classify', 'String', NULL, '二级分类', NULL, '1', 'Text', '1', '1', NULL, NULL, 'style=\"white-space: pre-wrap;\"', '150', '0', '0', '0', '0', '0', 0, NULL, NULL, NULL, 'SYS_Designer', '2017/05/15 09:24:29', '8006U00000002', '2019/01/14 14:37:30', '0', NULL, '0', NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('FlowPayDocListDelete', '1080', '1080', '1', 'O', 'Id', 'Id', 'String', NULL, 'id主键', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '32', '0', '0', '0', '0', '0', 0, NULL, NULL, NULL, 'SYS_Designer', '2017/05/15 09:24:29', '8006U00000002', '2019/01/14 14:37:30', '0', NULL, '0', NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('FlowPayDocListDelete', '1090', '1042', '1', NULL, '\'\'', 'operation', 'String', NULL, '操作', NULL, '1', 'Text', '1', '2', NULL, NULL, 'style={width:50px;}', NULL, '1', '1', '0', '0', '0', 0, NULL, NULL, NULL, 'SYS_Designer', '2017/05/15 09:24:29', '8006U00000002', '2019/01/14 14:37:30', '0', NULL, '1', NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('FlowPayDocListDelete', '1100', '1100', '1', NULL, 'com.tenwa.doc.cache.DocListCache.getDeleteFile(Id)', 'filelist', 'String', NULL, '附件清单', NULL, '1', 'Text', '1', '1', NULL, NULL, 'style={width:600px;word-break:break-all;}', NULL, '1', '1', '0', '0', '0', 0, NULL, NULL, NULL, 'SYS_Designer', '2017/05/15 09:24:29', '8006U00000002', '2019/01/14 14:37:30', '0', NULL, '1', NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('FlowPayDocListDelete', '1120', '1120', '1', 'O', 'DOC_CLASS_ITEMNO', 'DOC_CLASS_ITEMNO', 'String', NULL, '资料分类编号', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '32', '0', '0', '0', '1', '0', 0, NULL, NULL, NULL, 'SYS_Designer', '2017/05/15 19:23:18', '8006U00000002', '2019/01/14 14:37:30', '0', NULL, '1', NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('FlowPayDocListDelete', '1122', '1122', '1', 'rela', 'OBJECTTYPE', 'OBJECTTYPE', 'String', NULL, '对象类别', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '32', '0', '0', '0', '1', '0', 0, NULL, NULL, NULL, 'SYS_Designer', '2017/05/31 11:32:06', '8006U00000002', '2019/01/14 14:37:30', '0', NULL, '1', NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('FlowPayDocListDelete', '1140', '1041', '1', 'O', 'BUSINESS_CHECK', 'BUSINESS_CHECK', 'String', '', '业务检查', '', '1', 'Select', '1', '1', 'Code', 'DocCheck', 'style={width:60px}', '32', '1', '0', '0', '0', '0', 0, '', '', '', 'SYS_Designer', '2017/05/18 11:38:08', 'SYS_Designer', '2019/01/15 14:39:27', '0', '', '1', '', '', '', '');
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java
index 03a5f9ea0..2ff8576c7 100644
--- a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java
+++ b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java
@@ -1179,6 +1179,7 @@ public class CollectAuditInfoCache {
 		blbo.setAttributeValue(LB_BUCKLE_LOG.inputorgid, "system");
 		blbo.setAttributeValue(LB_BUCKLE_LOG.inputtime, StringFunction.getTodayNow());
 		blbo.setAttributeValue(LB_BUCKLE_LOG.updatetime, System.currentTimeMillis());
+		blbo.setAttributeValue(LB_BUCKLE_LOG.deduction_type, "银联扣款");
 		blog.saveObject(blbo);
 	}
 	
diff --git a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCacheTj.java b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCacheTj.java
index a7eec50c5..0c93bb296 100644
--- a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCacheTj.java
+++ b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCacheTj.java
@@ -827,7 +827,6 @@ public class CollectAuditInfoCacheTj {
 			}
 		}
 		BizObjectManager bm = JBOFactory.getFactory().getManager(VI_LC_AUDIT_RENT_PLAN.CLASS_NAME);
-		BizObjectManager bc = JBOFactory.getFactory().getManager(LC_RENT_PLAN.CLASS_NAME);
 		//这里对天津与深圳的数据进行拆分
 		List<BizObject> bolist = bm.createQuery("select distinct O.contract_id,O.plan_date,O.id,ca.ACC_NUMBER,ca.ACCOUNT,ca.BANK_NAME,O.rent from O , jbo.app.tenwa.customer.CUSTOMER_ACCOUNT ca where O.contract_id=ca.contract_id and ca.acc_type = 'Debit' and O.id in ("+parms.toString()+")").getResultList(false);
 		if (bolist.size() != 0) {
@@ -1181,6 +1180,7 @@ public class CollectAuditInfoCacheTj {
 		blbo.setAttributeValue(LB_BUCKLE_LOG.inputorgid, "system");
 		blbo.setAttributeValue(LB_BUCKLE_LOG.inputtime, StringFunction.getTodayNow());
 		blbo.setAttributeValue(LB_BUCKLE_LOG.updatetime, System.currentTimeMillis());
+		blbo.setAttributeValue(LB_BUCKLE_LOG.deduction_type, "银联扣款");
 		blog.saveObject(blbo);
 	}
 	
@@ -1361,6 +1361,7 @@ public class CollectAuditInfoCacheTj {
         }
 		String req_sn = System.currentTimeMillis()+"";//当日批次号
 		batch_title = merchantNumber+"_"+flag+version+date+"_"+req_sn;
+		//请求报文(限额处理)
 		StringBuffer strbuff = collectBatch(req_sn,list);
 		//响应报文
 		String strResp = cp.CollectAuditPayReq(strbuff,file.getAbsolutePath(), batch_title);
@@ -1584,7 +1585,7 @@ public class CollectAuditInfoCacheTj {
 							.setParameter("id", planId).executeUpdate();
 							transj.commit();
 						}
-						
+
 					}
 					trans.commit();
 					trans_detail.setSN(sn);
diff --git a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditProcess.java b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditProcess.java
index 01796fb84..250c133ad 100644
--- a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditProcess.java
+++ b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditProcess.java
@@ -81,7 +81,7 @@ public class CollectAuditProcess {
 				//"D:\\BaiduNetdisk\\Download\\代收付系统接口文档和JAVA版测试demo及测试相关参数\\JAVA版测试DEMO及测试参数_20170825\\测试商户证书\\ORA@TEST1.p12";
 		String strMsg = strData.replaceAll("<SIGNED_MSG></SIGNED_MSG>", "");
 		//调用签名包签名接口(原文,私钥路径,密码)
-		String signedMsg = crypt.sign(strMsg, pathPfx, "123456");
+		String signedMsg = crypt.sign(strMsg, pathPfx, "cert@123456");
 		return  strData.replaceAll("<SIGNED_MSG></SIGNED_MSG>", "<SIGNED_MSG>"+signedMsg+"</SIGNED_MSG>");
 	}
 	
diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java
index c2ef49575..2facebcd2 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java
@@ -118,8 +118,12 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness {
 			}
 			String custName="";
 			String customerId = "";
-			if("cust_type.cust".equals(custType)){
-				if(this.getAttribute("operationType") != null && "BAIC_MOTOR".equals(this.getAttribute("operationType").toString())){
+			//cust_type.cust
+		if("cust_type.cust".equals(custType)){
+				BizObject distributorBo = JBOFactory.createBizObjectQuery(DISTRIBUTOR_INFO.CLASS_NAME,"orgid=:orgid").setParameter("orgid",deptid).getSingleResult(false);
+				String fiType = distributorBo.getAttribute("F_I_TYPE").toString();
+				if((this.getAttribute("operationType") != null && "BAIC_MOTOR".equals(this.getAttribute("operationType").toString()))
+						|| "f_i_type03".equals(fiType)){//自营店
 					distributoIid=this.getAttribute("distributorNo").toString();
 	    			vndrName=this.getAttribute("distributorName").toString();
 				}else{
@@ -190,7 +194,10 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness {
         		this.saveUnionLessee(bmLULT,tx,customerId,asUser);
 				this.saveBusinessStatus(bsbom, tx, asUser);//项目进度表
 			}else{
-				if(this.getAttribute("operationType") != null && "BAIC_MOTOR".equals(this.getAttribute("operationType").toString())){
+				BizObject distributorBo = JBOFactory.createBizObjectQuery(DISTRIBUTOR_INFO.CLASS_NAME,"orgid=:orgid").setParameter("orgid",deptid).getSingleResult(false);
+				String fiType = distributorBo.getAttribute("F_I_TYPE").toString();
+				if((this.getAttribute("operationType") != null && "BAIC_MOTOR".equals(this.getAttribute("operationType").toString()))
+					|| "f_i_type03".equals(fiType)){//自营店
 					distributoIid=this.getAttribute("distributorNo").toString();
 	    			vndrName=this.getAttribute("distributorName").toString();
 				}else{
diff --git a/src_tenwa/com/tenwa/lease/flow/rent/rentreback/VILCRentCollectHandler.java b/src_tenwa/com/tenwa/lease/flow/rent/rentreback/VILCRentCollectHandler.java
index 36c4a5eeb..b883411a1 100644
--- a/src_tenwa/com/tenwa/lease/flow/rent/rentreback/VILCRentCollectHandler.java
+++ b/src_tenwa/com/tenwa/lease/flow/rent/rentreback/VILCRentCollectHandler.java
@@ -14,11 +14,18 @@ public class VILCRentCollectHandler extends CommonHandler{
 	
 	@Override
 	protected void initDisplayForEdit(BizObject bo) throws Exception {
+
+		double penalty_num = bo.getAttribute("penalty_sum").getDouble();
+		double penalty = bo.getAttribute("penalty").getDouble();
+		double penalty_over =  penalty-penalty_num;
+		penalty_over = new BigDecimal(String.valueOf(penalty_over)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+		bo.setAttributeValue("penalty_over", penalty_over);
+		System.out.println(bo.getAttribute("contract_number").getString()+"    "+String.valueOf(penalty_over));
 		double rent_over = bo.getAttribute("rent_over").getDouble();
-		double penalty_over = bo.getAttribute("penalty_over").getDouble();
 		double back_rent =  rent_over+penalty_over;
 		back_rent = new BigDecimal(String.valueOf(back_rent)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
 		bo.setAttributeValue("back_rent", back_rent);
-		
+
+
 	}
 }