Changed by Rohan on 26-02-13 for wave cancle bug for active replanishment cancel

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

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

@@ -1284,8 +1284,11 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 				sqlDep = "SELECT REPL_ORDER,LINE_NO FROM REPL_ORD_DET WHERE PICK_ORDER = ? AND LINE_NO__PICK = ? "
 						+" AND CASE WHEN CANCEL_MODE IS NULL THEN 'N' ELSE CANCEL_MODE END <> 'Y' ";
 				
+				//Changed by Rohan on 26-02-13 for pick reference in all cases.start
+				/*
 				if(!"Q".equalsIgnoreCase(replType))
-				{	
+				{
+					
 					//if dso-pnd,pnd-caspk repl dependent two pick in two wave IDS
 					//Changed by Rohan on 21-02-13 for to check repanishment wave cancel or not
 					//sqlDep1 = "SELECT PICK_ORDER,LINE_NO FROM PICK_ORD_DET WHERE REPL_ORDER = ? AND LINE_NO__REPL = ? AND PICK_ORDER <> ? ";
@@ -1293,8 +1296,11 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 							  +" AND PICK_ORDER <> ? AND D.REF_ID = P.PICK_ORDER AND D.WAVE_ID = W.WAVE_ID AND CASE WHEN W.CANCEL IS NULL THEN 'N' " 
 							  +" ELSE CANCEL END <> 'Y' ";
 				}
-				
-				
+				*/
+				sqlDep1 = "SELECT P.PICK_ORDER,P.LINE_NO FROM PICK_ORD_DET P ,WAVE_TASK W,WAVE_TASK_DET D WHERE REPL_ORDER = ? AND LINE_NO__REPL = ? "
+						  +" AND PICK_ORDER <> ? AND D.REF_ID = P.PICK_ORDER AND D.WAVE_ID = W.WAVE_ID AND CASE WHEN W.CANCEL IS NULL THEN 'N' " 
+						  +" ELSE CANCEL END <> 'Y' ";
+				//Changed by Rohan on 26-02-13 for pick reference in all cases.end
 				pstmt2 =  conn.prepareStatement(sqlDep);	
 				pstmt2.setString(1, replOrdOrg);
 				pstmt2.setString(2, replLineOrg);
@@ -1320,8 +1326,9 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 					rs2.close();
 					rs2 = null;
 				}
-				
-				if("".equalsIgnoreCase(replOrdDep) && !"Q".equalsIgnoreCase(replType))
+				//Changed by Rohan on 26-02-13 for pick reference in all cases.start
+				//if("".equalsIgnoreCase(replOrdDep) && !"Q".equalsIgnoreCase(replType))
+				if("".equalsIgnoreCase(replOrdDep))
 				{
 					pstmt2 =  conn.prepareStatement(sqlDep1);	
 					pstmt2.setString(1, replOrdOrg);