issues in putaway

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

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

@@ -1412,6 +1412,7 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
 						while (rs.next())
 						{
 							itemCode = rs.getString("ITEM_CODE");
+							siteCode = rs.getString("SITE_CODE");
 							locCode = rs.getString("LOC_CODE");
 							lotNo = rs.getString("LOT_NO");
 							lotSl = rs.getString("LOT_SL");
@@ -1464,7 +1465,8 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
 							//locCodeNew = getLocCode( resrvLocInvstat,  locType, locPrveZone, conn);
 							//Changed by sumit on 28/09/12 suggested location as per inv_stat.
 							//locCodeNew = getLocCode( invStatList,  locType, locPrveZone, conn)
-							locCodeNew = getLocCode(locInvStat, invStatList,  locType, locPrveZone, conn);
+							//locCodeNew = getLocCode(locInvStat, invStatList,  locType, locPrveZone, conn);
+							locCodeNew = getLocCode(locInvStat, invStatList,  locType, locPrveZone,siteCode, conn);
 							domID++;
 
 							valueXmlString.append( "<Detail3 domID='"+ domID +"' selected=\"N\">\r\n" );
@@ -1854,7 +1856,7 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
 	//Changed by Ameya on 06/09/2012 to getting reserve location [START].
 	//changed by sankara on 10/09/2012 to change the argument string to arraylist
 	//public String getLocCode(String resrvLocInvstat, String locType, int locPrefZone, Connection conn) throws RemoteException,ITMException
-	public String getLocCode(String invStat, ArrayList invStatList, String locType, int locPrefZone, Connection conn) throws RemoteException,ITMException
+	public String getLocCode(String invStat, ArrayList invStatList, String locType, int locPrefZone,String siteCode, Connection conn) throws RemoteException,ITMException
 	{
 		String sql = "";
 		String stockSql = "";
@@ -1891,7 +1893,7 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
 				}
 				cntList++;
 			}
-			
+			System.out.println( "invStstPars ["+invStstPars+"]");
 			// Changed by sankara on 27/08/13 for optimized the sql start.
 			//Changed by ameya on 14/09/2012 End
 			/*System.out.println(" invStstPars -----> ["+invStstPars+"]");
@@ -1911,16 +1913,44 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
 		
 			pstmtStock =  conn.prepareStatement(stockSql);*/
 			
-			sql =  " SELECT LOC_CODE, LOC_ZONE, LOC_TYPE FROM ( SELECT A.LOC_CODE AS LOC_CODE, A.LOC_ZONE AS LOC_ZONE, A.LOC_TYPE AS LOC_TYPE " +
+			/*sql =  " SELECT LOC_CODE, LOC_ZONE, LOC_TYPE FROM ( SELECT A.LOC_CODE AS LOC_CODE, A.LOC_ZONE AS LOC_ZONE, A.LOC_TYPE AS LOC_TYPE " +
 			   " FROM LOCATION A, INVSTAT B , STOCK S WHERE A.INV_STAT = B.INV_STAT AND B.AVAILABLE = 'Y' " +
 			   " AND (CASE WHEN B.STAT_TYPE IS NULL THEN ' ' ELSE B.STAT_TYPE END) <> 'S' " +
 			   " AND S.INV_STAT = A.INV_STAT AND S.INV_STAT = B.INV_STAT AND S.LOC_CODE = A.LOC_CODE AND  A.LOC_TYPE = ? AND A.INV_STAT IN ("+invStstPars+") " +
 			   " GROUP BY A.LOC_CODE, A.LOC_ZONE, A.LOC_TYPE HAVING SUM (CASE WHEN S.QUANTITY IS NULL THEN 0 ELSE S.QUANTITY END) < = 0 ) " +
-			   " ORDER BY ABS(LOC_ZONE - ?), LOC_CODE " ;
+			   " ORDER BY ABS(LOC_ZONE - ?), LOC_CODE " ;*/
+			sql =  " SELECT LOC_CODE,LOC_ZONE,LOC_TYPE FROM (SELECT A.LOC_CODE, A.LOC_ZONE, A.LOC_TYPE FROM LOCATION A ,INVSTAT B "
+				   + " WHERE A.INV_STAT =B.INV_STAT AND B.AVAILABLE = 'Y' AND A.LOC_TYPE = ? " 
+				   + " AND A.INV_STAT IN ("+invStstPars+") " 
+				   + " AND (CASE WHEN B.STAT_TYPE IS NULL THEN ' ' ELSE B.STAT_TYPE END) <> 'S' " 
+				   + " AND A.LOC_CODE NOT IN (SELECT LOC_CODE FROM STOCK WHERE " 
+				   + " SITE_CODE= ? AND INV_STAT IN ("+invStstPars+") " 
+				   + " GROUP BY LOC_CODE " 
+				   + " HAVING SUM (CASE WHEN QUANTITY IS NULL THEN 0 ELSE  QUANTITY END) > 0) " 
+				   + " ORDER BY  ABS(A.LOC_ZONE - ?),A.LOC_CODE ) WHERE ROWNUM < 5" ;
+				  
 			// Changed by sankara on 27/08/13 for optimized the sql end.	
 
 			pstmt =  conn.prepareStatement(sql);
+			
 			pstmt.setString(1, locType);
+			for(cntList=0 ; cntList<invStatList.size(); cntList++)
+			{
+				System.out.println( "inv stat ["+(String)invStatList.get(cntList)+"]");
+				pstmt.setString( (cntList+2), (String)invStatList.get(cntList));
+			}
+			System.out.println( "CNT List count ["+cntList+"]");
+			pstmt.setString(cntList+2, siteCode);
+			int k = cntList+2;
+			for(cntList=0 ; cntList<invStatList.size(); cntList++)
+			{
+				k = k + 1;
+				System.out.println( "Current k value["+k+"]");
+				pstmt.setString( k , (String)invStatList.get(cntList));
+			}
+			System.out.println( "Final k value["+k+"]");
+			pstmt.setInt(k + 1, locPrefZone);
+			/*pstmt.setString(1, locType);
 			//Changed by ameya on 14/09/2012 Start
 			//Changed by Sankara on 10/09/2012 to get three locations[start]
 			//pstmt.setString(2, resrvLocInvstat);
@@ -1935,8 +1965,9 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
 			{
 				pstmt.setString( (cntList+2), (String)invStatList.get(cntList));
 			}
-			pstmt.setInt(cntList+2, locPrefZone);
-			//Changed by Sankara on 10/09/2012 to get three locations[end]
+			pstmt.setString(cntList+2, siteCode);
+			pstmt.setInt(cntList+3, locPrefZone);
+			*///Changed by Sankara on 10/09/2012 to get three locations[end]
 			//Changed by ameya on 14/09/2012 End
 			
 			rs = pstmt.executeQuery();