From a10f463f47de0990ca1b10867bce87915aa81f14 Mon Sep 17 00:00:00 2001
From: tangfutang <tangft@tenwa.com.cn>
Date: Wed, 9 Sep 2020 14:21:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=9F=E8=B5=81=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=AD=97=E6=AE=B5=E5=8F=AA=E8=AF=BB=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Comm/LBEquipment_Car/LBEquipmentInfo.jsp   | 14 +++++++-------
 .../project/businessapply/CustomerAction.java  | 18 ++++++++++++++++++
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp
index 5a12f1bae..cbac1c636 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp
@@ -77,9 +77,9 @@
 		sTempletNo = "LBEquipmentInfoTemp_Query";//--模板号--
 	}
 	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
-	if(null!=ishistory&&ishistory.equals("true")&&(!"起租后合同基本信息变更（汽车）".equals(flowName))){
+	//if(null!=ishistory&&ishistory.equals("true")&&(!"起租后合同基本信息变更（汽车）".equals(flowName))){
 // 		 doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataInfoHistory");//如果是历史则新显示历史数据
-	}
+	//}
 	doTemp.setDefaultValue("equip_type", sEquipType);
 	CurPage.getCurComp().setAttribute("RightType", null);
 	doTemp.setHtmlEvent("FRAME_NUMBER", "onChange", "checkFrameNumber");//校验车架号格式
@@ -101,7 +101,7 @@
 	/* if(("业务申请流程".equals(flowName)||"业务变更流程".equals(flowName))&& !"ReadOnly".equals(rightType)){
 		falg ="true";
 	} */
-	if(("合同制作流程".equals(flowName)||"合同变更流程".equals(flowName)||"起租后合同基本信息变更（汽车）".equals(flowName))&&(!RightType.equals("ReadOnly"))){
+	/* if(("合同制作流程".equals(flowName)||"合同变更流程".equals(flowName)||"起租后合同基本信息变更（汽车）".equals(flowName))&&(!RightType.equals("ReadOnly"))){
 		//falg ="true";
 		doTemp.setReadOnly("",true);//设置所有字段都只读。
 		doTemp.setReadOnly("FRAME_NUMBER",false);
@@ -120,8 +120,8 @@
 		doTemp.setColInnerBtEvent("BRAND", "");
 		doTemp.setColInnerBtEvent("CAR_SERIES", "");
 		doTemp.setColInnerBtEvent("MODEL", "");
-		doTemp.setColInnerBtEvent("zone", "");
-	}
+		doTemp.setColInnerBtEvent("zone", ""); 
+	}*/
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
 	dwTemp.Style = "2";//freeform
 	if(((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true")))&&!("合同变更流程".equals(flowName))){
@@ -183,7 +183,7 @@
 			setItemRequired(0,"FRAME_NUMBER",true);
 			setItemRequired(0,"CAR_COLOUR",true);
 			setItemRequired(0,"ENGINE_NUMBER",true);
-			 setItemReadOnly(0,0,"MEMO",false);
+			 setItemReadOnly(0,0,"MEMO",false); 
 			//第一车贷产品其他配置说明为必填 
 		<%--	if("DYCD"=="<%=operationType%>"){
 				setItemRequired(0,"MEMO",true);
@@ -310,7 +310,7 @@
 		var sParam = "FlowUnid="+"<%=sFlowUnid%>"+"&TempletNo="+"<%=sListTempletNo%>";
 		var righttype="<%=RightType%>";
 		if(righttype=="ReadOnly"){sParam=sParam+"&RightType=<%=RightType%>";}	
-		sParam=sParam+"&IsHistory=<%=ishistory%>&NodeNo=<%=nodeNo%>&TaskNo=<%=taskno%>&InfoTempletNo=<%=sInfoTempletNo%>&EquipType=<%=sEquipType%>";
+		sParam=sParam+"&IsHistory=<%=ishistory%>&NodeNo=<%=nodeNo%>&TaskNo=<%=taskno%>&InfoTempletNo=<%=sInfoTempletNo%>&EquipType=<%=sEquipType%>&carAttributes=<%=carAttributes%>";
 		AsControl.OpenView(sUrl,sParam,"_self","");
 	}
 	
diff --git a/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerAction.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerAction.java
index 96caa3ae2..b6ed59905 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerAction.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerAction.java
@@ -268,6 +268,13 @@ public class CustomerAction {
 		   }
 		   while(rs0.next()){
 			   number0 = rs0.getInt("numbe0");
+		   }
+		   //关闭事务
+		   try {
+			   Sqlca.commit();
+			   Sqlca.disConnect();
+		   } catch (JBOException e) {
+			
 		   }
 		   if(number >= num){
 			   return "单一承租人融资车辆数量不得超过"+num+"台!";
@@ -312,6 +319,11 @@ public class CustomerAction {
 		   while(rs0.next()){
 			   number0 = rs0.getInt("numbe0");
 		   }
+		   try {
+			   Sqlca.commit();
+			   Sqlca.disConnect();
+		   } catch (Exception e) {
+		   }
 		   if((number + newnum) >= num){
 			   return "单一承租人融资车辆数量不得超过"+num+"台!";
 		   }else if((number + number0 + newnum) >= num0){
@@ -341,6 +353,12 @@ public class CustomerAction {
 		if(bo != null){
 			equipAmts = bo.getAttribute("equip_amts").toString();
 		}
+		//关闭事务
+		try {
+			Sqlca.commit();
+			Sqlca.disConnect();
+		} catch (Exception e) {
+		}
 		return equipAmts;
 	}