Chnaged by Rohan on 06-03-13 for Wave Cancellation

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

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

@@ -1146,12 +1146,14 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 		String sqlReplConf = "";
 		String replOrd1 = "";
 		String replLine1 ="";
+		String checkInvStat = "";
 		//Changed by Rohan on 18-02-13 for checking repanishment confirm.end
 	    DistCommon discommon = new DistCommon();
 	    String casePickLoc  = discommon.getDisparams("999999","CASE_PICK_INVSTAT",conn);
 	    String activePickLoc  = discommon.getDisparams("999999","ACTIVE_PICK_INVSTAT",conn);
 	    String deepStoreLoc = discommon.getDisparams("999999","DEEP_STORE_INVSTAT",conn);
 	    String psoLoc  = discommon.getDisparams("999999","RESERV_LOCATION",conn);
+	    String pndLoc = discommon.getDisparams("999999","PND_INVSTAT",conn);
 	    
 		double actQty = 0d;
 		  
@@ -1187,14 +1189,17 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 			sqlReplConf = "SELECT COUNT(*) AS COUNT FROM REPL_ISS_DET WHERE REPL_ORDER = ? AND LINE_NO__ORD = ?";
 			pstmt2 =  conn.prepareStatement(sqlReplConf);
 			
-			sql = "SELECT PICK_ORDER,LINE_NO__PICK FROM REPL_ORD_DET WHERE REPL_ORDER = ? AND LINE_NO = ? ";
+			//Changed by Rohan on 06-03-13 for checking pnd repalinshment
+			//sql = "SELECT PICK_ORDER,LINE_NO__PICK FROM REPL_ORD_DET WHERE REPL_ORDER = ? AND LINE_NO = ? ";
+			sql = "SELECT R.PICK_ORDER,R.LINE_NO__PICK,L.INV_STAT FROM REPL_ORD_DET R,LOCATION L " +
+					"WHERE R.REPL_ORDER = ? AND R.LINE_NO = ? AND L.LOC_CODE = R.LOC_CODE ";
 			pstmt1 =  conn.prepareStatement(sql);
 			
 			replOrd1 = replOrdOrg;
 			replLine1 = replLineOrg;
 			do
 			{	
-					
+	
 				pstmt2.setString(1, replOrd1);
 				pstmt2.setString(2, replLine1);
 				rs2 = pstmt2.executeQuery();
@@ -1218,6 +1223,7 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 				{
 					replOrd1 = checkNull(rs1.getString("PICK_ORDER"));
 					replLine1 = rs1.getString("LINE_NO__PICK");
+					checkInvStat = checkNull(rs1.getString("INV_STAT"));
 				}
 				//to check dso-pnd repanishment exist.end
 				
@@ -1225,7 +1231,7 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 				pstmt2.clearParameters();
 				
 			}	
-			while(!"".equalsIgnoreCase(replOrd1));
+			while(!"".equalsIgnoreCase(replOrd1) && checkInvStat.trim().equalsIgnoreCase(pndLoc.trim()));
 			
 			if(pstmt1 != null)
 			{