diff --git a/WebContent/Tenwa/Customer/Lessee/Company/CustomerCompanyRegister.jsp b/WebContent/Tenwa/Customer/Lessee/Company/CustomerCompanyRegister.jsp index 995239311..ddf6a2258 100644 --- a/WebContent/Tenwa/Customer/Lessee/Company/CustomerCompanyRegister.jsp +++ b/WebContent/Tenwa/Customer/Lessee/Company/CustomerCompanyRegister.jsp @@ -7,7 +7,7 @@ String sTempletNo = "CustomerCompanyRegister"; ASObjectModel doTemp = new ASObjectModel(sTempletNo); doTemp.setDDDWJbo("certtype","jbo.sys.CODE_LIBRARY,itemNo,ItemName,Codeno='CertType' and SortNo like 'Ent%' and itemno<>'Ent03' and IsInuse='1' "); - doTemp.setDDDWJbo("status","jbo.sys.CODE_LIBRARY,itemNo,ItemName,Codeno='customer_status' and itemno in('status01','status02') "); + doTemp.setDDDWJbo("status","jbo.sys.CODE_LIBRARY,itemNo,ItemName,Codeno='customer_status' and itemno in('status02','status03') "); doTemp.setDefaultValue("nationcode","CHN"); doTemp.setColInnerBtEvent("NATIONCODENAME", ""); doTemp.setHtmlEvent("certtype","onchange","changeCertidRequired"); diff --git a/src_tenwa/com/tenwa/customer/controller/company/NewCustomerCompanyController.java b/src_tenwa/com/tenwa/customer/controller/company/NewCustomerCompanyController.java index 5efe15ded..b4ba8aa2a 100644 --- a/src_tenwa/com/tenwa/customer/controller/company/NewCustomerCompanyController.java +++ b/src_tenwa/com/tenwa/customer/controller/company/NewCustomerCompanyController.java @@ -199,12 +199,17 @@ public class NewCustomerCompanyController{ BizObject newCustomerType = typeManager.newObject(); newCustomerType.setAttributeValue("customerid",newCustomer.getAttribute("customerid").getString()); newCustomerType.setAttributeValue("custtype","cust_type.cust"); - if("status01".equals(status)){ + /*if("status01".equals(status)){ newCustomerType.setAttributeValue("custstatus", "status01");//潜在 }else if("status02".equals(status)){ newCustomerType.setAttributeValue("custstatus", "status02");//正式 }else{ newCustomerType.setAttributeValue("custstatus", "status04");//其他默认草稿 + }*/ + if("status03".equals(status)){ + newCustomerType.setAttributeValue("custstatus", "status03");//废弃 + }else{ + newCustomerType.setAttributeValue("custstatus", "status02");//其他默认正式 } newCustomerType.setAttributeValue("status","valid"); newCustomerType.setAttributeValue("isoriginal","yes"); diff --git a/src_tenwa/com/tenwa/customer/handler/company/NewCustomerCompanyHandler.java b/src_tenwa/com/tenwa/customer/handler/company/NewCustomerCompanyHandler.java index 181d83c55..85c821c66 100644 --- a/src_tenwa/com/tenwa/customer/handler/company/NewCustomerCompanyHandler.java +++ b/src_tenwa/com/tenwa/customer/handler/company/NewCustomerCompanyHandler.java @@ -26,6 +26,7 @@ public class NewCustomerCompanyHandler extends CommonHandler{ bo.setAttributeValue("enterprisename",cust.getAttribute("customername").getString()); bo.setAttributeValue("certtype",cust.getAttribute("certtype").getString()); bo.setAttributeValue("certid",cust.getAttribute("certid").getString()); + bo.setAttributeValue("customer_num",cust.getAttribute("customer_num").getString()); bo.setAttributeValue("countrycode",cust.getAttribute("nationcode").getString()); } @@ -43,6 +44,7 @@ public class NewCustomerCompanyHandler extends CommonHandler{ bo.setAttributeValue("enterprisename",cust.getAttribute("customername").getString()); bo.setAttributeValue("certtype",cust.getAttribute("certtype").getString()); bo.setAttributeValue("certid",cust.getAttribute("certid").getString()); + bo.setAttributeValue("customer_num",cust.getAttribute("customer_num").getString()); bo.setAttributeValue("countrycode",cust.getAttribute("nationcode").getString()); super.initDisplayForEdit(bo); }