diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java index a37efa5c5..642a97abf 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java @@ -2,6 +2,7 @@ package com.tenwa.lease.flow.project.commbusiness; import jbo.app.tenwa.customer.CUSTOMER_COMPANY_TEMP; import jbo.app.tenwa.customer.CUSTOMER_PERSON_TEMP; +import jbo.app.tenwa.customer.DISTRIBUTOR_INFO; import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO_TEMP; import jbo.com.tenwa.lease.comm.LB_EQUIPMENT_CAR_TEMP; import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP; @@ -99,14 +100,20 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness { boLULT.setAttributeValue("InputTime", StringFunction.getToday()); boLULT.setAttributeValue("is_main", "Y"); //ÏîÄ¿±àºÅ£¬ - + String deptid = asUser.getOrgID() ; + if(deptid.startsWith("8006")) { + BizObject distributor_bo=JBOFactory.createBizObjectQuery(DISTRIBUTOR_INFO.CLASS_NAME,"orgid=:orgid").setParameter("orgid",deptid).getSingleResult(false); + if(distributor_bo!=null) { + bo.setAttributeValue("distributor_id",distributor_bo.getAttribute("distributor_no")); + } + } bo.setAttributeValue("PROJECT_NO",this.getAttribute("ProjectNo")); bo.setAttributeValue("id", this.getAttribute("ProjectId")); bo.setAttributeValue("FLOWUNID", this.getAttribute("FlowUnid")); bo.setAttributeValue("project_name",this.getAttribute("ProjectName")+"-"+this.getAttribute("ProductName")); bo.setAttributeValue("project_name",this.getAttribute("ProjectNo")); bo.setAttributeValue("project_manage",this.getAttribute("CurUserID")); - bo.setAttributeValue("project_dept",asUser.getOrgID()); + bo.setAttributeValue("project_dept",deptid); bo.setAttributeValue("VERSIONID", this.getAttribute("versionid")); bo.setAttributeValue("BUSINESSTYPE", this.getAttribute("businessType")); bo.setAttributeValue("LEAS_FORM", this.getAttribute("leasehold"));//×âÁÞ·½Ê½ diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempToContractCarBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempToContractCarBusiness.java index ce3ef1ef4..a4b40cef8 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempToContractCarBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempToContractCarBusiness.java @@ -3,6 +3,7 @@ package com.tenwa.lease.flow.project.commbusiness; import java.util.HashMap; import java.util.Map; +import jbo.app.tenwa.customer.DISTRIBUTOR_INFO; import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO; import com.amarsoft.are.jbo.BizObject; @@ -34,6 +35,7 @@ public class LBProjectIntoTempToContractCarBusiness extends BaseBussiness { String contractnum = ""; String productid=bo.getAttribute("PRODUCT_ID").getString(); String deptid=bo.getAttribute("PROJECT_DEPT").getString(); + String distributor_id=bo.getAttribute("distributor_id").getString(); //String area_code=bo.getAttribute("AREA_CODE").getString(); String dept=""; if(deptid.equals("8000900020001")){//cx @@ -48,6 +50,13 @@ public class LBProjectIntoTempToContractCarBusiness extends BaseBussiness { }else{ dept+="zb"; } +// if(deptid.startsWith("8006")) { +// BizObject distributor_bo=JBOFactory.createBizObjectQuery(DISTRIBUTOR_INFO.CLASS_NAME,"orgid=:orgid").setParameter("orgid",deptid).getSingleResult(false); +// if(distributor_bo!=null) { +// otherProperty.put("distributor_id", distributor_bo.getAttribute("distributor_no").toString()); +// } +// } + //if(area_code.equals(null)||area_code.equals("")){ // area_code="000"; // } @@ -62,10 +71,12 @@ public class LBProjectIntoTempToContractCarBusiness extends BaseBussiness { //contractnum = SerialNumberUtil.getContractNumberByOldCar(Sqlca); // } // } + otherProperty.put("id", this.getAttribute("ContractId").toString()); otherProperty.put("CONTRACT_NO",this.getAttribute("ContractNo").toString()); otherProperty.put("CONTRACT_NUMBER",this.getAttribute("ContractNo").toString()); otherProperty.put("Project_Id", this.getAttribute("ProjectId").toString()); + otherProperty.put("distributor_id",distributor_id); otherProperty.put("RENT_METHOD", "010"); service.copyOrLoadProjectInfoToContract(Sqlca, fromCondtion, null,otherProperty, ServiceOperatorEnum.FormalToTemp); String sMessage="true";