Merge branch 'develop' of http://git2.tenwa.com.cn/ApzlDev/apzl_leasing.git into zhouyh2

WebContent/Tenwa/Comm/DocList/DocListMain.jsp

@@ -40,7 +40,7 @@
 	var docList="<%=docList%>";
 	myleft.width=1;
 	if("SingleRow"=="<%=type%>"){
-		if("FundPaymentCarFlow"=="<%=sFlowNo%>"||"BusinessApplyFlow"=="<%=sFlowNo%>"||"MortgageFileFlow"=="<%=sFlowNo%>"||"ProjectCreditFlow"=="<%=sFlowNo%>"||"ContractSupportFlow"=="<%=sFlowNo%>"||"ProjectRecreditFlow"=="<%=sFlowNo%>"||"ProjectSupportFlow"=="<%=sFlowNo%>"||"ProjectApprovalFlow"=="<%=sFlowNo%>"||"FundPaymentFlow"=="<%=sFlowNo%>"){
+		if("FundPaymentCarFlow"=="<%=sFlowNo%>"||"BusinessApplyFlow"=="<%=sFlowNo%>"||"MortgageFileFlow"=="<%=sFlowNo%>"||"ProjectCreditFlow"=="<%=sFlowNo%>"||"ContractSupportFlow"=="<%=sFlowNo%>"||"ProjectRecreditFlow"=="<%=sFlowNo%>"||"ProjectSupportFlow"=="<%=sFlowNo%>"||"ProjectApprovalFlow"=="<%=sFlowNo%>"||"FundPaymentFlow"=="<%=sFlowNo%>"||"ProjectCancelFlow"=="<%=sFlowNo%>"){
 			AsControl.OpenView("/Tenwa/Comm/DocList/PayDocList.jsp","docList="+docList,"right","");
 		}else{
 			AsControl.OpenView("/Tenwa/Comm/DocList/BussinessApproveDocList.jsp","docList="+docList,"right","");

WebContent/Tenwa/Comm/DocList/PayDocList.jsp

@@ -43,7 +43,9 @@
     }
     
 	String compClientID = request.getParameter("CompClientID");
-
+	if("ProjectRecreditFlow".equals(sObjectType)){
+		sTempletNo = "FlowPayDocList" ;
+	}
 	Map<String,String> docParam=new HashMap<String,String>();
     Map<String,String> other=new HashMap<String,String>();
     other.put("carAttributes", carAttributes);

WebContent/Tenwa/Lease/voucher/voucherass_detail.jsp

@@ -37,11 +37,7 @@
 	function NCInterface(){
 		alert("´«Ê俪ʼ");
 		var mes = RunJavaMethodTrans("com.tenwa.voucher.serviceImp.VoucherSysJointNCServiceImpl","sendVoucherData","");
-		if("true"==mes){
-			alert("传输成功");
-		}else{
-			alert("传输失败");
-		}
+		alert("传输完成");
 	}
 
 	function synVoucherCode(){

src_core/com/tenwa/util/SerialNumberUtil.java

@@ -50,6 +50,10 @@ public class SerialNumberUtil {
 	public static synchronized String  getRentOutNoNumber(JBOTransaction tx) throws Exception{
 		return SerialNumberUtil.getSerialNumber("PR{year}{month}{maxOrderNumber}",4,null, "", null, tx);
 	}
+	
+	public static synchronized String  getVoucherPCNumber(JBOTransaction tx) throws Exception{
+		return   SerialNumberUtil.getSerialNumber("AP{year}{month}{day}-{maxOrderNumber}",3,null, "ƾ֤½Ó¿ÚÅú´Î", null, tx);
+	}
 	/**
 	 * ͨÁª´ú¿ÛÁ÷Ë®ºÅ
 	 * @param tx

src_core/com/tenwa/voucher/service/VoucherSysJointNCService.java

@@ -3,5 +3,5 @@ package com.tenwa.voucher.service;
 import com.amarsoft.are.jbo.JBOTransaction;
 
 public interface VoucherSysJointNCService {
-	public String sendVoucherData(JBOTransaction tx)throws Exception;
+	public void sendVoucherData(JBOTransaction tx)throws Exception;
 }