diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp index 96405bf59..a782902b8 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp @@ -200,7 +200,7 @@ } var carAttribute = getItemValue(0,0,"car_attribute"); if("head" != carAttribute){ - setItemRequired(0,"FRAME_NUMBER",false); + //setItemRequired(0,"FRAME_NUMBER",false); setItemRequired(0,"CAR_COLOUR",false); setItemRequired(0,"ENGINE_NUMBER",false); } diff --git a/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java b/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java index aa68f81ff..7ad42f7ea 100644 --- a/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java +++ b/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java @@ -284,6 +284,10 @@ public class FileTemplateUtil { if(message.length()>0){ return "请先填写:"+message.substring(0,message.length() - 1)+"!"; } + BizObject carTail = lrct.createQuery("FLOWUNID=:flowunid and car_attribute='tail' and ( FRAME_NUMBER is null or FRAME_NUMBER='' )").setParameter("flowunid", flowunid).getSingleResult(false); + if(carTail!=null){ + return "请先填写:租赁物对应的车架号!"; + } String docName=""; String[] bfids = templateIds.split("&"); BizObjectManager btManager = JBOFactory.getBizObjectManager(BF_TEMPLATE.CLASS_NAME);