Changed by Rohan on 22-02-13 for Repanishment cancle.

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

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

@@ -1265,6 +1265,8 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 				}
 			}
 			//to check PICK wave id and reference Repanishment WAVE_ID different.end
+			
+			//Changed by Rohan on 21-02-13 for checkig
 			if(!isDepRepl)
 			{
 				
@@ -1285,7 +1287,11 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 				if(!"Q".equalsIgnoreCase(replType))
 				{	
 					//if dso-pnd,pnd-caspk repl dependent two pick in two wave IDS
-					sqlDep1 = "SELECT PICK_ORDER,LINE_NO FROM PICK_ORD_DET WHERE REPL_ORDER = ? AND LINE_NO__REPL = ? AND PICK_ORDER <> ? ";
+					//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 <> ? ";
+					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' ";
 				}