diff --git a/WebContent/Tenwa/Lease/App/Interface/VehicleEvaluation/LBEquipmentCarTempInfo.jsp b/WebContent/Tenwa/Lease/App/Interface/VehicleEvaluation/LBEquipmentCarTempInfo.jsp
index 4716f552b..3b2626897 100644
--- a/WebContent/Tenwa/Lease/App/Interface/VehicleEvaluation/LBEquipmentCarTempInfo.jsp
+++ b/WebContent/Tenwa/Lease/App/Interface/VehicleEvaluation/LBEquipmentCarTempInfo.jsp
@@ -24,8 +24,9 @@
%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
<%/*~END~*/%>
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentList.jsp
index 3de1769ad..40e657208 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentList.jsp
@@ -176,16 +176,22 @@ if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.
/*~[Describe=新增记录;InputParam=无;OutPutParam=无;]~*/
function newRecord(){
var countNumber = getRowCount(0);
- if(countNumber<2){
+ if(Number(countNumber)<2){
//判断是否承租人租赁车辆数量
var res0=RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerAction","checkGuaranteeCarByCertid",'certid=<%=certid%>'+',flowunid=<%=sFlowUnid%>');
if(res0 != "0"){
alert(res0);
}
var sUrl = "/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp";
- var sParam = "FlowUnid="+"<%=sFlowUnid%>"+"&ListTempletNo="+"<%=sTempletNo%>&TaskNo=<%=taskno%>&InfoTempletNo=<%=sInfoTempletNo%>&EquipType=<%=sEquipType%>";
- AsControl.OpenView(sUrl,sParam,"_self","");
- }else{
+ var sParam = 'FlowUnid='+'<%=sFlowUnid%>'+"&ListTempletNo="+"<%=sTempletNo%>";
+ var righttype="<%=RightType%>";
+ if(righttype=="ReadOnly"){sParam=sParam+"&RightType=<%=RightType%>";}
+ sParam=sParam+"&IsHistory=<%=ishistory%>&NodeNo=<%=nodeNo%>&InfoTempletNo=<%=sInfoTempletNo%>&EquipType=<%=sEquipType%>";
+ //添加参数
+ sParam=sParam+"&ProjectNo=<%=ProjectNo%>&ProjectId=<%=projectId%>&ApplyType=<%=ApplyType%>&FlowName=<%=flowName%>&ContractId=<%=contractid%>&ShowType=<%=showtype%>&operationType=<%=operationType%>&carAttributes=<%=carAttributes%>";
+
+ AsControl.OpenView(sUrl,sParam,"_self","");
+ } else {
alert("租赁物信息最多只能有两个!");
}
diff --git a/src_sql/鎶曚骇SQL/v20200915/tft_20200915.sql b/src_sql/鎶曚骇SQL/v20200915/tft_20200915.sql
index f5c028e0a..3aaa3ca1a 100644
--- a/src_sql/鎶曚骇SQL/v20200915/tft_20200915.sql
+++ b/src_sql/鎶曚骇SQL/v20200915/tft_20200915.sql
@@ -122,21 +122,81 @@ INSERT INTO CODE_LIBRARY (CODENO, ITEMNO, ITEMNAME, BANKNO, SORTNO, ISINUSE, ITE
delete from PRD_NODEINFO where nodeid='11291' and nodename='租赁车辆基本信息';
insert into `PRD_NODEINFO` (`nodeid`, `nodename`, `sortno`, `isinuse`, `itemdescribe`, `inputuserid`, `inputorgid`, `inputtime`, `updateuserid`, `updatetime`, `initscript`, `exportscript`, `phasescript`, `deletescript`, `remark`, `formalClass`, `querycondition`) values('11291','租赁车辆基本信息','11291','1','/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentList.jsp','admin','80009000200010001','2018/01/31','administrator','2020/08/31',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+-- 租赁列表模板修改
+DELETE FROM AWE_DO_CATALOG WHERE dono='LBEquipmentListTemp_Cars';
+Insert Into AWE_DO_CATALOG (dono,doname,dodescribe,dotype,doclass,isinuse,colcount,modeid,jboclass,jbofrom,jbowhere,jbogroup,jboorder,businessprocess,exportflag,inputuser,inputtime,updateuser,updatetime,remark,isvalidate,parent) Values ('LBEquipmentListTemp_Cars','租赁物件临时表列表',null,'30030',null,'1','1','default','jbo.com.tenwa.lease.comm.LB_EQUIPMENT_CAR_TEMP','O','O.FLOWUNID=:FlowUnid','','INPUTTIME','',null,'SYS_Designer','2017/05/23 09:16:03','SYS_Designer','2020/09/07 17:17:36','','1','');
+
DELETE FROM awe_do_library WHERE dono='LBEquipmentListTemp_Cars' AND colindex='0040';
INSERT INTO awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) VALUES ('LBEquipmentListTemp_Cars','0040','0040','1','O','DEVICE_TYPE','DEVICE_TYPE','String','','车辆类型','','1','Text','1','1','Code','equipType_Car','','30','0','0','0','1','0',0,'','','','SYS_Designer','2018/06/11 19:57:55','SYS_Designer','2020/08/31 21:56:21','0','','1','','','','');
-
-DELETE FROM AWE_DO_CATALOG WHERE dono='LBEquipmentInfoTemp_Cars' AND doname='租赁物件临时表信息';
+-- 修改租赁物详情页面模板
+DELETE FROM AWE_DO_CATALOG WHERE dono='LBEquipmentInfoTemp_Cars';
Insert Into AWE_DO_CATALOG (dono,doname,dodescribe,dotype,doclass,isinuse,colcount,modeid,jboclass,jbofrom,jbowhere,jbogroup,jboorder,businessprocess,exportflag,inputuser,inputtime,updateuser,updatetime,remark,isvalidate,parent) Values ('LBEquipmentInfoTemp_Cars','租赁物件临时表信息',null,'30030',null,'1','2','default','jbo.com.tenwa.lease.comm.LB_EQUIPMENT_CAR_TEMP','O','ID=:id','','','com.amarsoft.awe.dw.handler.impl.CommonHandler',null,'SYS_Designer','2017/05/23 09:23:48','SYS_Designer','2020/08/31 21:44:47','','1','');
-
-DELETE FROM awe_do_library WHERE dono='LBEquipmentInfoTemp_Cars' AND colindex='1022';
-INSERT INTO awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) VALUES ('LBEquipmentInfoTemp_Cars','1022','1022','1','O','BRAND','BRAND','String','','品牌','','1','Text','1','1','','','','30','1','1','1','1','0',0,'0','0010','','SYS_DESIGNER','2017/10/19 12:04:17','SYS_Designer','2020/09/03 10:23:42','0','','1','','','','');
-DELETE FROM awe_do_library WHERE dono='LBEquipmentInfoTemp_Cars' AND colindex='1023';
-INSERT INTO awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) VALUES ('LBEquipmentInfoTemp_Cars','1023','1023','1','O','car_series','car_series','String','','车系','','1','Text','1','1','','','','80','1','1','1','1','0',0,'','0010','','SYS_Designer','2018/03/12 14:50:55','SYS_Designer','2020/09/03 10:35:10','0','','1','','','','');
-DELETE FROM awe_do_library WHERE dono='LBEquipmentInfoTemp_Cars' AND colindex='1024';
-INSERT INTO awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) VALUES ('LBEquipmentInfoTemp_Cars','1024','1024','1','O','MODEL','MODEL','String','','型号','','1','Text','1','1','','','','200','1','1','1','1','0',1,'0','0010','','SYS_Designer','2017/05/23 09:23:48','SYS_Designer','2020/09/03 10:35:26','0','','1','','','','');
+DELETE FROM awe_do_library WHERE dono='LBEquipmentInfoTemp_Cars';
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1000','1000','1','O','ID','ID','String','','标识','','1','Text','1','1','','','','32','0','0','0','1','0',1,'0','','','SYS_Designer','2017/05/23 09:23:48','SYS_Designer','2020/08/31 21:44:47','0','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1010','1010','1','O','PROJECT_ID','PROJECT_ID','String','','项目编号','','1','Text','1','1','','','','32','0','0','0','1','0',1,'0','0010','','SYS_Designer','2017/05/23 09:23:48','SYS_Designer','2020/08/31 21:44:47','0','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1015','1015','1','O','CITYID','CITYID','String','','城市','','1','Text','1','1','Code','','','32','0','0','0','1','0',0,'','0010','','SYS_Designer','2017/12/05 09:48:59','SYS_Designer','2020/08/31 21:44:47','0','','1','','','getselectProvinceAndCity()','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1020','1020','1','O','CONTRACT_ID','CONTRACT_ID','String','','合同编号','','1','Text','1','1','','','','32','0','0','0','1','0',1,'0','0010','','SYS_Designer','2017/05/23 09:23:48','SYS_Designer','2020/08/31 21:44:47','0','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1021','1021','1','O','CITYNAME','CITYNAME','String','','城市名称','','1','Text','1','1','','','','32','0','0','0','1','0',0,'','0010','','SYS_Designer','2017/12/05 11:38:21','SYS_Designer','2020/08/31 21:44:47','0','','1','','','getselectProvinceAndCity()','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1022','1022','1','O','BRAND','BRAND','String','','品牌','','1','Text','1','1','','','','30','1','1','1','1','0',0,'0','0010','','SYS_DESIGNER','2017/10/19 12:04:17','SYS_Designer','2020/09/03 10:23:42','0','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1023','1023','1','O','car_series','car_series','String','','车系','','1','Text','1','1','','','','80','1','1','1','1','0',0,'','0010','','SYS_Designer','2018/03/12 14:50:55','SYS_Designer','2020/09/03 10:35:10','0','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1024','1024','1','O','MODEL','MODEL','String','','型号','','1','Text','1','1','','','','200','1','1','1','1','0',1,'0','0010','','SYS_Designer','2017/05/23 09:23:48','SYS_Designer','2020/09/03 10:35:26','0','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1030','1030','1','O','DEVICE_TYPE','DEVICE_TYPE','String','','车辆类型','','1','Text','1','1','','','','30','1','0','0','1','0',1,'0','0010','','SYS_Designer','2017/05/23 09:23:48','SYS_Designer','2020/09/08 10:33:38','0','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1070','1075','1','O','EQUIP_NUM','EQUIP_NUM','String','','数量','','1','Text','5','1','','','','30','0','0','0','1','1',1,'0','0010','','SYS_Designer','2017/05/23 09:23:48','SYS_Designer','2020/08/31 21:44:47','0','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1081','1081','1','O','FRAME_NUMBER2','FRAME_NUMBER2','String','','挂车车架号','','1','Text','1','1','','','','100','0','0','0','1','0',0,'','0010','','SYS_Designer','2020/03/12 13:54:39','SYS_Designer','2020/09/08 11:21:09','0','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1091','1091','1','O','FRAME_BRAND','FRAME_BRAND','String','','挂车品牌','','1','Text','1','1','','','','100','0','0','0','1','0',0,'','0010','','SYS_Designer','2020/03/12 13:54:39','SYS_Designer','2020/09/08 11:21:09','0','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1093','1093','1','O','FRAME_COLOR','FRAME_COLOR','String','','挂车颜色','','1','Text','1','1','','','','100','0','0','0','1','0',0,'','0010','','SYS_Designer','2020/03/12 13:54:39','SYS_Designer','2020/09/08 11:21:10','0','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1130','1100','1','O','VNDR_NAME','VNDR_NAME','String','','经销商/SP','','1','Text','1','1','','','','200','1','1','0','1','0',1,'0','0010','','SYS_Designer','2017/05/23 09:23:48','SYS_Designer','2020/08/31 21:44:48','0','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1132','1095','1','O','MANUFACTURER_NAME','MANUFACTURER_NAME','String','','生产商','','1','Text','1','1','','','','200','1','0','0','1','0',1,'0','0010','','SYS_Designer','2017/05/23 09:23:48','SYS_Designer','2020/08/31 21:44:48','0','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1210','1265','1','O','MEMO','MEMO','String','','其他配置说明','','1','Textarea','1','1','','','style={height:120px; width:895px}','1000','1','0','0','1','0',2,'0','0010','','SYS_Designer','2017/05/23 09:23:49','SYS_Designer','2020/08/31 21:44:48','0','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1220','1220','1','O','IS_FLOW','IS_FLOW','String','','是否在流程中','','1','Text','1','1','','','','32','0','0','0','1','0',1,'0','0010','','SYS_Designer','2017/05/23 09:23:48','SYS_Designer','2020/08/31 21:44:48','0','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1230','1230','1','O','STATUS','STATUS','String','','状态','','1','Text','1','1','','','','32','0','0','0','1','0',1,'0','0010','','SYS_Designer','2017/05/23 09:23:49','SYS_Designer','2020/08/31 21:44:48','0','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1240','1240','1','O','FLOWUNID','FLOWUNID','String','','流程编号','','1','Text','1','1','','','','32','0','0','0','1','0',1,'0','0010','','SYS_Designer','2017/05/23 09:23:49','SYS_Designer','2020/08/31 21:44:48','0','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1250','1250','1','O','DATA_STATE','DATA_STATE','String','','数据状态','','1','Text','1','1','','','','32','0','0','0','1','0',1,'0','0010','','SYS_Designer','2017/05/23 09:23:49','SYS_Designer','2020/08/31 21:44:48','0','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1262','1262','1','O','zone','zone','String','','上牌地区','','1','Text','1','1','','','','32','1','0','1','1','0',0,'','0010','','SYS_Designer','2018/07/13 10:28:47','SYS_Designer','2020/08/31 21:44:48','0','','1','','','selectRegionCode()','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1270','1270','1','O','INPUTUSERID','INPUTUSERID','String','','登记人','','1','Text','1','1','','','','32','0','0','0','1','0',1,'0','0010','','SYS_Designer','2017/05/23 09:23:49','SYS_Designer','2020/08/31 21:44:48','0','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1275','1275','1','O','INPUTORGID','INPUTORGID','String','','登记部门','','1','Text','1','1','','','','32','0','0','0','1','0',1,'0','0010','','SYS_Designer','2017/05/23 09:23:49','SYS_Designer','2020/08/31 21:44:48','0','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1280','1280','1','O','INPUTTIME','INPUTTIME','String','','登记时间','','1','Text','1','1','','','','32','0','0','0','1','0',1,'0','0010','','SYS_Designer','2017/05/23 09:23:49','SYS_Designer','2020/08/31 21:44:48','0','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1290','1290','1','O','UPDATEUSERID','UPDATEUSERID','String','','更新人','','1','Text','1','1','','','','32','0','0','0','1','0',1,'0','0010','','SYS_Designer','2017/05/23 09:23:49','SYS_Designer','2020/08/31 21:44:48','0','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1300','1300','1','O','UPDATEORGID','UPDATEORGID','String','','更新部门','','1','Text','1','1','','','','32','0','0','0','1','0',1,'0','0010','','SYS_Designer','2017/05/23 09:23:49','SYS_Designer','2020/08/31 21:44:48','0','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1310','1310','1','O','UPDATETIME','UPDATETIME','String','','更新时间','','1','Text','1','1','','','','32','0','0','0','1','0',1,'0','0010','','SYS_Designer','2017/05/23 09:23:49','SYS_Designer','2020/08/31 21:44:48','0','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1320','1080','1','O','FRAME_NUMBER','FRAME_NUMBER','String','','车架号','','1','Text','1','1','','','','100','1','0','0','1','0',0,'','0010','','SYS_Designer','2017/05/23 09:27:21','SYS_Designer','2020/08/31 21:44:47','0','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1324','1320','1','O','EQUIP_TYPE','EQUIP_TYPE','String','','租赁物类型','','1','Text','1','1','','','','32','0','0','0','1','0',0,'','','','SYS_Designer','2017/05/23 14:10:39','SYS_Designer','2020/08/31 21:44:48','0','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1330','1090','1','O','ENGINE_NUMBER','ENGINE_NUMBER','String','','发动机号','','1','Text','1','1','','','','100','1','0','0','1','0',0,'','0010','','SYS_Designer','2017/05/23 09:27:21','SYS_Designer','2020/08/31 21:44:47','0','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1331','1031','1','O','NOW_TOTAL','NOW_TOTAL','String','','新车指导价','元','1','Text','2','1','','','','30','1','1','0','1','0',0,'','0010','','SYS_Designer','2017/07/19 11:34:54','SYS_Designer','2020/08/31 21:44:47','0','','1','','元','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1333','1255','1','O','LICENSE_PLATE_NUMBER','LICENSE_PLATE_NUMBER','String','','车牌号码','','1','Text','1','1','','','','32','1','0','0','1','0',0,'','0010','','SYS_Designer','2017/07/21 11:42:50','SYS_Designer','2020/08/31 21:44:48','','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1335','1070','1','O','DRIVE_TYPE','DRIVE_TYPE','String','','驱动形式','','1','Text','1','1','','','','100','1','0','0','1','0',0,'','0010','','SYS_Designer','2017/07/11 17:55:53','SYS_Designer','2020/08/31 21:44:47','','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1339','1261','1','O','regDate','regDate','String','','上牌日期','','1','Date','3','1','','','','32','1','0','1','1','0',0,'','0010','','SYS_Designer','2018/07/04 14:22:41','SYS_Designer','2020/08/31 21:44:48','0','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1340','1260','1','O','EXPIRYDATE','EXPIRYDATE','String','','年检有效期','','1','Date','1','1','','','','32','1','0','0','1','0',0,'','0010','','SYS_Designer','2017/07/21 11:37:36','SYS_Designer','2020/08/31 21:44:48','','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1342','1092','1','O','CAR_COLOUR','CAR_COLOUR','String','','车辆颜色','','1','Text','1','1','','','','32','1','0','0','1','0',0,'','0010','','SYS_Designer','2017/07/11 17:43:44','SYS_Designer','2020/08/31 21:44:47','','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1349','1034','1','O','gears','gears','String','','档位','','1','Text','1','1','','','','80','1','0','0','1','0',0,'','0010','','SYS_Designer','2018/03/12 14:50:55','SYS_Designer','2020/08/31 21:44:47','0','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1350','1263','1','O','mile','mile','String','','里程数(万公里)','','1','Text','2','1','','','','32','1','0','1','1','0',0,'','0010','','SYS_Designer','2018/07/11 12:02:00','SYS_Designer','2020/08/31 21:44:48','0','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1353','1050','1','O','DISPLACEMENT','DISPLACEMENT','String','','排量','','1','Text','1','1','','','','32','1','0','0','1','0',0,'','0010','','SYS_Designer','2017/07/11 17:43:44','SYS_Designer','2020/08/31 21:44:47','0','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1400','1400','1','O','retainfield1','retainfield1','String','','保留字段1','','1','Text','1','1','','','','100','0','0','0','1','0',0,'','','','SYS_Designer','2019/01/14 16:27:27','SYS_Designer','2020/08/31 21:44:48','0','','1','','','','');
+Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1480','1480','1','O','modelId','modelId','String','','车型ID','','1','Text','1','1','','','','32','0','0','0','1','0',0,'','','','SYS_Designer','2020/01/06 10:40:56','SYS_Designer','2020/08/31 21:44:48','0','','1','','','','');
+Insert Into AWE_DO_Group (dono,dockid,dockname,inputuser,inputtime,updateuser,updatetime,inputorg,sortno,grouphead,groupfoot,groupbody,colcount,styleid,isexpand,groupbody1,groupbody2) Values ('LBEquipmentInfoTemp_Cars','0010','租赁物明细','SYS_Designer','2017/05/23 09:23:49','SYS_Designer','2020/08/31 21:44:48','','0010','','','',2,'','','','');
+-- 修改历史数据车辆类型名称
+UPDATE LB_EQUIPMENT_CAR_TEMP SET DEVICE_TYPE='轿车' WHERE DEVICE_TYPE='1';
+UPDATE LB_EQUIPMENT_CAR_TEMP SET DEVICE_TYPE='越野车' WHERE DEVICE_TYPE='2';
+UPDATE LB_EQUIPMENT_CAR_TEMP SET DEVICE_TYPE='MPV' WHERE DEVICE_TYPE='3';
+UPDATE LB_EQUIPMENT_CAR_TEMP SET DEVICE_TYPE='其他' WHERE DEVICE_TYPE='4';
+
+UPDATE LB_EQUIPMENT_CAR SET DEVICE_TYPE='轿车' WHERE DEVICE_TYPE='1';
+UPDATE LB_EQUIPMENT_CAR SET DEVICE_TYPE='越野车' WHERE DEVICE_TYPE='2';
+UPDATE LB_EQUIPMENT_CAR SET DEVICE_TYPE='MPV' WHERE DEVICE_TYPE='3';
+UPDATE LB_EQUIPMENT_CAR SET DEVICE_TYPE='其他' WHERE DEVICE_TYPE='4';
+
+UPDATE LB_EQUIPMENT_CAR_HIS SET DEVICE_TYPE='轿车' WHERE DEVICE_TYPE='1';
+UPDATE LB_EQUIPMENT_CAR_HIS SET DEVICE_TYPE='越野车' WHERE DEVICE_TYPE='2';
+UPDATE LB_EQUIPMENT_CAR_HIS SET DEVICE_TYPE='MPV' WHERE DEVICE_TYPE='3';
+UPDATE LB_EQUIPMENT_CAR_HIS SET DEVICE_TYPE='其他' WHERE DEVICE_TYPE='4';
+
+-- 修改商务条件年利率显示
+DELETE FROM awe_do_library WHERE dono='LoanSimulationBasicInfo' AND colindex='0032';
+INSERT INTO awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) VALUES ('LoanSimulationBasicInfo','0032','0131','1','O','YEAR_RATE','YEAR_RATE','String','','测算年利率','%','1','Text','16','1','','','',NULL,'1','0','0','1','0',0,'','cal_info','','SYS_Designer','2017/06/26 11:44:43','SYS_Designer','2020/09/01 18:12:36','0','','1','','','','');
+
diff --git a/src_tenwa/com/tenwa/lease/app/vehicleAssessment/vehicleAssessmentController.java b/src_tenwa/com/tenwa/lease/app/vehicleAssessment/vehicleAssessmentController.java
index c49ba2dca..e6cfab54a 100644
--- a/src_tenwa/com/tenwa/lease/app/vehicleAssessment/vehicleAssessmentController.java
+++ b/src_tenwa/com/tenwa/lease/app/vehicleAssessment/vehicleAssessmentController.java
@@ -27,6 +27,7 @@ import com.tenwa.lease.util.VehicleAppraisementUtil;
public class vehicleAssessmentController {
private String FlowUnid;
+ private String id;
private Logger logger = Logger.getLogger(this.getClass());
@@ -39,12 +40,20 @@ public class vehicleAssessmentController {
FlowUnid = flowUnid;
}
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
public String vehicleAppraisement(JBOTransaction tx){
try {
BizObjectManager bomLSNT = JBOFactory.getBizObjectManager(LB_EQUIPMENT_CAR_TEMP.CLASS_NAME,tx);
BizObjectManager codeSNT = JBOFactory.getBizObjectManager(CODE_LIBRARY.CLASS_NAME,tx);
if(bomLSNT != null){
- BizObject boLSNT = bomLSNT.createQuery("flowunid=:FLOWUNID").setParameter("FLOWUNID",FlowUnid).getSingleResult(true);
+ BizObject boLSNT = bomLSNT.createQuery("id=:id").setParameter("id",id).getSingleResult(true);
//获取车型ID
String modelId = boLSNT.getAttribute("modelId").getString();
//获取用户选择的所属地区