1.本方账户添加互斥。

2.实际付款明细合同号取消链接。
3.产品配置GPS安装配添加金额限定和是否只读。
4.jbo_lease.xml中合同正式/临时/历史表添加LENDING_TYPE

WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp

@@ -68,8 +68,19 @@
 <%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=Info06;Describe=定义按钮事件-;]~*/%>
 <script type="text/javascript">
 /*~[Describe=保存记录;InputParam=无;OutPutParam=无;]~*/
-	function saveRecord(){	 	
-		as_save("myiframe0","parent.AsDialog.ClosePage()");
+	function saveRecord(){
+	debugger;
+		var accountType = getItemValue(0, 0, "account_type");
+		var accType = getItemValue(0, 0, "acc_type");
+		var state = getItemValue(0, 0, "state_");
+		var FbSdk = getItemValue(0,0,"FbSdk");
+		var sParams = "accountType="+accountType+",accType="+accType+",state="+state+",FbSdk="+FbSdk;
+		var sReturn = RunJavaMethodTrans("com.tenwa.reckon.copydata.CalcRentCompare", "compare",sParams );
+		if(sReturn=="null"||(sReturn=="notNull"&&state!="0010")||(sReturn=="notNull"&&state=="0010"&&FbSdk!="Y")){
+			as_save("myiframe0","parent.AsDialog.ClosePage()");
+		}else{
+			alert("启用状态下的账户账号类型已存在，请检查！");
+		} 
 	}
 	
 	//请选择出租人

WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentCarTempList.jsp

@@ -105,7 +105,7 @@
 		setColRequired();
 	})
 	function afterSearch(){
-		var rows = getRowCount(0);
+		/* var rows = getRowCount(0);
 		for(var i=0;i<rows;i++){
 			var CONTRACT_ID = getItemValue(0,i,"CONTRACT_ID");
 			var result = RunJavaMethodTrans("com.tenwa.flow.fund.fundcollection.FundIncomeMethod","getContactId","CONTRACT_ID="+CONTRACT_ID);
@@ -114,7 +114,7 @@
 			sPars=result.split("@"); //×Ö·û·Ö¸î 
 			sRun = "<a style='color:blue;font-size:15px;font-family:ËÎÌå;' onclick='opeTrigger("+ps+")'>" +sPars[1]+ "</a>";
 			getObj(0,i,"CONTRACT_ID").innerHTML = sRun;
-		}		
+		}	 */	
 	}
 	function createFundIncomeExcel(){
 		var rows = getCheckedRows(0);

WebContent/WEB-INF/etc/jbo/jbo_lease.xml

@@ -715,6 +715,7 @@
 				<attribute name="BUSINESSTYPE" label="业务类型" type="STRING" length="64"/>
 				<attribute name="AREA_CODE" label="车牌号对应所在区号" type="STRING" length="32"/>
 				<attribute name="CAR_TYPE" label="车辆类型" type="STRING" length="64"/>
+				<attribute name="LENDING_TYPE" label="保单放款方法" type="STRING" length="10"/>
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -951,6 +952,7 @@
 				<attribute name="BUSINESSTYPE" label="业务类型" type="STRING" length="64"/>
 				<attribute name="AREA_CODE" label="车牌号对应所在区号" type="STRING" length="32"/>
 				<attribute name="CAR_TYPE" label="车辆类型" type="STRING" length="64"/>
+				<attribute name="LENDING_TYPE" label="保单放款方法" type="STRING" length="10"/>
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -2596,6 +2598,10 @@
 				<attribute name="CONTRACT_INVOICE_STATUS" label="合同开票状态" type="STRING" length="32"/>
 				<attribute name="VERSIONID" label="版本号" type="STRING" length="64"/>
 				<attribute name="distributor_id" label="distributor_id" type="STRING" length="32"/>
+				<attribute name="BUSINESSTYPE" label="业务类型" type="STRING" length="64"/>
+				<attribute name="AREA_CODE" label="车牌号对应所在区号" type="STRING" length="32"/>
+				<attribute name="CAR_TYPE" label="车辆类型" type="STRING" length="64"/>
+				<attribute name="LENDING_TYPE" label="保单放款方法" type="STRING" length="10"/>
 			</attributes>
 			<manager>
 				<managerProperties>

calc/com/tenwa/reckon/copydata/CalcRentCompare.java

@@ -1,9 +1,19 @@
 package com.tenwa.reckon.copydata;
 
+import jbo.com.tenwa.entity.comm.own.OWN_ACCOUNT;
+
 import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.JBOException;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.are.jbo.JBOTransaction;
 import com.tenwa.comm.util.jboutil.BizObjectCompare;
 
 public class CalcRentCompare implements BizObjectCompare{
+	private String accountType;
+	private String accType;
+	private String state;
+	private String FbSdk;
+
 
 	@Override
 	public boolean ObjectCompare(BizObject cObject, BizObject toObject)
@@ -13,5 +23,39 @@ public class CalcRentCompare implements BizObjectCompare{
 		}
 		return false;
 	}
+	
+	public String getAccountType() {
+		return accountType;
+	}
+	public void setAccountType(String accountType) {
+		this.accountType = accountType;
+	}
+	public String getAccType() {
+		return accType;
+	}
+	public void setAccType(String accType) {
+		this.accType = accType;
+	}
+	public String getState() {
+		return state;
+	}
+	public void setState(String state) {
+		this.state = state;
+	}
+	public String getFbSdk() {
+		return FbSdk;
+	}
+	public void setFbSdk(String fbSdk) {
+		FbSdk = fbSdk;
+	}
+	public String compare(JBOTransaction tx) throws JBOException{
+		String sql ="select * from O where O.state_='0010' and O.ACC_TYPE=:accType and ACCOUNT_TYPE=:accountType and FbSdk='Y'";
+		BizObject bo = JBOFactory.createBizObjectQuery(OWN_ACCOUNT.CLASS_NAME,sql)
+				.setParameter("accType", accType).setParameter("accountType", accountType).getSingleResult(false);
+		if(bo==null||"".equals(bo)){
+			return "null";
+		}
+		return "notNull";
+	}
 
 }