diff --git a/WebContent/Tenwa/Apzl/PortalToCarType/LmDistributorToproductList.jsp b/WebContent/Tenwa/Apzl/PortalToCarType/LmDistributorToproductList.jsp
index 673b40444..98127eee0 100644
--- a/WebContent/Tenwa/Apzl/PortalToCarType/LmDistributorToproductList.jsp
+++ b/WebContent/Tenwa/Apzl/PortalToCarType/LmDistributorToproductList.jsp
@@ -7,11 +7,11 @@
*/
ASObjectModel doTemp = new ASObjectModel("LM_DISTRIBUTOR_TO_PRODUCT");
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
- String distributorId = CurPage.getParameter("DISTRIBUTOR_ID");
+ String typeno = CurPage.getParameter("TYPENO");
dwTemp.Style="1"; //--设置为Grid风格--
dwTemp.ReadOnly = "1"; //只读模式
dwTemp.setPageSize(10);
- dwTemp.genHTMLObjectWindow(distributorId);
+ dwTemp.genHTMLObjectWindow(typeno);
//0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
String sButtons[][] = {
{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
@@ -20,17 +20,15 @@
};
%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<%@ page contentType="text/html; charset=GBK"%><%@
+ include file="/IncludeBegin.jsp"%><%
+/*
+ 页面说明: 示例上下联动框架页面
+ */
+ String TYPENO = CurPage.getParameter("TYPENO");
+%><%@include file="/Resources/CodeParts/Frame02.jsp"%>
+
<%@ include file="/IncludeEnd.jsp"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Apzl/PortalToCarType/LmProductDistributorList.jsp b/WebContent/Tenwa/Apzl/PortalToCarType/LmProductDistributorList.jsp
index 30d045714..d156f3d2e 100644
--- a/WebContent/Tenwa/Apzl/PortalToCarType/LmProductDistributorList.jsp
+++ b/WebContent/Tenwa/Apzl/PortalToCarType/LmProductDistributorList.jsp
@@ -5,36 +5,55 @@
Content:
History Log:
*/
- ASObjectModel doTemp = new ASObjectModel("LM_DISTRIBUTOR_LIST");
- ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+ String PG_TITLE ="汽车产品列表";
+ String TYPENO= CurPage.getParameter("TYPENO");
+ ASObjectModel doTemp = new ASObjectModel("LmProductCarList");
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
dwTemp.Style="1"; //--设置为Grid风格--
dwTemp.ReadOnly = "1"; //只读模式
dwTemp.setPageSize(10);
- dwTemp.genHTMLObjectWindow("");
+ dwTemp.genHTMLObjectWindow(TYPENO);
//0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
String sButtons[][] = {
- {"false","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
- {"false","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
- {"false","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
+ //{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
+ //{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
+ //{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
};
%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/src_tenwa/com/tenwa/apzl/saveunioncar/saveUnionCarUtil.java b/src_tenwa/com/tenwa/apzl/saveunioncar/saveUnionCarUtil.java
index 1fe991c84..f1f0bc286 100644
--- a/src_tenwa/com/tenwa/apzl/saveunioncar/saveUnionCarUtil.java
+++ b/src_tenwa/com/tenwa/apzl/saveunioncar/saveUnionCarUtil.java
@@ -132,25 +132,25 @@ public String getCarBrandId() {
String updateUserID = params[0];
String updateOrgId = params[1];
String updateTime = params[2];
- String distributorId = params[3];
- String productid=params[4];
+ String typeno = params[3];
+ //String productid=params[4];
int lle=0;
- BizObjectManager Lmcheck = JBOFactory.getBizObjectManager(LM_DISTRIBUTOR_TO_PRODUCT.CLASS_NAME,tx);
- BizObject obcheck=Lmcheck.createQuery("DISTRIBUTOR_ID=:DISTRIBUTOR_ID and PRODUCT_ID=:PRODUCT_ID")
- .setParameter("DISTRIBUTOR_ID", distributorId).setParameter("PRODUCT_ID",productid).getSingleResult(false);
- if(obcheck!=null){
- return "error";
- }
int i;
try{
- for(i=4;i