Changed by Manish on 01/08/16 for taking only active item

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

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

@@ -113,7 +113,11 @@ public class PorderTableServlet extends HttpServlet
 				//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,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 ";
+					+" I.ITEM_PARNT = ? AND I.ITEM_CODE != ? AND V.ATTRIB_CODE = I.PHY_ATTRIB_22 "
+					//Changed by Manish on 01/08/16 for taking only active item [Start]
+					+ " AND I.ACTIVE = 'Y' "
+					//Changed by Manish on 01/08/16 for taking only active item [End]
+					+" order by SORT_ORDER ";
 				//changed by wasim on 19-05-2015 to join from ITM_ATTRIB_VAL table [END]
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, itmcode);
@@ -159,7 +163,11 @@ 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 "
-					+" AND V.ATTRIB_CODE='COLOR' ORDER BY I.PHY_ATTRIB_2";//Added by samadhan on 25/12/2015 AND V.ATTRIB_CODE='COLOR'
+					+" AND V.ATTRIB_CODE='COLOR' " 
+					//Changed by Manish on 01/08/16 for taking only active item [Start]
+					+ " AND I.ACTIVE = 'Y' "
+					//Changed by Manish on 01/08/16 for taking only active item [End]
+					+" 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);
@@ -192,7 +200,11 @@ 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"
-						+" AND V.ATTRIB_CODE='DIMENSION' ORDER BY I.PHY_ATTRIB_3";//Added by samadhan on 25/12/2015 AND V.ATTRIB_CODE='DIMENSION'
+						+" AND V.ATTRIB_CODE='DIMENSION' " 
+						//Changed by Manish on 01/08/16 for taking only active item [Start]
+						+ " AND I.ACTIVE = 'Y' "
+						//Changed by Manish on 01/08/16 for taking only active item [End]	
+						+"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);
@@ -228,7 +240,11 @@ 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 != ? 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 ";
+					//Changed by Manish on 01/08/16 for taking only active item [Start]
+					+ " AND ACTIVE = 'Y' "
+					//Changed by Manish on 01/08/16 for taking only active item [End]
+					+" GROUP BY ITEM_CODE,PHY_ATTRIB_2,PHY_ATTRIB_1,PHY_ATTRIB_3 " 		
+					+"ORDER BY PHY_ATTRIB_1 ";
 
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, itmcode);
@@ -358,7 +374,10 @@ public class PorderTableServlet extends HttpServlet
 				}
 				
 				//Changed by Samadhan on 14/07/2015 D15CKAT026 Start
-				sql = " SELECT ITEM_CODE,descr FROM ITEM I WHERE I.ITEM_CODE = ?";
+				//sql = " SELECT ITEM_CODE,descr FROM ITEM I WHERE I.ITEM_CODE = ?";
+				//Changed by Manish on 01/08/16 for taking only active item [Start]
+				sql = " SELECT ITEM_CODE,descr FROM ITEM I WHERE I.ITEM_CODE = ?  AND I.ACTIVE = 'Y' ";
+				//Changed by Manish on 01/08/16 for taking only active item [End]
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, itmcode);
 				rs = pstmt.executeQuery();
@@ -391,7 +410,10 @@ public class PorderTableServlet extends HttpServlet
 	        {
 	        	//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 ";
+	        	//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 ";
+	        	//Changed by Manish on 01/08/16 for taking only active item [Start]
+	        	sql = " SELECT ITEM_CODE,descr,decode(catalog_no,null,'N',catalog_no) FROM ITEM I WHERE I.ITEM_CODE = ? AND I.ACTIVE = 'Y' AND I.ITEM_PARNT IS NULL ";
+	        	//Changed by Manish on 01/08/16 for taking only active item [End]
 	        	pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, itmcode);
 				rs = pstmt.executeQuery();