diff --git a/WebContent/Tenwa/Lease/Flow/AccountInfoChange/AccountChangeApprovalApplyList.jsp b/WebContent/Tenwa/Lease/Flow/AccountInfoChange/AccountChangeApprovalApplyList.jsp index ff4bf34aa..60cde55b7 100644 --- a/WebContent/Tenwa/Lease/Flow/AccountInfoChange/AccountChangeApprovalApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/AccountInfoChange/AccountChangeApprovalApplyList.jsp @@ -67,7 +67,7 @@ } else { - var mes=sReturnInfos[1]; + var mes=sReturnInfos[0]; alert(mes); } reloadSelf(); diff --git a/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp index 7074be9c3..030538b3a 100644 --- a/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp +++ b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp @@ -13,8 +13,9 @@ String phaseNo = CurPage.getParameter("PhaseNo"); String ProductId = CurPage.getParameter("ProductId"); String productid = Sqlca.getString("select PRODUCT_ID from LB_CONTRACT_INFO_TEMP where flowunid = '"+flowunid+"'"); - String gpsVendor = Sqlca.getString("select cl.itemname from PRD_SPECIFIC_LIBRARY psl left join code_library cl on cl.itemno=psl.GPS_VENDOR and cl.codeno='gpsVendor' where productid='"+ProductId+"'"); - + String projectId = CurPage.getParameter("ProjectId"); + String gpsVendor = Sqlca.getString("select cl.itemname from lb_project_info lpi left join LM_GPS_ORDER lgr on lgr.apply_no=lpi.project_no left join code_library cl on cl.itemno=lgr.source and cl.codeno='gpsVendor' where lpi.id='"+projectId+"'"); + String sTempletNo = "LB_CONTRACT_INFO_PAY";//--ģ-- ASObjectModel doTemp = new ASObjectModel(sTempletNo); diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index e7caeeec1..b7125f3e6 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -5841,7 +5841,7 @@ - + diff --git a/src/com/tenwa/app/manage/util/ContractSignActionTwoUtil.java b/src/com/tenwa/app/manage/util/ContractSignActionTwoUtil.java index c03f62513..79faf6f8e 100644 --- a/src/com/tenwa/app/manage/util/ContractSignActionTwoUtil.java +++ b/src/com/tenwa/app/manage/util/ContractSignActionTwoUtil.java @@ -346,9 +346,11 @@ public class ContractSignActionTwoUtil { sealStamper3.setOffsetY(-0.006); stampers.add(sealStamper3); }else{ - sealStamper.setKeyword("׷1£ "); - sealStamper.setOffsetX(-0.12); - sealStamper.setOffsetY(-0.04); +// sealStamper.setKeyword("׷1£ "); + sealStamper.setKeyword("׷2£"); + sealStamper.setOffsetX(-0.12); +// sealStamper.setOffsetY(-0.04); + sealStamper.setOffsetY(-0.13); //ӵڶλ Stamper sealStamper2 = new Stamper(); @@ -364,9 +366,11 @@ public class ContractSignActionTwoUtil { } stampers.add(sealStamper); } else { - sealStamper.setKeyword("׷2£"); - sealStamper.setOffsetX(-0.12); - sealStamper.setOffsetY(-0.13); + //sealStamper.setKeyword("׷2£"); + sealStamper.setKeyword("׷1£ "); + sealStamper.setOffsetX(-0.12); +// sealStamper.setOffsetY(-0.13); + sealStamper.setOffsetY(-0.04); stampers.add(sealStamper); } } diff --git a/src_jbo/jbo/com/tenwa/lease/carbrand/li_Passenger_car.java b/src_jbo/jbo/com/tenwa/lease/carbrand/li_Passenger_car.java index e13543b6c..a3d47d658 100644 --- a/src_jbo/jbo/com/tenwa/lease/carbrand/li_Passenger_car.java +++ b/src_jbo/jbo/com/tenwa/lease/carbrand/li_Passenger_car.java @@ -26,7 +26,7 @@ public interface li_Passenger_car{ */ public static final String cars = "cars"; /** - * STRING(32)
+ * STRING(200)
*/ public static final String models = "models"; /** diff --git a/src_sql/投产SQL/v20201022/tft_20201022.sql b/src_sql/投产SQL/v20201022/tft_20201022.sql index 901f106fb..912823e6d 100644 --- a/src_sql/投产SQL/v20201022/tft_20201022.sql +++ b/src_sql/投产SQL/v20201022/tft_20201022.sql @@ -68,6 +68,67 @@ Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualn -- ó͵޸models ֶγ Alter table li_passenger_car change models models varchar(200) CHARSET gbk COLLATE gbk_chinese_ci NULL COMMENT ''; +-- GPSбҳ +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 ('GpsProductInfoList','gpsƷIDϢб',null,'30020',null,'1','1','default','jbo.sys.GPS_PRODUCT_INFO','O','1=1','','','','','SYS_Designer','2020/11/11 09:44:14','SYS_Designer','2020/11/11 10:06:35','','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 ('GpsProductInfoList','1000','1000','1','O','ID','ID','String','','','','1','Text','1','1','','','','32','0','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/11/11 09:44:14','SYS_Designer','2020/11/11 10:06:35','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 ('GpsProductInfoList','1010','1010','1','O','WIRE_NUM','WIRE_NUM','String','','','','1','Text','1','1','','','','2','1','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/11/11 09:44:14','SYS_Designer','2020/11/11 10:06:35','','','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 ('GpsProductInfoList','1020','1020','1','O','WIRELESS_NUM','WIRELESS_NUM','String','','','','1','Text','1','1','','','','2','1','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/11/11 09:44:14','SYS_Designer','2020/11/11 10:06:35','','','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 ('GpsProductInfoList','1030','1030','1','O','YEAR','YEAR','String','','Ʒ','','1','Text','1','1','','','','2','1','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/11/11 09:44:14','SYS_Designer','2020/11/11 10:06:35','','','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 ('GpsProductInfoList','1040','1040','1','O','GPS_PRODUCT_ID','GPS_PRODUCT_ID','String','','ƷID','','1','Text','1','1','','','','50','1','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/11/11 09:44:14','SYS_Designer','2020/11/11 10:06:35','','','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 ('GpsProductInfoList','1050','1050','1','O','REMARK','REMARK','String','','ע','','1','Text','1','1','','','','250','1','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/11/11 09:44:14','SYS_Designer','2020/11/11 10:06:35','','','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 ('GpsProductInfoList','1060','1060','1','O','INPUTTIME','INPUTTIME','String','','¼ʱ','','1','Text','1','2','','','','32','0','0','0','1','0',1,'0','','','SYS_DESIGNER','2020/11/11 09:44:14','SYS_Designer','2020/11/11 10:06:35','0','','0','','','',''); +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 ('GpsProductInfoList','1070','1070','1','O','INPUTUSERID','INPUTUSERID','String','','¼','','1','Text','1','1','','','','32','0','0','0','1','0',1,'0','','','SYS_DESIGNER','2020/11/11 09:44:14','SYS_Designer','2020/11/11 10:06:35','','','0','','','',''); +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 ('GpsProductInfoList','1080','1080','1','O','INPUTORGID','INPUTORGID','String','','¼벿','','1','Text','1','1','','','','32','0','0','0','1','0',1,'0','','','SYS_DESIGNER','2020/11/11 09:44:14','SYS_Designer','2020/11/11 10:06:35','','','0','','','',''); +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 ('GpsProductInfoList','1090','1090','1','O','UPDATETIME','UPDATETIME','String','','޸ʱ','','1','Text','3','2','','','','32','0','0','0','1','0',1,'0','','','SYS_DESIGNER','2020/11/11 09:44:14','SYS_Designer','2020/11/11 10:06:35','0','','0','','','',''); +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 ('GpsProductInfoList','1100','1100','1','O','UPDATEUSERID','UPDATEUSERID','String','','޸','','1','Text','1','1','','','','32','0','0','0','1','0',1,'0','','','SYS_DESIGNER','2020/11/11 09:44:14','SYS_Designer','2020/11/11 10:06:35','','','0','','','',''); +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 ('GpsProductInfoList','1110','1110','1','O','UPDATEORGID','UPDATEORGID','String','','޸','','1','Text','1','1','','','','32','0','0','0','1','0',1,'0','','','SYS_DESIGNER','2020/11/11 09:44:14','SYS_Designer','2020/11/11 10:06:35','','','0','','','',''); + +-- GPSҳ +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 ('GpsProductInfoInfo','gpsƷIDϢ',null,'30020',null,'1','2','default','jbo.sys.GPS_PRODUCT_INFO','O','id=:id','','','com.amarsoft.awe.dw.handler.impl.CommonHandler',null,'SYS_Designer','2020/11/11 09:47:13','SYS_Designer','2020/11/11 10:03:56','','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 ('GpsProductInfoInfo','1000','1000','1','O','ID','ID','String','','','','1','Text','1','1','','','','32','0','0','0','1','1',1,'0','','','SYS_Designer','2020/11/11 09:47:13','SYS_Designer','2020/11/11 10:05: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 ('GpsProductInfoInfo','1010','1010','1','O','WIRE_NUM','WIRE_NUM','String','','','','1','Text','5','1','','','','2','1','0','1','1','1',1,'0','','','SYS_Designer','2020/11/11 09:47:13','SYS_Designer','2020/11/11 10:07:56','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 ('GpsProductInfoInfo','1020','1020','1','O','WIRELESS_NUM','WIRELESS_NUM','String','','','','1','Text','5','1','','','','2','1','0','1','1','1',1,'0','','','SYS_Designer','2020/11/11 09:47:13','SYS_Designer','2020/11/11 10:07:56','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 ('GpsProductInfoInfo','1030','1030','1','O','YEAR','YEAR','String','','Ʒ','','1','Text','5','1','','','','2','1','0','1','1','1',1,'0','','','SYS_Designer','2020/11/11 09:47:13','SYS_Designer','2020/11/11 10:07:56','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 ('GpsProductInfoInfo','1040','1040','1','O','GPS_PRODUCT_ID','GPS_PRODUCT_ID','String','','ƷID','','1','Text','1','1','','','','50','1','0','1','1','1',1,'0','','','SYS_Designer','2020/11/11 09:47:13','SYS_Designer','2020/11/11 10:06:02','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 ('GpsProductInfoInfo','1050','1050','1','O','REMARK','REMARK','String','','ע','','1','Textarea','1','1','','','','250','1','0','0','1','1',2,'0','','','SYS_Designer','2020/11/11 09:47:13','SYS_Designer','2020/11/11 10:06:02','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 ('GpsProductInfoInfo','1060','1060','1','O','INPUTTIME','INPUTTIME','String','','¼ʱ','','1','Text','1','2','','','','32','0','0','0','1','0',1,'0','','','SYS_Designer','2020/11/11 09:47:13','SYS_Designer','2020/11/11 10:03:57','0','','0','','','',''); +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 ('GpsProductInfoInfo','1070','1070','1','O','INPUTUSERID','INPUTUSERID','String','','¼','','1','Text','1','1','','','','32','0','0','0','1','0',1,'0','','','SYS_Designer','2020/11/11 09:47:13','SYS_Designer','2020/11/11 10:03:57','','','0','','','',''); +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 ('GpsProductInfoInfo','1080','1080','1','O','INPUTORGID','INPUTORGID','String','','¼벿','','1','Text','1','1','','','','32','0','0','0','1','0',1,'0','','','SYS_Designer','2020/11/11 09:47:13','SYS_Designer','2020/11/11 10:03:57','','','0','','','',''); +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 ('GpsProductInfoInfo','1090','1090','1','O','UPDATETIME','UPDATETIME','String','','޸ʱ','','1','Text','3','2','','','','32','0','0','0','1','0',1,'0','','','SYS_Designer','2020/11/11 09:47:13','SYS_Designer','2020/11/11 10:03:57','0','','0','','','',''); +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 ('GpsProductInfoInfo','1100','1100','1','O','UPDATEUSERID','UPDATEUSERID','String','','޸','','1','Text','1','1','','','','32','0','0','0','1','0',1,'0','','','SYS_Designer','2020/11/11 09:47:13','SYS_Designer','2020/11/11 10:03:57','','','0','','','',''); +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 ('GpsProductInfoInfo','1110','1110','1','O','UPDATEORGID','UPDATEORGID','String','','޸','','1','Text','1','1','','','','32','0','0','0','1','0',1,'0','','','SYS_Designer','2020/11/11 09:47:13','SYS_Designer','2020/11/11 10:03:57','','','0','','','',''); + +-- GPS˵ҳ +Insert Into AWE_MENU_INFO (menuid,menuname,displayname,sortno,url,urlparam,target,style,isinuse,remark,inputorgid,inputuserid,inputtime,updateorgid,updateuserid,updatetime,accesstype,icon,appicon) Values ('980230','GPSƷ','GPSƷ','980230','/Tenwa/Gps/GpsProduct/GpsProductInfoList.jsp','','_self','','1','',null,'SYS_Designer','2020/11/11 09:51:17',null,'SYS_Designer','2020/11/11 09:52:25','10','',''); +Insert Into AWE_Role_Menu (roleid,menuid) Values ('099','980230'); + + +-- GPSñ +CREATE TABLE gps_product_info ( + id varchar(32) NOT NULL COMMENT '', + wire_num varchar(2) DEFAULT NULL COMMENT '', + wireless_num varchar(2) DEFAULT NULL COMMENT '', + year varchar(2) DEFAULT NULL COMMENT 'Ʒ', + gps_product_id varchar(50) DEFAULT NULL COMMENT 'ƷID', + inputuserid varchar(32) DEFAULT NULL COMMENT 'Ǽ', + inputorgid varchar(32) DEFAULT NULL COMMENT 'Ǽǵλ', + inputtime varchar(20) DEFAULT NULL COMMENT 'Ǽʱ', + updateuserid varchar(32) DEFAULT NULL COMMENT '', + updateorgid varchar(32) DEFAULT NULL COMMENT 'Ǽǵλ', + updatetime varchar(20) DEFAULT NULL COMMENT 'ʱ', + remark varchar(250) DEFAULT NULL COMMENT 'ע', + PRIMARY KEY (id) +) ENGINE=InnoDB DEFAULT CHARSET=gbk COMMENT='gpsƷIDϢ'; + +-- ֧ҳƻѡ +delete from awe_do_library where dono='SplittingList' and colindex='1060'; +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 ('SplittingList','1060','1060','1','O','plan_date','plan_date','String','','ƻ','','1','Date','3','1','','','','20','1','0','0','1','1',1,'0','','','SYS_Designer','2019/12/05 14:58:43','SYS_Designer','2020/11/19 10:41:26','0','','1','','','','Area'); + +-- ͬGPSҳGPSӦ +delete from awe_do_library where dono='LmGpsOrderInfo' and colindex='1290'; +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 ('LmGpsOrderInfo','1290','1290','1','O','SOURCE','SOURCE','String','','GPSԴ','','1','Select','1','1','Code','gpsVendor','','10','1','1','0','1','0',0,'','0010','','SYS_Designer','2020/08/20 09:56:12','SYS_Designer','2020/11/23 15:29:15','0','','1','','','',''); + + -- ---------------ִ--------------------------------------- -- ͨ۶ŷֵ @@ -116,59 +177,9 @@ Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualn Insert Into CODE_CATALOG (codeno,sortno,codetypeone,codetypetwo,codename,codedescribe,codeattribute,inputuser,inputorg,inputtime,updateuser,updatetime,remark) Values ('f_i_type','34500900','','','','','','SYS_Designer',null,'2020/11/04 11:11:45','SYS_Designer','2020/11/04 11:11:45',''); Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescribe,itemattribute,relativecode,attribute1,attribute2,attribute3,attribute4,attribute5,attribute6,attribute7,attribute8,inputuser,inputorg,inputtime,updateuser,updatetime,remark,helptext) Values ('f_i_type','f_i_type03','Ӫ','','0030','1','','','','','','','','','','','','SYS_Designer',null,'2020/11/04 11:12:11','SYS_Designer','2020/11/04 11:12:11','',''); --- GPSñ -CREATE TABLE gps_product_info ( - id varchar(32) NOT NULL COMMENT '', - wire_num varchar(2) DEFAULT NULL COMMENT '', - wireless_num varchar(2) DEFAULT NULL COMMENT '', - year varchar(2) DEFAULT NULL COMMENT 'Ʒ', - gps_product_id varchar(50) DEFAULT NULL COMMENT 'ƷID', - inputuserid varchar(32) DEFAULT NULL COMMENT 'Ǽ', - inputorgid varchar(32) DEFAULT NULL COMMENT 'Ǽǵλ', - inputtime varchar(20) DEFAULT NULL COMMENT 'Ǽʱ', - updateuserid varchar(32) DEFAULT NULL COMMENT '', - updateorgid varchar(32) DEFAULT NULL COMMENT 'Ǽǵλ', - updatetime varchar(20) DEFAULT NULL COMMENT 'ʱ', - remark varchar(250) DEFAULT NULL COMMENT 'ע', - PRIMARY KEY (id) -) ENGINE=InnoDB DEFAULT CHARSET=gbk COMMENT='gpsƷIDϢ'; --- GPSбҳ -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 ('GpsProductInfoList','gpsƷIDϢб',null,'30020',null,'1','1','default','jbo.sys.GPS_PRODUCT_INFO','O','1=1','','','','','SYS_Designer','2020/11/11 09:44:14','SYS_Designer','2020/11/11 10:06:35','','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 ('GpsProductInfoList','1000','1000','1','O','ID','ID','String','','','','1','Text','1','1','','','','32','0','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/11/11 09:44:14','SYS_Designer','2020/11/11 10:06:35','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 ('GpsProductInfoList','1010','1010','1','O','WIRE_NUM','WIRE_NUM','String','','','','1','Text','1','1','','','','2','1','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/11/11 09:44:14','SYS_Designer','2020/11/11 10:06:35','','','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 ('GpsProductInfoList','1020','1020','1','O','WIRELESS_NUM','WIRELESS_NUM','String','','','','1','Text','1','1','','','','2','1','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/11/11 09:44:14','SYS_Designer','2020/11/11 10:06:35','','','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 ('GpsProductInfoList','1030','1030','1','O','YEAR','YEAR','String','','Ʒ','','1','Text','1','1','','','','2','1','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/11/11 09:44:14','SYS_Designer','2020/11/11 10:06:35','','','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 ('GpsProductInfoList','1040','1040','1','O','GPS_PRODUCT_ID','GPS_PRODUCT_ID','String','','ƷID','','1','Text','1','1','','','','50','1','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/11/11 09:44:14','SYS_Designer','2020/11/11 10:06:35','','','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 ('GpsProductInfoList','1050','1050','1','O','REMARK','REMARK','String','','ע','','1','Text','1','1','','','','250','1','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/11/11 09:44:14','SYS_Designer','2020/11/11 10:06:35','','','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 ('GpsProductInfoList','1060','1060','1','O','INPUTTIME','INPUTTIME','String','','¼ʱ','','1','Text','1','2','','','','32','0','0','0','1','0',1,'0','','','SYS_DESIGNER','2020/11/11 09:44:14','SYS_Designer','2020/11/11 10:06:35','0','','0','','','',''); -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 ('GpsProductInfoList','1070','1070','1','O','INPUTUSERID','INPUTUSERID','String','','¼','','1','Text','1','1','','','','32','0','0','0','1','0',1,'0','','','SYS_DESIGNER','2020/11/11 09:44:14','SYS_Designer','2020/11/11 10:06:35','','','0','','','',''); -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 ('GpsProductInfoList','1080','1080','1','O','INPUTORGID','INPUTORGID','String','','¼벿','','1','Text','1','1','','','','32','0','0','0','1','0',1,'0','','','SYS_DESIGNER','2020/11/11 09:44:14','SYS_Designer','2020/11/11 10:06:35','','','0','','','',''); -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 ('GpsProductInfoList','1090','1090','1','O','UPDATETIME','UPDATETIME','String','','޸ʱ','','1','Text','3','2','','','','32','0','0','0','1','0',1,'0','','','SYS_DESIGNER','2020/11/11 09:44:14','SYS_Designer','2020/11/11 10:06:35','0','','0','','','',''); -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 ('GpsProductInfoList','1100','1100','1','O','UPDATEUSERID','UPDATEUSERID','String','','޸','','1','Text','1','1','','','','32','0','0','0','1','0',1,'0','','','SYS_DESIGNER','2020/11/11 09:44:14','SYS_Designer','2020/11/11 10:06:35','','','0','','','',''); -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 ('GpsProductInfoList','1110','1110','1','O','UPDATEORGID','UPDATEORGID','String','','޸','','1','Text','1','1','','','','32','0','0','0','1','0',1,'0','','','SYS_DESIGNER','2020/11/11 09:44:14','SYS_Designer','2020/11/11 10:06:35','','','0','','','',''); - --- GPSҳ -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 ('GpsProductInfoInfo','gpsƷIDϢ',null,'30020',null,'1','2','default','jbo.sys.GPS_PRODUCT_INFO','O','id=:id','','','com.amarsoft.awe.dw.handler.impl.CommonHandler',null,'SYS_Designer','2020/11/11 09:47:13','SYS_Designer','2020/11/11 10:03:56','','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 ('GpsProductInfoInfo','1000','1000','1','O','ID','ID','String','','','','1','Text','1','1','','','','32','0','0','0','1','1',1,'0','','','SYS_Designer','2020/11/11 09:47:13','SYS_Designer','2020/11/11 10:05: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 ('GpsProductInfoInfo','1010','1010','1','O','WIRE_NUM','WIRE_NUM','String','','','','1','Text','5','1','','','','2','1','0','1','1','1',1,'0','','','SYS_Designer','2020/11/11 09:47:13','SYS_Designer','2020/11/11 10:07:56','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 ('GpsProductInfoInfo','1020','1020','1','O','WIRELESS_NUM','WIRELESS_NUM','String','','','','1','Text','5','1','','','','2','1','0','1','1','1',1,'0','','','SYS_Designer','2020/11/11 09:47:13','SYS_Designer','2020/11/11 10:07:56','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 ('GpsProductInfoInfo','1030','1030','1','O','YEAR','YEAR','String','','Ʒ','','1','Text','5','1','','','','2','1','0','1','1','1',1,'0','','','SYS_Designer','2020/11/11 09:47:13','SYS_Designer','2020/11/11 10:07:56','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 ('GpsProductInfoInfo','1040','1040','1','O','GPS_PRODUCT_ID','GPS_PRODUCT_ID','String','','ƷID','','1','Text','1','1','','','','50','1','0','1','1','1',1,'0','','','SYS_Designer','2020/11/11 09:47:13','SYS_Designer','2020/11/11 10:06:02','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 ('GpsProductInfoInfo','1050','1050','1','O','REMARK','REMARK','String','','ע','','1','Textarea','1','1','','','','250','1','0','0','1','1',2,'0','','','SYS_Designer','2020/11/11 09:47:13','SYS_Designer','2020/11/11 10:06:02','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 ('GpsProductInfoInfo','1060','1060','1','O','INPUTTIME','INPUTTIME','String','','¼ʱ','','1','Text','1','2','','','','32','0','0','0','1','0',1,'0','','','SYS_Designer','2020/11/11 09:47:13','SYS_Designer','2020/11/11 10:03:57','0','','0','','','',''); -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 ('GpsProductInfoInfo','1070','1070','1','O','INPUTUSERID','INPUTUSERID','String','','¼','','1','Text','1','1','','','','32','0','0','0','1','0',1,'0','','','SYS_Designer','2020/11/11 09:47:13','SYS_Designer','2020/11/11 10:03:57','','','0','','','',''); -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 ('GpsProductInfoInfo','1080','1080','1','O','INPUTORGID','INPUTORGID','String','','¼벿','','1','Text','1','1','','','','32','0','0','0','1','0',1,'0','','','SYS_Designer','2020/11/11 09:47:13','SYS_Designer','2020/11/11 10:03:57','','','0','','','',''); -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 ('GpsProductInfoInfo','1090','1090','1','O','UPDATETIME','UPDATETIME','String','','޸ʱ','','1','Text','3','2','','','','32','0','0','0','1','0',1,'0','','','SYS_Designer','2020/11/11 09:47:13','SYS_Designer','2020/11/11 10:03:57','0','','0','','','',''); -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 ('GpsProductInfoInfo','1100','1100','1','O','UPDATEUSERID','UPDATEUSERID','String','','޸','','1','Text','1','1','','','','32','0','0','0','1','0',1,'0','','','SYS_Designer','2020/11/11 09:47:13','SYS_Designer','2020/11/11 10:03:57','','','0','','','',''); -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 ('GpsProductInfoInfo','1110','1110','1','O','UPDATEORGID','UPDATEORGID','String','','޸','','1','Text','1','1','','','','32','0','0','0','1','0',1,'0','','','SYS_Designer','2020/11/11 09:47:13','SYS_Designer','2020/11/11 10:03:57','','','0','','','',''); - --- GPS˵ҳ -Insert Into AWE_MENU_INFO (menuid,menuname,displayname,sortno,url,urlparam,target,style,isinuse,remark,inputorgid,inputuserid,inputtime,updateorgid,updateuserid,updatetime,accesstype,icon,appicon) Values ('980230','GPSƷ','GPSƷ','980230','/Tenwa/Gps/GpsProduct/GpsProductInfoList.jsp','','_self','','1','',null,'SYS_Designer','2020/11/11 09:51:17',null,'SYS_Designer','2020/11/11 09:52:25','10','',''); -Insert Into AWE_Role_Menu (roleid,menuid) Values ('099','980230'); - - - - +-- տʾڿ۵ +delete from AWE_DO_CATALOG where dono='VILCRentPlanList'; +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 ('VILCRentPlanList','ƻͼ',null,'30120',null,'1','1','default','jbo.loan.VI_RENT_COLLECT_4_EBANK','O left join jbo.com.tenwa.lease.comm.LB_EQUIPMENT_CAR lec on O.contract_id=lec.contract_id and lec.car_attribute=''head'' left join jbo.com.tenwa.lease.comm.LB_CAR_LICENSE_PLATE_INFO lcl on lec.contract_id=lcl.contract_id and lec.frame_number=lcl.frame_number','O.businesstype=:businessType and O.subjectid=:subjectId and v.DATE_FORMAT(O.plan_date,''%Y%m'') <= v.DATE_FORMAT(v.SYSDATE(),''%Y%m'') and rent_over>0','','','com.tenwa.flow.rent.rentincome.VILCRentPlanListHandler',null,'SYS_Designer','2017/06/04 20:29:52','SYS_Designer','2020/11/18 10:15:22','','1',''); diff --git a/src_tenwa/quartz/ContractInfoForOverdue.java b/src_tenwa/quartz/ContractInfoForOverdue.java index 639671dd0..3eeae8a7e 100644 --- a/src_tenwa/quartz/ContractInfoForOverdue.java +++ b/src_tenwa/quartz/ContractInfoForOverdue.java @@ -68,7 +68,10 @@ public class ContractInfoForOverdue implements Job{ //ֹڵִжζʱظ String sql1 = "SELECT business_status,contract_number,inputtime FROM business_status WHERE business_status='64' AND contract_number='"+contractNumber+"' AND LEFT(inputtime,10)=DATE_FORMAT(SYSDATE(), '%Y/%m/%d')"; List> list2 = DataOperatorUtil.getDataBySql(tx, sql1, null); - if(list2.size()==0){ + //ͬѾǰͲٸ״̬ + String sql3 = "SELECT id FROM lb_contract_info WHERE id='"+contractId+"' and CONTRACT_STATUS='100' "; + List> list3 = DataOperatorUtil.getDataBySql(tx, sql1, null); + if(list2.size()==0 && list3.size()==0 ){ SaveBusinessStatus.saveByContractId(contractId, tx, "64", jboName.getUserId(arg0, tx)); }