W16ASUN024 added ref series in query and considering suffix R location

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

webitm-wms/ibase/webitm/utility/wms/StatusChangeRequest.java

@@ -189,7 +189,8 @@ public class StatusChangeRequest implements Schedule {
 				palletNo = (palletNo.charAt(palletNo.trim().length()-1)=='Q') || (palletNo.charAt(palletNo.trim().length()-1)=='M') || 
 						   (palletNo.charAt(palletNo.trim().length()-1)=='S') || (palletNo.charAt(palletNo.trim().length()-1)=='B') ||
 						   (palletNo.charAt(palletNo.trim().length()-1)=='X') || (palletNo.charAt(palletNo.trim().length()-1)=='U') || 
-						   (palletNo.charAt(palletNo.trim().length()-1)=='P') ? palletNo.substring(0,palletNo.trim().length()-1):palletNo;
+						   (palletNo.charAt(palletNo.trim().length()-1)=='P') || (palletNo.charAt(palletNo.trim().length()-1)=='R') //Changed by wasim on 02-05-2016 to consider rejected location with suffix R 
+						   ? palletNo.substring(0,palletNo.trim().length()-1):palletNo;
 				System.out.println("Pallet No After removing suffix: "+palletNo);		   
 				//Changed by wasim on 23-01-2016 to consider other suffix locations aprt from Q [END]
 					
@@ -424,7 +425,7 @@ public class StatusChangeRequest implements Schedule {
 			//Changed by wasim on 25-04-2016 to not to consider tran_id which is requeted from metis [START]	
 			//sql = " SELECT TRAN_ID FROM PHYSCAN WHERE SITE_CODE = ? AND TRAN_DATE = ?";
 			  sql = "SELECT P.TRAN_ID FROM PHYSCAN P WHERE P.SITE_CODE = ? AND P.TRAN_DATE = ? "
-			  		+ "AND P.TRAN_ID NOT IN (SELECT REF_ID FROM SWMS_TO_AWMS WHERE REF_ID = P.TRAN_ID)";
+			  		+ "AND P.TRAN_ID NOT IN (SELECT REF_ID FROM SWMS_TO_AWMS WHERE REF_ID = P.TRAN_ID AND REF_SER = 'PSCAN')";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, loginSiteCode);
 				pstmt.setTimestamp(2, getCurrtDate());
@@ -450,7 +451,7 @@ public class StatusChangeRequest implements Schedule {
 						
 						sqlPhyScan = " SELECT D.LINE_NO,D.ITEM_CODE,D.LOT_NO,D.LOT_SL,D.LOC_CODE,D.QUANTITY"
 						            +" FROM PHYSCAN P,PHYSCANDET D,LOCATION L WHERE P.TRAN_ID = D.TRAN_ID AND P.TRAN_ID = ?"
-						            +" AND P.TRAN_ID NOT IN (SELECT REF_ID FROM SWMS_TO_AWMS WHERE REF_ID = ?)"
+						            +" AND P.TRAN_ID NOT IN (SELECT REF_ID FROM SWMS_TO_AWMS WHERE REF_ID = ? AND REF_SER = 'PSCAN')"
 						            +" AND L.LOC_CODE = D.LOC_CODE AND L.INV_STAT IN ("+invStat+")";
 						
 						pstmtPhyscan = conn.prepareStatement(sqlPhyScan);
@@ -477,7 +478,8 @@ public class StatusChangeRequest implements Schedule {
 							palletNo = (palletNo.charAt(palletNo.trim().length()-1)=='Q') || (palletNo.charAt(palletNo.trim().length()-1)=='M') || 
 									   (palletNo.charAt(palletNo.trim().length()-1)=='S') || (palletNo.charAt(palletNo.trim().length()-1)=='B') ||
 									   (palletNo.charAt(palletNo.trim().length()-1)=='X') || (palletNo.charAt(palletNo.trim().length()-1)=='U') || 
-									   (palletNo.charAt(palletNo.trim().length()-1)=='P') ? palletNo.substring(0,palletNo.trim().length()-1):palletNo;
+									   (palletNo.charAt(palletNo.trim().length()-1)=='P') || (palletNo.charAt(palletNo.trim().length()-1)=='R')//Changed by wasim on 02-05-016 to consider R location for considering damage location
+									   ? palletNo.substring(0,palletNo.trim().length()-1):palletNo;
 							System.out.println("Pallet No After removing suffix: "+palletNo);	
 							
 							HashMap<String,String> interfaceHmap = new HashMap<String,String>();