diff --git a/src/com/tenwa/channelportal/action/ContractSignAction.java b/src/com/tenwa/channelportal/action/ContractSignAction.java index c4aeff29c..3d268a00e 100644 --- a/src/com/tenwa/channelportal/action/ContractSignAction.java +++ b/src/com/tenwa/channelportal/action/ContractSignAction.java @@ -20,8 +20,8 @@ import jbo.app.tenwa.doc.LB_DOCLIBRARY; import jbo.app.tenwa.doc.LB_DOCRELATIVE; import jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST; import jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT; -import jbo.com.tenwa.lease.comm.BUSINESS_STATUS; -import jbo.com.tenwa.lease.comm.LB_CONTRACT_SIGN_LOG; +import jbo.com.tenwa.lease.carbrand.BUSINESS_STATUS; +import jbo.com.tenwa.lease.carbrand.LB_CONTRACT_SIGN_LOG; import jbo.com.tenwa.lease.comm.LB_CONTRACT_TEMPLATE; import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO; import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE_TEMP; diff --git a/src_core/com/tenwa/util/SerialNumberUtil.java b/src_core/com/tenwa/util/SerialNumberUtil.java index 4a5cf8375..cea4e5765 100644 --- a/src_core/com/tenwa/util/SerialNumberUtil.java +++ b/src_core/com/tenwa/util/SerialNumberUtil.java @@ -67,7 +67,7 @@ public class SerialNumberUtil { int year = Integer.parseInt(currentYear); int month = Integer.parseInt(currentMonth); int day = Integer.parseInt(currentDay); - return SerialNumberUtil.getSerialNumberByDay("zlzl"+dept+"{year}{month}{day}"+area_code+"{maxOrderNumber}",3,null, "", year,month,day, tx); + return SerialNumberUtil.getSerialNumberByDay("BQAP"+dept+"{year}{month}{day}"+area_code+"{maxOrderNumber}",3,null, "", year,month,day, tx); } //合同编号(车融易) public static synchronized String getContractIdByOldCar(String dept,String area_code,JBOTransaction tx) throws Exception{ @@ -78,7 +78,7 @@ public class SerialNumberUtil { int year = Integer.parseInt(currentYear); int month = Integer.parseInt(currentMonth); int day = Integer.parseInt(currentDay); - return SerialNumberUtil.getSerialNumberByDay("zlzl"+dept+"{year}{month}{day}"+area_code+"{maxOrderNumber}",3,null, "", year,month,day, tx); + return SerialNumberUtil.getSerialNumberByDay("BQAP"+dept+"{year}{month}{day}"+area_code+"{maxOrderNumber}",3,null, "", year,month,day, tx); } //业务合同编号(新车尊享) public static synchronized String getContractNumberByNewCar(JBOTransaction tx) throws Exception{ @@ -135,7 +135,7 @@ public class SerialNumberUtil { int year = Integer.parseInt(currentYear); int month = Integer.parseInt(currentMonth); int day = Integer.parseInt(currentDay); - return SerialNumberUtil.getSerialNumberByDay("zlzl"+dept+"{year}{month}{day}"+area_code+"{maxOrderNumber}",3,null, "", year,month,day, tx); + return SerialNumberUtil.getSerialNumberByDay("BQAP("+dept+"){year}{month}{day}"+area_code+"{maxOrderNumber}",3,null, "", year,month,day, tx); } /*public static String getContractSerialNaumber(String sSerialType,JBOTransaction tx) throws Exception { diff --git a/src_tenwa/com/tenwa/lease/flow/contract/contractapproval/ContractApprovalStartAction.java b/src_tenwa/com/tenwa/lease/flow/contract/contractapproval/ContractApprovalStartAction.java index 8cf0bc4eb..b91729f90 100644 --- a/src_tenwa/com/tenwa/lease/flow/contract/contractapproval/ContractApprovalStartAction.java +++ b/src_tenwa/com/tenwa/lease/flow/contract/contractapproval/ContractApprovalStartAction.java @@ -44,7 +44,7 @@ public class ContractApprovalStartAction extends BaseFlowStartAction{ if(area_code.equals(null)||area_code.equals("")){ area_code="000"; } - if(productid.equals("004")||productid.equals("0005")){//车辆 + /* if(productid.equals("004")||productid.equals("0005")){//车辆 dept+="T"; if(bo.getAttribute("LEAS_FORM").toString().equals("01")){//直租 dept+="Z"; @@ -54,9 +54,14 @@ public class ContractApprovalStartAction extends BaseFlowStartAction{ contractno = SerialNumberUtil.getContractIdByOldCar(dept,area_code,tx); } }else{//设备 - dept+="AZ"; +*/ dept+="A"; + if(bo.getAttribute("LEAS_FORM").toString().equals("01")){//直租 + dept+="Z"; + }else{//回租 + dept+="H"; + } contractno=SerialNumberUtil.getContractSerialNaumber(dept,area_code, tx); - } +// } this.FlowParam.put("ContractNo", contractno); this.FlowParam.put("FlowKey", contractno); this.FlowParam.put("customertype", customertype);