Chnage in bug replenishment confirmation

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

webitm-wms/ibase/webitm/ejb/wms/ReplIssConf.java

@@ -531,8 +531,22 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
 							+ " AND P.LINE_NO__REPL = ?  AND FN_IS_VALID_PICK_ORDER(P.PICK_ORDER) = 'Y'";*/
 						//Changed By Pragyan 06/12/2012 To get valid Pick Order.end
 						
-						sql = " SELECT * FROM PICK_ORD_DET P WHERE P.REPL_ORDER = ? AND P.LINE_NO__REPL = ?  " +
-								" AND FN_IS_VALID_PICK_ORDER(P.PICK_ORDER) = 'Y'";
+						//Changed By Pragyan 21/02/13 Logic change as above by manohran sir
+						/*sql = " SELECT * FROM PICK_ORD_DET P WHERE P.REPL_ORDER = ? AND P.LINE_NO__REPL = ?  " +
+								" AND FN_IS_VALID_PICK_ORDER(P.PICK_ORDER) = 'Y'";*/
+						
+						sql = "SELECT * FROM PICK_ORD_DET P WHERE P.REPL_ORDER = ? AND P.LINE_NO__REPL =? "
+								+ " AND FN_IS_VALID_PICK_ORDER(P.PICK_ORDER) = 'Y' "
+								+ " UNION ALL " 
+								+ " SELECT * FROM PICK_ORD_DET  WHERE (REPL_ORDER, LINE_NO__REPL) IN " 
+								+ " SELECT REPL_ORDER , LINE_NO FROM REPL_ORD_DET  WHERE PICK_ORDER = ? AND LINE_NO__PICK =? ) " 
+								+ " AND FN_IS_VALID_PICK_ORDER(PICK_ORDER) = 'Y' " 
+								+ " UNION ALL "
+								+ " SELECT * FROM PICK_ORD_DET  WHERE (REPL_ORDER, LINE_NO__REPL) IN ( " 
+								+ " SELECT REPL_ORDER,LINE_NO FROM REPL_ORD_DET WHERE (PICK_ORDER,LINE_NO__PICK) IN ( "
+								+ " (SELECT REPL_ORDER , LINE_NO FROM REPL_ORD_DET  WHERE PICK_ORDER =? AND LINE_NO__PICK = ? ))) "
+								+ " AND FN_IS_VALID_PICK_ORDER(PICK_ORDER) = 'Y' ";
+
 						
 						//Changed by sumit on 08/02/13 changed the sql ( Told Manoharan Sir) end
 						
@@ -548,6 +562,12 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
 							//Changed by sumit on 08/02/13  commented setter parameter the sql  end
 							pstmtPick.setString(1, replOrder);	
 							pstmtPick.setInt(2, replOrderLineNo);	
+							//Changed By Pragyan 21/02/13 Logic change as above by manohran sir.start
+							pstmtPick.setString(3, replOrder);	
+							pstmtPick.setInt(4, replOrderLineNo);
+							pstmtPick.setString(5, replOrder);	
+							pstmtPick.setInt(6, replOrderLineNo);
+							//Changed By Pragyan 21/02/13 Logic change as above by manohran sir.end
 							rsPick = pstmtPick.executeQuery();
 							
 							//Changed by sumit on 08/02/13 change to while