D14IKAT004 changed by wasim for color and dimension description in grid.

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@99286 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-wms/ibase/webitm/servlet/wms/PorderTableServlet.java

@@ -27,7 +27,8 @@ import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;;
+import javax.servlet.http.HttpSession;
+
 
 
 public class PorderTableServlet extends HttpServlet 
@@ -60,7 +61,7 @@ public class PorderTableServlet extends HttpServlet
 		ResultSet rs = null;
 		String color,size,dimension,itemCode = "";
 		
-		String dColor,dSize,dDim = "";
+		String dColor,dSize,dDim = "",dColorDescr = "",dDimDescr = "";
 		
 		HashMap dataMap = new HashMap();
 		ArrayList sizeList = new ArrayList();
@@ -69,6 +70,9 @@ public class PorderTableServlet extends HttpServlet
 		
 		ArrayList tooltip = new ArrayList();
 		
+		HashMap colorData = new HashMap();
+		HashMap dimensionData = new HashMap();
+		
 		try 
 		{
 			StringBuffer valueXmlString = new StringBuffer("<Root>\r\n");
@@ -145,7 +149,12 @@ public class PorderTableServlet extends HttpServlet
 				valueXmlString.append("</TH_SET>\r\n");
 				//TH SET
 				//sql = " SELECT DISTINCT PHY_ATTRIB_2 AS color FROM ITEM WHERE ITEM_PARNT = ?  order by PHY_ATTRIB_2 ";
-				sql = " SELECT DISTINCT PHY_ATTRIB_2 AS color FROM ITEM WHERE ITEM_PARNT = ? AND ITEM_CODE != ? order by PHY_ATTRIB_2 ";
+				//Changed by wasim on 28-11-2015 for diplaying color description in color column [START]
+				//sql = " SELECT DISTINCT PHY_ATTRIB_2 AS color FROM ITEM WHERE ITEM_PARNT = ? AND ITEM_CODE != ? order by PHY_ATTRIB_2 ";
+				sql = "SELECT DISTINCT I.PHY_ATTRIB_2,V.DESCR FROM ITEM I,ITM_ATTRIB_VAL V WHERE I.ITEM_PARNT = ? AND I.ITEM_CODE != ?"
+					+" AND I.PHY_ATTRIB_2 = V.ATTRIB_ID "
+					+" ORDER BY I.PHY_ATTRIB_2";
+				//Changed by wasim on 28-11-2015 for diplaying color description in color column [END]
 
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, itmcode);
@@ -153,9 +162,13 @@ public class PorderTableServlet extends HttpServlet
 				rs = pstmt.executeQuery();
 				while (rs.next())
 				{
+					//Changed by wasim on 28-11-2015 for diplaying color description in color column
+					//dColor = checkNullAndTrim(rs.getString(1));
+					//colorList.add(dColor);
 					dColor = checkNullAndTrim(rs.getString(1));
+					dColorDescr = checkNullAndTrim(rs.getString(2));
 					colorList.add(dColor);
-
+					colorData.put(dColor, dColorDescr);
 				}
 				if (rs != null) 
 				{					
@@ -169,17 +182,25 @@ public class PorderTableServlet extends HttpServlet
 				}
 
 				//sql = " SELECT DISTINCT PHY_ATTRIB_3 AS DIM FROM ITEM WHERE ITEM_PARNT = ?  order by PHY_ATTRIB_3 ";
-				sql = " SELECT DISTINCT PHY_ATTRIB_3 AS DIM FROM ITEM WHERE ITEM_PARNT = ? AND ITEM_CODE != ? order by PHY_ATTRIB_3 ";
-
+				//Changed by wasim on 28-11-2015 for diplaying dimension description in dimension column [START]
+				//sql = " SELECT DISTINCT PHY_ATTRIB_3 AS DIM FROM ITEM WHERE ITEM_PARNT = ? AND ITEM_CODE != ? order by PHY_ATTRIB_3 ";
+				sql = "SELECT DISTINCT I.PHY_ATTRIB_3,V.DESCR FROM ITEM I,ITM_ATTRIB_VAL V "
+						+" WHERE I.ITEM_PARNT = ? AND I.ITEM_CODE != ? AND I.PHY_ATTRIB_3 = V.ATTRIB_ID"
+						+" ORDER BY I.PHY_ATTRIB_3";
+				//Changed by wasim on 28-11-2015 for diplaying dimension description in dimension column [END]
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, itmcode);
 				pstmt.setString(2, itmcode);
 				rs = pstmt.executeQuery();
 				while (rs.next())
 				{
+					//Changed by wasim on 28-11-2015 for diplaying dimension description in dimension column
+					/*dDim = checkNullAndTrim(rs.getString(1));
+					dimensionList.add(dDim);*/
 					dDim = checkNullAndTrim(rs.getString(1));
+					dDimDescr = checkNullAndTrim(rs.getString(2));
 					dimensionList.add(dDim);
-
+					dimensionData.put(dDim,dDimDescr);
 				}
 				if (rs != null) 
 				{					
@@ -251,8 +272,10 @@ public class PorderTableServlet extends HttpServlet
 						temStrBuffer = new StringBuffer("");
 						isItemExist = false;
 						temStrBuffer.append("<tr>\r\n");
-						temStrBuffer.append("<td><![CDATA[").append(colorList.get(j)).append("]]></td>\r\n");
-						temStrBuffer.append("<td><![CDATA[").append(dimensionList.get(i)).append("]]></td>\r\n");
+						//temStrBuffer.append("<td><![CDATA[").append(colorList.get(j)).append("]]></td>\r\n");  Changed by wasim on 28-11-2015 for displaying color details in grid
+						temStrBuffer.append("<td><![CDATA[").append(colorData.get(colorList.get(j))).append("]]></td>\r\n"); 
+						//temStrBuffer.append("<td><![CDATA[").append(dimensionList.get(i)).append("]]></td>\r\n");  Changed by wasim on 28-11-2015 for displaying dimension details in grid
+						temStrBuffer.append("<td><![CDATA[").append(dimensionData.get(dimensionList.get(i))).append("]]></td>\r\n");
 						temStrBuffer.append("<td><![CDATA[").append(0).append("]]></td>\r\n");
 						for(int k=0;k<sizelen;k++)
 						{