From 56f2bfdae28d2e5c3a555427fb96a16ee98315bf Mon Sep 17 00:00:00 2001
From: zhulianghua <zhulh@tenwa.com.cn>
Date: Mon, 6 Aug 2018 22:01:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=BA=A7=E5=93=81=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=88=97=E8=A1=A8=EF=BC=8C=E4=B8=80=E4=B8=AA=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E5=8F=AA=E6=9C=89=E4=B8=80=E4=B8=AA=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/ProductManage/ProductConfig/ProductInfo.jsp     | 7 ++++++-
 .../ProductManage/ProductConfig/ProductSpecificInfo.jsp    | 2 +-
 .../ProductManage/ProductConfig/ProductSpecificList.jsp    | 4 ++--
 src/com/amarsoft/awe/control/RedirectorServlet.java        | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/WebContent/ProductManage/ProductConfig/ProductInfo.jsp b/WebContent/ProductManage/ProductConfig/ProductInfo.jsp
index 662ff96a5..369f1bd3c 100644
--- a/WebContent/ProductManage/ProductConfig/ProductInfo.jsp
+++ b/WebContent/ProductManage/ProductConfig/ProductInfo.jsp
@@ -11,6 +11,8 @@
  	String type = CurPage.getAttribute("type");
 	BusinessObject inputParameter=SystemHelper.getPageComponentParameters(CurPage);
 	Map<String,Object> map =inputParameter.convertToMap();
+	String typeNo = map.get("TypeNo").toString();
+	String serialNo = Sqlca.getString("select serialno from prd_specific_library where businesstype = '" + typeNo + "'");
 	String catalogNo = (String)map.get("SortNo");
 	ASObjectWindow dwTemp =ObjectWindowHelper.createObjectWindow_Info("PRD_ProductInfo", inputParameter, CurPage, request);
 	ASDataObject doTemp=dwTemp.getDataObject();
@@ -35,6 +37,7 @@ include file="/Frame/resources/include/ui/include_info.jspf"%>
 	}
 	
 	function specificInfo(){
+		document.getElementById("sys_sub_page_frame_GGDY").parentNode.parentNode.style.display = "none";
 		var typeNo = getItemValue(0,getRow(),"TypeNo"); 
 		var productType1 = getItemValue(0,getRow(),"Attribute1");//产品类型
 		var productType2 = getItemValue(0,getRow(),"Attribute2");//产品类型
@@ -53,7 +56,9 @@ include file="/Frame/resources/include/ui/include_info.jspf"%>
 			}
 		}
 		document.all("A_Group_0020").style.display = "";
-		AsControl.OpenView("/ProductManage/ProductConfig/ProductSpecificList.jsp","ProductID="+typeNo+"&ProductType1="+productType1+"&ProductType2="+productType2,"sys_sub_page_frame_GGDY","");
+		var serialNo = "<%=serialNo %>";
+		/* AsControl.OpenView("/ProductManage/ProductConfig/ProductSpecificList.jsp","ProductID="+typeNo+"&ProductType1="+productType1+"&ProductType2="+productType2,"sys_sub_page_frame_GGDY",""); */
+		AsControl.OpenView("/ProductManage/ProductConfig/ProductSpecificInfo.jsp","SerialNo=" + serialNo + "&ProductID="+typeNo+"&ProductType1="+productType1+"&ProductType2="+productType2,"sys_sub_page_frame_GGXX","");
 	}
 	
 	//打开规格页面
diff --git a/WebContent/ProductManage/ProductConfig/ProductSpecificInfo.jsp b/WebContent/ProductManage/ProductConfig/ProductSpecificInfo.jsp
index 4c725b980..f899a9afe 100644
--- a/WebContent/ProductManage/ProductConfig/ProductSpecificInfo.jsp
+++ b/WebContent/ProductManage/ProductConfig/ProductSpecificInfo.jsp
@@ -24,7 +24,7 @@
 include file="/Frame/resources/include/ui/include_info.jspf"%>
 <script type="text/javascript">	
 	function saveRecord(){
-		as_save(0,"parent.specificInfo();openComponentDef();");
+		as_save(0,"openComponentDef();");
 	}
 
 	<%-- function openComponentDef(){
diff --git a/WebContent/ProductManage/ProductConfig/ProductSpecificList.jsp b/WebContent/ProductManage/ProductConfig/ProductSpecificList.jsp
index 311c3acc9..56ffcd702 100644
--- a/WebContent/ProductManage/ProductConfig/ProductSpecificList.jsp
+++ b/WebContent/ProductManage/ProductConfig/ProductSpecificList.jsp
@@ -14,8 +14,8 @@
 	dwTemp.genHTMLObjectWindow("");
 	
 	String sButtons[][] = {
-		{"true","All","Button","新增规格","新增规格","newSpecific()","","","","",""},
-		{"true","All","Button","删除规格","删除规格","deleteSpecific()","","","","",""},
+		/* {"true","All","Button","新增规格","新增规格","newSpecific()","","","","",""},
+		{"true","All","Button","删除规格","删除规格","deleteSpecific()","","","","",""}, */
 	};
 %> 
 <script type="text/javascript">
diff --git a/src/com/amarsoft/awe/control/RedirectorServlet.java b/src/com/amarsoft/awe/control/RedirectorServlet.java
index 1c2acd2d8..ef44b97f1 100644
--- a/src/com/amarsoft/awe/control/RedirectorServlet.java
+++ b/src/com/amarsoft/awe/control/RedirectorServlet.java
@@ -34,8 +34,8 @@ public class RedirectorServlet extends HttpServlet
       return;
     }
 
+    synchronized (this) {//为避免缓存连接时因处理快慢的问题导致连接编号被覆盖的问题，将此对象加锁
     RuntimeContext CurARC = (RuntimeContext)session.getAttribute("CurARC");
-    synchronized (CurARC) {//为避免缓存连接时因处理快慢的问题导致连接编号被覆盖的问题，将此对象加锁
     	if (CurARC == null) {
     	      ARE.getLog().info("[RED]TimeOut[" + session.getId() + ":" + session.getCreationTime() + ":" + session.getLastAccessedTime() + "] Page=[" + req.getParameter("ComponentURL") + "]");
     	      resp.sendRedirect(req.getContextPath() + "/Frame/page/sys/SessionExpire.jsp");