D15IKAT009 Added changes for disable stop purchase item

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

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

@@ -88,6 +88,7 @@ public class PorderTableServlet extends HttpServlet
 			String paraDatas [] = paraData.split("~");
 			String tranType = paraDatas[0];
 			System.out.println("TRANTYPE = ["+tranType+"]");
+			String dSizeDescr="";
 			//Changed by Samadhan on 25/06/2015 D15CKAT026 end
 			
 			System.out.println("ITEMCODE = ["+itmcode+"] OBJ_NAME=["+objName+"]");
@@ -111,7 +112,7 @@ public class PorderTableServlet extends HttpServlet
 				//sql = " SELECT DISTINCT PHY_ATTRIB_1 AS PSIZE FROM ITEM WHERE ITEM_PARNT = ?  order by PHY_ATTRIB_1 ";
 				//sql = " SELECT DISTINCT TRIM(PHY_ATTRIB_1) AS PSIZE FROM ITEM WHERE ITEM_PARNT = ?  order by PSIZE ";
 				//sql = " SELECT DISTINCT TRIM(PHY_ATTRIB_1) AS PSIZE FROM ITEM WHERE ITEM_PARNT = ? AND ITEM_CODE != ? order by PSIZE ";
-				sql = " SELECT DISTINCT TRIM(V.ATTRIB_ID),SORT_ORDER AS PSIZE FROM ITEM I, ITM_ATTRIB_VAL V WHERE V.ATTRIB_ID = I.PHY_ATTRIB_1 AND "
+				sql = " SELECT DISTINCT TRIM(V.ATTRIB_ID),SORT_ORDER AS PSIZE,V.DESCR FROM ITEM I, ITM_ATTRIB_VAL V WHERE V.ATTRIB_ID = I.PHY_ATTRIB_1 AND "
 					+" I.ITEM_PARNT = ? AND I.ITEM_CODE != ? AND V.ATTRIB_CODE = I.PHY_ATTRIB_22 order by SORT_ORDER ";
 				//changed by wasim on 19-05-2015 to join from ITM_ATTRIB_VAL table [END]
 				pstmt = conn.prepareStatement(sql);
@@ -123,15 +124,20 @@ public class PorderTableServlet extends HttpServlet
 				valueXmlString.append("<SET><![CDATA[").append("Quantity").append("]]></SET>\r\n");
 				while (rs.next())
 				{
-
+					
 					dSize = checkNullAndTrim(rs.getString(1));
+					//Changed by samadhan on 25/12/2015 for display description instead of size code
+					dSizeDescr = checkNullAndTrim(rs.getString(3));
+					
 					/*	valueXmlString.append("<ITM_CODE domID='"+ num +"' selected = 'N'>\r\n");
 
 				valueXmlString.append("<fieldId><![CDATA[").append(fieldId).append("]]></fieldId>\r\n");
 				valueXmlString.append("<fieldValue><![CDATA[").append(fieldValue).append("]]></fieldValue>\r\n");
 				valueXmlString.append("</ITM_CODE>\r\n");*/
 					sizeList.add(dSize);
-					valueXmlString.append("<SET><![CDATA[").append(dSize).append("]]></SET>\r\n");
+					//Changed by samadhan on 25/12/2015 for display description instead of size code
+					//valueXmlString.append("<SET><![CDATA[").append(dSize).append("]]></SET>\r\n");
+					valueXmlString.append("<SET><![CDATA[").append(dSizeDescr).append("]]></SET>\r\n");
 				}
 
 				if (rs != null) 
@@ -153,7 +159,7 @@ public class PorderTableServlet extends HttpServlet
 				//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";
+					+" AND V.ATTRIB_CODE='COLOR' ORDER BY I.PHY_ATTRIB_2";//Added by samadhan on 25/12/2015 AND V.ATTRIB_CODE='COLOR'
 				//Changed by wasim on 28-11-2015 for diplaying color description in color column [END]
 
 				pstmt = conn.prepareStatement(sql);
@@ -186,7 +192,7 @@ public class PorderTableServlet extends HttpServlet
 				//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";
+						+" AND V.ATTRIB_CODE='DIMENSION' ORDER BY I.PHY_ATTRIB_3";//Added by samadhan on 25/12/2015 AND V.ATTRIB_CODE='DIMENSION'
 				//Changed by wasim on 28-11-2015 for diplaying dimension description in dimension column [END]
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, itmcode);
@@ -221,7 +227,7 @@ public class PorderTableServlet extends HttpServlet
 
 				//sql = "select item_code,descr from item where item_parnt = ? ";
 				sql = " SELECT PHY_ATTRIB_2 COLOR, PHY_ATTRIB_3 ITEMDIMENSION,ITEM_CODE,PHY_ATTRIB_1 SIZE1"
-					+" FROM ITEM WHERE item_parnt = ? AND ITEM_CODE != ? "
+					+" FROM ITEM WHERE item_parnt = ? AND ITEM_CODE != ? and  decode(catalog_no,null,'N',catalog_no) ='N' "
 					+" GROUP BY ITEM_CODE,PHY_ATTRIB_2,PHY_ATTRIB_1,PHY_ATTRIB_3 ORDER BY PHY_ATTRIB_1 ";
 
 				pstmt = conn.prepareStatement(sql);
@@ -287,7 +293,6 @@ public class PorderTableServlet extends HttpServlet
 							temStrBuffer.append("<td>\r\n");
 							if(dataMap.containsKey(key))
 							{
-
 								isItemExist =true;
 								//Changed by Samadhan on 14/07/2015 D15CKAT026 Start
 								//temStrBuffer.append("<![CDATA[").append(dataMap.get(key)).append("]]>\r\n");
@@ -319,6 +324,7 @@ public class PorderTableServlet extends HttpServlet
 							}
 							else
 							{
+								isItemExist =true;
 								temStrBuffer.append("<![CDATA[").append("X").append("]]>\r\n");
 
 							}
@@ -383,7 +389,9 @@ public class PorderTableServlet extends HttpServlet
 			}
 	        else
 	        {
-	        	sql = " SELECT ITEM_CODE,descr FROM ITEM I WHERE I.ITEM_CODE = ? AND I.ITEM_PARNT IS NULL ";
+	        	//Changed by samadhan on 25/12/2015 for stop purchase item.
+	        	//sql = " SELECT ITEM_CODE,descr FROM ITEM I WHERE I.ITEM_CODE = ? AND I.ITEM_PARNT IS NULL ";
+	        	sql = " SELECT ITEM_CODE,descr,decode(catalog_no,null,'N',catalog_no) FROM ITEM I WHERE I.ITEM_CODE = ? AND I.ITEM_PARNT IS NULL ";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, itmcode);
 				rs = pstmt.executeQuery();
@@ -399,13 +407,20 @@ public class PorderTableServlet extends HttpServlet
 				valueXmlString.append("<td><![CDATA[").append(checkNullAndTrim(rs.getString(2))).append("]]></td>\r\n");
 				valueXmlString.append("<td><![CDATA[").append("0.0").append("]]></td>\r\n");
 				//valueXmlString.append("<td><![CDATA[").append(itmcode).append("]]></td>\r\n");
-				if(paraDatas.length>1)
+				if(rs.getString(3).equals("Y"))
 				{
-					valueXmlString.append("<td><![CDATA[").append(itmcode+"~"+paraDatas[1]).append("]]></td>\r\n");
+					valueXmlString.append("<td><![CDATA[").append("X").append("]]></td>\r\n");
 				}
 				else
 				{
-					valueXmlString.append("<td><![CDATA[").append(itmcode).append("]]></td>\r\n");
+					if(paraDatas.length>1)
+					{
+						valueXmlString.append("<td><![CDATA[").append(itmcode+"~"+paraDatas[1]).append("]]></td>\r\n");
+					}
+					else
+					{
+						valueXmlString.append("<td><![CDATA[").append(itmcode).append("]]></td>\r\n");
+					}
 				}
 				valueXmlString.append("</tr>\r\n");
 				valueXmlString.append("<tooltip><![CDATA[").append("Quantity").append("]]></tooltip>\r\n");