diff --git a/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp b/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp
index 1213efe59..25fc03300 100644
--- a/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp
+++ b/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp
@@ -39,7 +39,7 @@
String ros = "true";
if("业务申请分担".equals(soft)){
ros = "false";
- doTemp.appendJboWhere(" O.flow_name='业务申请流程' and O.PHASENAME='信审初审'");
+ doTemp.appendJboWhere(" (O.flow_name='业务申请流程' or O.flow_name='业务变更流程') and O.PHASENAME='信审初审'");
};
if("付款业务分担".equals(soft)){
ros = "false";
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp
index 37add180e..c117dfe68 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp
@@ -83,8 +83,6 @@
CurPage.getCurComp().setAttribute("RightType", null);
doTemp.setHtmlEvent("FRAME_NUMBER", "onChange", "checkFrameNumber");//校验车架号格式
doTemp.setHtmlEvent("FRAME_NUMBER2", "onChange", "checkFrameNumber2");//校验车架号格式
- //doTemp.setHtmlEvent("FRAME_NUMBER3", "onChange", "checkFrameNumber3");//校验车架号格式
- //doTemp.setHtmlEvent("FRAME_NUMBER4", "onChange", "checkFrameNumber4");//校验车架号格式
/* doTemp.setHtmlEvent("BRAND", "onChange", "selectCarType");
if((null!=RightType&& !RightType.equals("ReadOnly"))||(null!=ishistory&& !ishistory.equals("true"))){
@@ -508,79 +506,15 @@
}
}
- function checkFrameNumber3(){
- var vin = getItemValue(0,getRow(0),"FRAME_NUMBER3");
- if((typeof(vin) == "undefined" || vin == "")){
- setErrorTips("FRAME_NUMBER3","");
- return true;
- }
- var projectId = "<%=projectId%>";
- var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.BusinessApproveManager","checkCarNumber","projectId="+projectId+",plate_number="+vin);
- if("EROOR"==sResult){
- setErrorTips("FRAME_NUMBER3","车架号已存在!");
- return false;
- }
- if (!getCheckCode(vin)){
- setErrorTips("FRAME_NUMBER3","车架号格式有误！");
- return false;
- }else{
- setErrorTips("FRAME_NUMBER3","");
- return true;
- }
-
- }
- function checkFrameNumber4(){
- var vin = getItemValue(0,getRow(0),"FRAME_NUMBER4");
- if((typeof(vin) == "undefined" || vin == "")){
- setErrorTips("FRAME_NUMBER4","");
- return true;
- }
- var projectId = "<%=projectId%>";
- var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.BusinessApproveManager","checkCarNumber","projectId="+projectId+",plate_number="+vin);
- if("EROOR"==sResult){
- setErrorTips("FRAME_NUMBER4","车架号已存在!");
- return false;
- }
- if (!getCheckCode(vin)){
- setErrorTips("FRAME_NUMBER4","车架号格式有误！");
- return false;
- }else{
- setErrorTips("FRAME_NUMBER4","");
- return true;
- }
-
- }
+
//校验重复
function checkRepeat(){
var vin = getItemValue(0,getRow(0),"FRAME_NUMBER");
var vin2 = getItemValue(0,getRow(0),"FRAME_NUMBER2");
- var vin3 = getItemValue(0,getRow(0),"FRAME_NUMBER3");
- var vin4 = getItemValue(0,getRow(0),"FRAME_NUMBER4");
if((typeof(vin) != "undefined" && vin != "")){
if( vin==vin2 ){
alert("车架号1和车架号2重复");
return false;
- }else if( vin==vin3 ){
- alert("车架号1和车架号3重复");
- return false;
- }else if( vin==vin4 ){
- alert("车架号1和车架号4重复");
- return false;
- }
- }
- if((typeof(vin2) != "undefined" && vin2 != "")){
- if( vin2==vin3 ){
- alert("车架号2和车架号3重复");
- return false;
- }else if( vin2==vin4 ){
- alert("车架号2和车架号4重复");
- return false;
- }
- }
- if((typeof(vin3) != "undefined" && vin3 != "")){
- if( vin3==vin4 ){
- alert("车架号3和车架号4重复");
- return false;
}
}
return true;
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_app.xml b/WebContent/WEB-INF/etc/jbo/jbo_app.xml
index d359a8b24..e4ba33394 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_app.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_app.xml
@@ -4437,9 +4437,9 @@
-
-
-
+
+
+
@@ -4549,9 +4549,9 @@
-
-
-
+
+
+
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
index 2fcc83888..3b103656c 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
@@ -1445,9 +1445,9 @@
-
-
-
+
+
+
@@ -2015,9 +2015,9 @@
-
-
-
+
+
+
@@ -3525,9 +3525,9 @@
-
-
-
+
+
+
diff --git a/src_jbo/jbo/app/LB_EQUIPMENT_CAR.java b/src_jbo/jbo/app/LB_EQUIPMENT_CAR.java
index 2906f35af..163470176 100644
--- a/src_jbo/jbo/app/LB_EQUIPMENT_CAR.java
+++ b/src_jbo/jbo/app/LB_EQUIPMENT_CAR.java
@@ -146,17 +146,17 @@ public interface LB_EQUIPMENT_CAR{
*/
public static final String FRAME_NUMBER = "FRAME_NUMBER";
/**
- * 车架号2 STRING(100)
+ * 挂车车架号 STRING(100)
*/
public static final String FRAME_NUMBER2 = "FRAME_NUMBER2";
/**
- * 车架号3 STRING(100)
+ * 挂车品牌 STRING(100)
*/
- public static final String FRAME_NUMBER3 = "FRAME_NUMBER3";
+ public static final String FRAME_BRAND = "FRAME_BRAND";
/**
- * 车架号4 STRING(100)
+ * 挂车颜色 STRING(100)
*/
- public static final String FRAME_NUMBER4 = "FRAME_NUMBER4";
+ public static final String FRAME_COLOR = "FRAME_COLOR";
/**
* 发动机号 STRING(100)
*/
diff --git a/src_jbo/jbo/app/LB_EQUIPMENT_CAR_TEMP.java b/src_jbo/jbo/app/LB_EQUIPMENT_CAR_TEMP.java
index d195a1e29..8e86eeb79 100644
--- a/src_jbo/jbo/app/LB_EQUIPMENT_CAR_TEMP.java
+++ b/src_jbo/jbo/app/LB_EQUIPMENT_CAR_TEMP.java
@@ -146,17 +146,17 @@ public interface LB_EQUIPMENT_CAR_TEMP{
*/
public static final String FRAME_NUMBER = "FRAME_NUMBER";
/**
- * 车架号2 STRING(100)
+ * 挂车车架号 STRING(100)
*/
public static final String FRAME_NUMBER2 = "FRAME_NUMBER2";
/**
- * 车架号3 STRING(100)
+ * 挂车品牌 STRING(100)
*/
- public static final String FRAME_NUMBER3 = "FRAME_NUMBER3";
+ public static final String FRAME_BRAND = "FRAME_BRAND";
/**
- * 车架号4 STRING(100)
+ * 挂车颜色 STRING(100)
*/
- public static final String FRAME_NUMBER4 = "FRAME_NUMBER4";
+ public static final String FRAME_COLOR = "FRAME_COLOR";
/**
* 发动机号 STRING(100)
*/
diff --git a/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR.java b/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR.java
index 098b2cf26..440179e74 100644
--- a/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR.java
+++ b/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR.java
@@ -142,17 +142,17 @@ public interface LB_EQUIPMENT_CAR{
*/
public static final String FRAME_NUMBER = "FRAME_NUMBER";
/**
- * 车架号2 STRING(100)
+ * 挂车车架号 STRING(100)
*/
public static final String FRAME_NUMBER2 = "FRAME_NUMBER2";
/**
- * 车架号3 STRING(100)
+ * 挂车品牌 STRING(100)
*/
- public static final String FRAME_NUMBER3 = "FRAME_NUMBER3";
+ public static final String FRAME_BRAND = "FRAME_BRAND";
/**
- * 车架号4 STRING(100)
+ * 挂车颜色 STRING(100)
*/
- public static final String FRAME_NUMBER4 = "FRAME_NUMBER4";
+ public static final String FRAME_COLOR = "FRAME_COLOR";
/**
* 发动机号 STRING(100)
*/
diff --git a/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_HIS.java b/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_HIS.java
index d6ec4a4b0..f00966e3a 100644
--- a/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_HIS.java
+++ b/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_HIS.java
@@ -146,17 +146,17 @@ public interface LB_EQUIPMENT_CAR_HIS{
*/
public static final String FRAME_NUMBER = "FRAME_NUMBER";
/**
- * 车架号2 STRING(100)
+ * 挂车车架号 STRING(100)
*/
public static final String FRAME_NUMBER2 = "FRAME_NUMBER2";
/**
- * 车架号3 STRING(100)
+ * 挂车品牌 STRING(100)
*/
- public static final String FRAME_NUMBER3 = "FRAME_NUMBER3";
+ public static final String FRAME_BRAND = "FRAME_BRAND";
/**
- * 车架号4 STRING(100)
+ * 挂车颜色 STRING(100)
*/
- public static final String FRAME_NUMBER4 = "FRAME_NUMBER4";
+ public static final String FRAME_COLOR = "FRAME_COLOR";
/**
* 发动机号 STRING(100)
*/
diff --git a/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_TEMP.java b/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_TEMP.java
index e05f7aa5a..05bae9f21 100644
--- a/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_TEMP.java
+++ b/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_TEMP.java
@@ -146,17 +146,17 @@ public interface LB_EQUIPMENT_CAR_TEMP{
*/
public static final String FRAME_NUMBER = "FRAME_NUMBER";
/**
- * 车架号2 STRING(100)
+ * 挂车车架号 STRING(100)
*/
public static final String FRAME_NUMBER2 = "FRAME_NUMBER2";
/**
- * 车架号3 STRING(100)
+ * 挂车品牌 STRING(100)
*/
- public static final String FRAME_NUMBER3 = "FRAME_NUMBER3";
+ public static final String FRAME_BRAND = "FRAME_BRAND";
/**
- * 车架号4 STRING(100)
+ * 挂车颜色 STRING(100)
*/
- public static final String FRAME_NUMBER4 = "FRAME_NUMBER4";
+ public static final String FRAME_COLOR = "FRAME_COLOR";
/**
* 发动机号 STRING(100)
*/
diff --git a/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql b/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql
index 2deac043d..393ead24c 100644
--- a/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql
+++ b/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql
@@ -1,14 +1,14 @@
-- 在租赁物表中添加车架号字段
-ALTER TABLE lb_equipment_car ADD COLUMN FRAME_NUMBER2 VARCHAR(100) NULL COMMENT '车架号2' AFTER FRAME_NUMBER, ADD COLUMN FRAME_NUMBER3 VARCHAR(100) NULL COMMENT '车架号3' AFTER FRAME_NUMBER2, ADD COLUMN FRAME_NUMBER4 VARCHAR(100) NULL COMMENT '车架号4' AFTER FRAME_NUMBER3;
-ALTER TABLE lb_equipment_car_temp ADD COLUMN FRAME_NUMBER2 VARCHAR(100) NULL COMMENT '车架号2' AFTER FRAME_NUMBER, ADD COLUMN FRAME_NUMBER3 VARCHAR(100) NULL COMMENT '车架号3' AFTER FRAME_NUMBER2, ADD COLUMN FRAME_NUMBER4 VARCHAR(100) NULL COMMENT '车架号4' AFTER FRAME_NUMBER3;
-ALTER TABLE lb_equipment_car_his ADD COLUMN FRAME_NUMBER2 VARCHAR(100) NULL COMMENT '车架号2' AFTER FRAME_NUMBER, ADD COLUMN FRAME_NUMBER3 VARCHAR(100) NULL COMMENT '车架号3' AFTER FRAME_NUMBER2, ADD COLUMN FRAME_NUMBER4 VARCHAR(100) NULL COMMENT '车架号4' AFTER FRAME_NUMBER3;
+ALTER TABLE lb_equipment_car ADD COLUMN FRAME_NUMBER2 VARCHAR(100) NULL COMMENT '挂车车架号' AFTER FRAME_NUMBER, ADD COLUMN FRAME_BRAND VARCHAR(50) NULL COMMENT '挂车品牌' AFTER FRAME_NUMBER2, ADD COLUMN FRAME_COLOR VARCHAR(20) NULL COMMENT '挂车颜色' AFTER FRAME_BRAND;
+ALTER TABLE lb_equipment_car_his ADD COLUMN FRAME_NUMBER2 VARCHAR(100) NULL COMMENT '挂车车架号' AFTER FRAME_NUMBER, ADD COLUMN FRAME_BRAND VARCHAR(50) NULL COMMENT '挂车品牌' AFTER FRAME_NUMBER2, ADD COLUMN FRAME_COLOR VARCHAR(20) NULL COMMENT '挂车颜色' AFTER FRAME_BRAND;
+ALTER TABLE lb_equipment_car_temp ADD COLUMN FRAME_NUMBER2 VARCHAR(100) NULL COMMENT '挂车车架号' AFTER FRAME_NUMBER, ADD COLUMN FRAME_BRAND VARCHAR(50) NULL COMMENT '挂车品牌' AFTER FRAME_NUMBER2, ADD COLUMN FRAME_COLOR VARCHAR(20) NULL COMMENT '挂车颜色' AFTER FRAME_BRAND;
-- 模板添加字段
-delete from awe_do_library where dono='LBEquipmentInfoTemp_Cars' and colindex='1081';
-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','1','0','0','1','0',0,'','0010','','SYS_Designer','2020/03/12 13:54:39','SYS_Designer','2020/04/17 16:34:48','0','','1','','','','');
-delete from awe_do_library where dono='LBEquipmentInfoTemp_Cars' and colindex='1082';
-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','1082','1082','1','O','FRAME_NUMBER3','FRAME_NUMBER3','String','','挂车车架号2','','1','Text','1','1','','','','100','0','0','0','1','0',0,'','0010','','SYS_Designer','2020/03/12 13:54:39','SYS_Designer','2020/04/17 16:34:48','','','1','','','','');
-delete from awe_do_library where dono='LBEquipmentInfoTemp_Cars' and colindex='1083';
-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','1083','1083','1','O','FRAME_NUMBER4','FRAME_NUMBER4','String','','挂车车架号3','','1','Text','1','1','','','','100','0','0','0','1','0',0,'','0010','','SYS_Designer','2020/03/12 13:54:39','SYS_Designer','2020/04/17 16:34:48','','','1','','','','');
+DELETE FROM awe_do_library WHERE dono='LBEquipmentInfoTemp_Cars' AND colindex='1081';
+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','1','0','0','1','0',0,'','0010','','SYS_Designer','2020/03/12 13:54:39','SYS_Designer','2020/04/17 16:34:48','0','','1','','','','');
+DELETE FROM awe_do_library WHERE dono='LBEquipmentInfoTemp_Cars' AND colindex='1082';
+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','1082','1082','1','O','FRAME_BRAND','FRAME_BRAND','String','','挂车品牌','','1','Text','1','1','','','','100','1','0','0','1','0',0,'','0010','','SYS_Designer','2020/03/12 13:54:39','SYS_Designer','2020/04/22 16:01:19','0','','1','','','','');
+DELETE FROM awe_do_library WHERE dono='LBEquipmentInfoTemp_Cars' AND colindex='1083';
+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','1083','1083','1','O','FRAME_COLOR','FRAME_COLOR','String','','挂车颜色','','1','Text','1','1','','','','100','1','0','0','1','0',0,'','0010','','SYS_Designer','2020/03/12 13:54:39','SYS_Designer','2020/04/22 16:01:19','0','','1','','','','');
-- 创建业务申请初审记录表
CREATE TABLE business_apply_userinfo (
@@ -272,17 +272,8 @@ Insert Into AWE_MENU_INFO (menuid,menuname,displayname,sortno,url,urlparam,targe
Insert Into AWE_Role_Menu (roleid,menuid) Values ('099','9600100313');
--- 客户张磊修改内容
-INSERT INTO `apzl`.`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 ('operationType', 'CDZZ', 'C端直租', '', '0120', '1', '', '', '', '', '', '', '', '', '', '', '', 'SYS_Designer', NULL, '2020/03/31 15:08:56', 'SYS_Designer', '2020/03/31 15:08:56', '', '');
-INSERT INTO `apzl`.`bf_template` (`ID`, `SERIALNO`, `SORTNUMBER`, `TEMPLATENAME`, `TEMPLATESHOWNAME`, `TEMPLATEPATH`, `TEMPLATETYPE`, `OPERATETYPE`, `CALLBACK`, `CREATEMETHOD`, `DOCTYPE`, `ONECLASSIFY`, `TWOCLASSIFY`, `THREECLASSIFY`, `FOURCLASSIFY`, `TEMPLATEVERSION`, `STATUS`, `REMARK`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`, `CREATECONDITION`, `CREATESHEETCONDITION`) VALUES ('59f109e144c347d1b0d61da63a4fe822', NULL, '', 'C端直租', '融资租赁合同-C端直租.doc', '融资租赁合同-C端直租-定稿版.docx', 'word', 'create', '', NULL, '030', '030002', '', '', '', '1', '', '', 'administrator', '8009001', '2020/03/31 14:02:27', 'admin', '8009001', '2020/03/31 02:18:46', '', '');
-INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('25fff44b316c42d397cc8e2c214f2b20', '975294b526544d83b806e3fc2f99cd16', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('31eccaf2a04c471ea341f7ef7a760961', 'bbe36e81f17542078489f223239e658a', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('5952afc7c09044ab9a8966d75bcd7e19', 'ced1455267d64183ba1b270a9eda6089', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('801e60bfebd649e09d673b7fa0f7fc23', '484815c4a7a14cf6bdbf69939e5b060e', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('9d3b561076b74fca88e50e92d51413ef', 'cc67cd6da08745329d0723f5f6fda25d', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('aba1e85d33b5444bb35357f837100335', 'db5b1632a6b44e7ea99e0dd0b2193ef3', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('bd605c45dc554628ae5094c58a270b26', 'be101123ef74413eb0d8acad8b6b22b9', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('f921be5522b14cf38d04320165696a74', '755698c1c27a43efa6c23310757c6163', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL);
+
+
diff --git a/src_tenwa/com/tenwa/lease/flow/contract/commbusiness/GenerateBackOpinionLog.java b/src_tenwa/com/tenwa/lease/flow/contract/commbusiness/GenerateBackOpinionLog.java
index e7e012afd..bddf32e2b 100644
--- a/src_tenwa/com/tenwa/lease/flow/contract/commbusiness/GenerateBackOpinionLog.java
+++ b/src_tenwa/com/tenwa/lease/flow/contract/commbusiness/GenerateBackOpinionLog.java
@@ -57,8 +57,10 @@ public class GenerateBackOpinionLog extends BaseBussiness{
laolbo.setAttributeValue("PROCESS_NODE","CONTRACT_CHANGES");
}else if("FundPaymentCarApply".equals(applyType)){//放款申请
laolbo.setAttributeValue("PROCESS_NODE","FINANCE_AUDIT");
- }else if("FileReturnApply".equals(applyType)){//归档申请
+ }else if("MortgageFileApply".equals(applyType)){//放款后督
laolbo.setAttributeValue("PROCESS_NODE","DATA_ARCHIVE");
+ }else if("MortgageFileMailApply".equals(applyType)){//邮寄归档
+ laolbo.setAttributeValue("PROCESS_NODE","MAIL_ARCHIVE");
}
laolBm.saveObject(laolbo);
diff --git a/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java
index 33c0cafc8..49d29b643 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java
@@ -229,8 +229,8 @@ public class BusinessApproveManager {
public String checkCarNumber(JBOTransaction tx) throws Exception{
BizObjectManager lecManger = JBOFactory.getBizObjectManager(LB_EQUIPMENT_CAR.CLASS_NAME, tx);
BizObject lec = lecManger.createQuery("select O.id from O left join jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO lci on O.contract_id=lci.id "
- + " where ( O.FRAME_NUMBER=:prameNumber or O.FRAME_NUMBER2=:prameNumber2 or O.FRAME_NUMBER3=:prameNumber3 or O.FRAME_NUMBER4=:prameNumber4 ) and project_id<>:projectid and lci.contract_status BETWEEN 21 AND 103")
- .setParameter("prameNumber", plate_number).setParameter("prameNumber2", plate_number).setParameter("prameNumber3", plate_number).setParameter("prameNumber4", plate_number).setParameter("projectid", projectId).getSingleResult(false);
+ + " where ( O.FRAME_NUMBER=:prameNumber or O.FRAME_NUMBER2=:prameNumber2 ) and project_id<>:projectid and lci.contract_status BETWEEN 21 AND 103")
+ .setParameter("prameNumber", plate_number).setParameter("prameNumber2", plate_number).setParameter("projectid", projectId).getSingleResult(false);
if(lec !=null){
/*if(lec.getAttribute("ID").getString().equals(phaseNo)){
return "SUCCESS";