add lock type in view data for quality and administrative INVHOLDRELGEN menu

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

webitm-dis/ibase/webitm/ejb/dis/InvHoldRelGen.java

@@ -100,8 +100,9 @@ public class InvHoldRelGen extends ProcessEJB implements InvHoldRelGenLocal, Inv
 		retTabSepStrBuff.append("<group0>");
 		retTabSepStrBuff.append("<description>").append("Group0 description").append("</description>");
 		retTabSepStrBuff.append("<Header0>");
-		int cnt=0,count=0,i=8;
+		int cnt=0,count=0,i=7;
 		String sql="";
+		String subSql="";
 		String lockCodeFrom = "",lockCodeTo = "",tranIdFrom = "",tranIdTo="",refIdFrom="",refIdTo="",autoConfirmed="",schRelDateFromstr="",schRelDateTostr="";
 		Timestamp schRelDateFrom=null,schRelDateTo=null;
 		String lotNoFrom="",lotNoTo="",invoiceNo="",holdQuantity="";		
@@ -111,7 +112,7 @@ public class InvHoldRelGen extends ProcessEJB implements InvHoldRelGenLocal, Inv
 		Connection conn= null;
 		try
 		{
-			System.out.println("mahendra testing@@@@@@@@@!!!!");
+			System.out.println("mahendra testing@@@@@@@@@ 12-09-2014 !!!!");
 			System.out.println("windowName!!!!! "+windowName);
 			
 			
@@ -349,20 +350,16 @@ public class InvHoldRelGen extends ProcessEJB implements InvHoldRelGenLocal, Inv
 			 * if menu is InvHoldRelGen For Administrative then data filter with lock type 'Administrative lock'  
 			 * */
              
-			if(windowName.equalsIgnoreCase("w_inv_hold_rel_gen"))
-			{
-				System.out.println("windowName 0"+windowName);
-				lockType="0";
-			}
+			
 			if(windowName.equalsIgnoreCase("w_invholdrelgen_quality"))
 			{
 				System.out.println("windowName 1"+windowName);
-				lockType="1";
+				subSql = "and il.lock_type='1'";//Quality Lock
 			}
 			if(windowName.equalsIgnoreCase("w_invholdrelgen_adm"))
 			{
 				System.out.println("windowName 2"+windowName);
-				lockType="2";
+				subSql = "and il.lock_type='2'";//Administrative Lock
 			}
 			
 			System.out.println("windowName !!! "+windowName +"lockType !!!!"+lockType);
@@ -379,7 +376,7 @@ public class InvHoldRelGen extends ProcessEJB implements InvHoldRelGenLocal, Inv
 						" and ( ihd.tran_id >= ? and ihd.tran_id <= ? ) and ( ih.lock_code >= ? and ih.lock_code <= ? )" +
 						" and ( ihd.sch_rel_date between ? and ? ) and ihd.hold_status <> 'R' "
 					   +" and ( ihd.lot_no >= '"+lotNoFrom+"' and ihd.lot_no <= '"+lotNoTo+"' ) and ih.confirmed='Y' " //Added by Manoj dtd 15/04/2014 to retrieve data based on entered lot No range
-						+ " and nvl((select count(1) from inv_hold_rel_det r where r.tran_id__hold = ihd.tran_id and  r.line_no__hold = ihd.line_no ),0) = 0  and il.lock_type=? "; // 14/04/14 manoharan this condition added
+						+ " and nvl((select count(1) from inv_hold_rel_det r where r.tran_id__hold = ihd.tran_id and  r.line_no__hold = ihd.line_no ),0) = 0   "+subSql; // 14/04/14 manoharan this condition added
 					  
 			//and ( ihd.lock_code between ? and ? )
 			if(refIdFrom != null )	
@@ -407,7 +404,7 @@ public class InvHoldRelGen extends ProcessEJB implements InvHoldRelGenLocal, Inv
 				pstmt.setString(4,lockCodeTo);						    //added by Ritesh on 08/05/13				
 				pstmt.setTimestamp(5,schRelDateFrom); 
 				pstmt.setTimestamp(6,schRelDateTo);		
-				pstmt.setString(7,lockType);	
+				//pstmt.setString(7,lockType);	
 				
 				if(refIdFrom != null )	
 				{