W15GSUN002 changed by wasim incase of PND location sggest first location.

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

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

@@ -18181,7 +18181,24 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				}
 				//Changed By Pragyan 11-AUG-14 To check and Facility Master implementation.end
 				 */
-				pstmtOrder.setString(1, suggLocCode);//Uncomment for Replenishments  having same case pick location.
+				
+				//Changed by wasim on 12-10-2015 to bypass if pick type is not N [START]
+				if(!"N".equalsIgnoreCase(pickType.trim()))
+				{	
+					pstmtOrder.setString(1, suggLocCode);//Uncomment for Replenishments  having same case pick location.
+					rsOrder = pstmtOrder.executeQuery();
+	
+					if(rsOrder.next())
+					{
+						int count = rsOrder.getInt("COUNT");
+	
+						if(count > 0)
+						{
+							continue;
+						}
+					}
+				}
+				/*pstmtOrder.setString(1, suggLocCode);//Uncomment for Replenishments  having same case pick location.
 				rsOrder = pstmtOrder.executeQuery();
 
 				if(rsOrder.next())
@@ -18192,7 +18209,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					{
 						continue;
 					}
-				}
+				}*/
+				//Changed by wasim on 12-10-2015 to bypass if pick type is not N [END]
+				
 				/*
 				pstmtStock.setString( 1, suggLocCode );
 				rsStock = pstmtStock.executeQuery();
@@ -18712,8 +18731,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				/*singleLotSl = checkNull(rs.getString("SINGLE_LOT_SL") );
 				itemLotOpt = checkNull(rs.getString("ITEM_LOT_OPT") );*/
 
-				quantity = 0;
-				count = 0;
+				//Changed by wasim on 12-10-2015 [START]
+				//quantity = 0;
+				//count = 0;
+				//Changed by wasim on 12-10-2015 [END]
 
 				//Changed By Pragyan 11-AUG-14 To check and Facility Master implementation.start
 				/*@@if(!commonWmsUtility.isValFacLocation(suggLocCode, siteCode, conn))
@@ -18737,31 +18758,53 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					rs1.close();
 					rs1 = null;
 				 */
-				pstmtOrder.setString(1, suggLocCode);
+				//Changed by wasim on 12-10-2015 to bypass if pick type is not N [START]
+				if(!"N".equalsIgnoreCase(pickType.trim()))
+				{	
+					pstmtOrder.setString(1, suggLocCode);
+					rsOrder = pstmtOrder.executeQuery();
+	
+					if( quantity != 0 )
+					{
+						suggLocCode = "";
+						continue;
+					}
+	
+					if(rsOrder.next())
+					{
+						count = rsOrder.getInt("COUNT");
+					}
+					
+					System.out.println("Current Count From Repl Order Location Exist Count["+count+"]");
+					pstmtOrder.clearParameters();
+					if(rsOrder != null)
+					{
+						rsOrder.close();
+						rsOrder = null;
+					}
+				}	
+				/*pstmtOrder.setString(1, suggLocCode);
 				rsOrder = pstmtOrder.executeQuery();
 
-
-
 				if( quantity != 0 )
 				{
 					suggLocCode = "";
 					continue;
 				}
 
-
-
 				if(rsOrder.next())
 				{
 					count = rsOrder.getInt("COUNT");
 				}
-
 				System.out.println("Current Count From Repl Order Location Exist Count["+count+"]");
 				pstmtOrder.clearParameters();
 				if(rsOrder != null)
 				{
 					rsOrder.close();
 					rsOrder = null;
-				}
+				}*/
+				//Changed by wasim on 12-10-2015 to bypass if pick type is not N [END]
+			
 				if(count > 0)
 				{
 					suggLocCode = "";