diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ProjectDistriborInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ProjectDistriborInfo.jsp index d7c08a3af..0394926a8 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ProjectDistriborInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ProjectDistriborInfo.jsp @@ -9,14 +9,14 @@ String flowunid = CurPage.getParameter("FlowUnid"); String productId = CurPage.getParameter("ProductId"); String distributorNo = CurPage.getParameter("distributorNo"); - String orgId = CurUser.getOrgID(); - //如果是直营店,则显示子经销。 - String sSql = "select DISTRIBUTOR_NO,F_I_TYPE from O where ORGID = :orgId"; - // F_I_TYPE=f_i_type03 直营店 - BizObject bo = JBOFactory.createBizObjectQuery("jbo.app.tenwa.customer.DISTRIBUTOR_INFO", sSql).setParameter("orgId", orgId).getSingleResult(false); - if(bo != null){ - distributorNo = bo.getAttribute("DISTRIBUTOR_NO").getString(); - } + String orgId = CurUser.getOrgID(); + //如果是直营店,则显示子经销。 + String sSql = "select DISTRIBUTOR_NO,F_I_TYPE from O where ORGID = :orgId"; + // F_I_TYPE=f_i_type03 直营店 + BizObject bo = JBOFactory.createBizObjectQuery("jbo.app.tenwa.customer.DISTRIBUTOR_INFO", sSql).setParameter("orgId", orgId).getSingleResult(false); + if(bo != null){ + distributorNo = bo.getAttribute("DISTRIBUTOR_NO").getString(); + } String phaseNo = CurPage.getParameter("PhaseNo"); if(sPrevUrl == null) sPrevUrl = ""; @@ -25,38 +25,38 @@ String flag = "false"; if("0010".equals(phaseNo)||"0020".equals(phaseNo)){ doTemp.setColInnerBtEvent("DISTRIBUTOR_NAME", "selectDistributor()"); - flag = "true"; + flag = "true"; } ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); dwTemp.Style = "2";//freeform //dwTemp.ReadOnly = "-2";//只读模式 dwTemp.genHTMLObjectWindow(flowunid); - + String sButtons[][] = { - {flag,"All","Button","保存","保存所有修改","as_save(0)","","","",""}, + {flag,"All","Button","保存","保存所有修改","as_save(0)","","","",""}, // {String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""} }; // sButtonPosition = "south"; %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp index 2d19c905e..f8bce9363 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp @@ -29,12 +29,12 @@ String distributorType = ""; String orgId = CurUser.getOrgID(); //如果是直营店,则显示子经销。 - String sSql = "select DISTRIBUTOR_NO,F_I_TYPE from O where ORGID = :orgId"; - // F_I_TYPE=f_i_type03 直营店 + String sSql = "select DISTRIBUTOR_NO,TYPE from O where ORGID = :orgId"; + // TYPE=type03 直营店 包含 中车 BizObject bo = JBOFactory.createBizObjectQuery("jbo.app.tenwa.customer.DISTRIBUTOR_INFO", sSql).setParameter("orgId", orgId).getSingleResult(false); if(bo != null){ distributorNo = bo.getAttribute("DISTRIBUTOR_NO").getString(); - distributorType = bo.getAttribute("F_I_TYPE").getString(); + distributorType = bo.getAttribute("TYPE").getString(); } System.out.println(distributorNo); System.out.println(distributorType); @@ -131,7 +131,7 @@ function checkDispalyDistributor() { var distributorNo22 = "<%=distributorNo%>"; var distributorType22 = "<%=distributorType%>"; - if(distributorType22 == "f_i_type03"){ + if(distributorType22 == "type03"){ return true; } return false; 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 2facebcd2..c56a1cae0 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java @@ -121,9 +121,9 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness { //cust_type.cust if("cust_type.cust".equals(custType)){ BizObject distributorBo = JBOFactory.createBizObjectQuery(DISTRIBUTOR_INFO.CLASS_NAME,"orgid=:orgid").setParameter("orgid",deptid).getSingleResult(false); - String fiType = distributorBo.getAttribute("F_I_TYPE").toString(); + String distributorType = distributorBo.getAttribute("TYPE").toString(); if((this.getAttribute("operationType") != null && "BAIC_MOTOR".equals(this.getAttribute("operationType").toString())) - || "f_i_type03".equals(fiType)){//自营店 + || "type03".equals(distributorType)){//自营店 distributoIid=this.getAttribute("distributorNo").toString(); vndrName=this.getAttribute("distributorName").toString(); }else{ @@ -195,9 +195,9 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness { this.saveBusinessStatus(bsbom, tx, asUser);//项目进度表 }else{ BizObject distributorBo = JBOFactory.createBizObjectQuery(DISTRIBUTOR_INFO.CLASS_NAME,"orgid=:orgid").setParameter("orgid",deptid).getSingleResult(false); - String fiType = distributorBo.getAttribute("F_I_TYPE").toString(); + String fiType = distributorBo.getAttribute("TYPE").toString(); if((this.getAttribute("operationType") != null && "BAIC_MOTOR".equals(this.getAttribute("operationType").toString())) - || "f_i_type03".equals(fiType)){//自营店 + || "type03".equals(fiType)){//自营店 distributoIid=this.getAttribute("distributorNo").toString(); vndrName=this.getAttribute("distributorName").toString(); }else{