From 9ee0889e0f3861e357568b125b343b14686d01d1 Mon Sep 17 00:00:00 2001
From: tangft <32189@DESKTOP-M6TAG3K>
Date: Fri, 25 Jan 2019 15:48:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E8=BD=A6=E8=B4=A7=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E5=9C=A8=E5=90=88=E5=90=8C=E5=88=B6=E4=BD=9C=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E6=97=B6=E5=BF=85=E9=A1=BB=E5=A1=AB=E5=86=99?=
 =?UTF-8?q?=E7=A7=9F=E8=B5=81=E7=89=A9=E4=B8=AD=E7=9A=84=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Lease/Flow/Comm/LBContractTemplate/contract_template.jsp   | 2 +-
 .../Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp  | 1 +
 .../tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java    | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp
index d4b0fa2ad..469d04d56 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp
@@ -280,7 +280,7 @@
 				return;
 			}
 		}
-		var message = RunJavaMethodTrans("com.tenwa.app.baseFileTemplate.handle.FileTemplateUtil","CheckCar","contractId="+"<%=sContractId%>"+",templateIds="+tempids+",flowunid="+"<%=flowunid%>");
+		var message = RunJavaMethodTrans("com.tenwa.app.baseFileTemplate.handle.FileTemplateUtil","CheckCar","contractId="+"<%=sContractId%>"+",templateIds="+tempids+",flowunid="+"<%=flowunid%>"+",operationType="+"<%=CurPage.getParameter("operationType")%>");
 		if(""!=message){
 			if("01"=="<%=customertype%>"){
 				if(message.indexOf("请先删除后再生成")>0){
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp
index 9e5d84992..de209fe74 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp
@@ -168,6 +168,7 @@
 			setItemRequired(0,"FRAME_NUMBER",true);
 			setItemRequired(0,"CAR_COLOUR",true);
 			setItemRequired(0,"ENGINE_NUMBER",true);
+			setItemReadOnly(0,0,"MEMO",false);
 			//第一车贷产品其他配置说明为必填 
 			if("DYCD"=="<%=operationType%>"){
 				setItemRequired(0,"MEMO",true);
diff --git a/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java b/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java
index bb8a457bf..aa9c45772 100644
--- a/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java
+++ b/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java
@@ -231,6 +231,9 @@ public class FileTemplateUtil {
 			if(lrc.getAttribute("ENGINE_NUMBER").toString().length()==0){
 				message = message+ "发动机号、";
 			}
+			if("DYCD".equals(operationType)&&lrc.getAttribute("MEMO").toString().length()==0){
+				message = message+ "其他配置说明、";
+			}
 		}
 		if(message.length()>0){
 			return "请先填写："+message.substring(0,message.length() - 1)+"!";