Changed by Rohan on 14-02-13 for partial reverse

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

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

@@ -2626,7 +2626,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				}*/
 				//Changed By Pragyan to check partial cases on Allocate Quantity.
 				//if((pendingQty % packSize1) > 0)
-				if((allocQty % packSize1) > 0 || (allocQty < packSize1))
+				
+				if((allocQty % packSize1) > 0 || (allocQty < packSize1))			
 				{
 					isActives = true;
 					orderByStkStr = "AND LOCATION.INV_STAT IN(?,?,?,?,?) ORDER BY STOCK.EXP_DATE,INVSTAT.ALLOC_PREF, STOCK.LOC_CODE ";
@@ -2916,8 +2917,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					int lineNoRepl=0;
 					
 					invStat = invStat != null?invStat.trim():"";
-					
-					if((invStat.equalsIgnoreCase(resrvLoc) || invStat.equalsIgnoreCase(deepStoreLoc)) && (lotQtyToBeAllocated >= packSizeActive) )
+					//Changed by Rohna on 14-02-13 to add stock qtantity in map in case of partial reserv location
+					//if((invStat.equalsIgnoreCase(resrvLoc) || invStat.equalsIgnoreCase(deepStoreLoc)) && (lotQtyToBeAllocated >= packSizeActive) )
+					System.out.println("invStatLLLL___>"+invStat);
+					if(((invStat.equalsIgnoreCase(resrvLoc) || invStat.equalsIgnoreCase(deepStoreLoc)) && (lotQtyToBeAllocated >= packSizeActive)) || invStat.equalsIgnoreCase(partialResrvLoc))
 					{
 						System.out.println("Inside For Creating Repelnishment packSizeActive["+packSizeActive+"]lotQtyToBeAllocated["+lotQtyToBeAllocated+"]");
 					
@@ -2952,7 +2955,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 		    				tempMapReplenishment.put("STOCK_QTY",qtyAvailAlloc);
 		    				tempListForRepl.add(tempMapReplenishment);
 		    				itemInfoMapForRepl.put(itemCode+":"+siteCode+":"+lotNo+":"+lotSl+":"+locCode, tempListForRepl);
-		    				System.out.println("itemInfoMapForReplPPPPPPPPPPPPPPPPPPP"+itemInfoMapForRepl);
+		    				System.out.println("itemInfoMapForReplPPPPPPPPPPPPPPPPPPP"+itemInfoMapForRepl.toString());
 		    				
 		    				System.out.println("prevsLocCode ["+prevsLocCode+"]");
 		                	System.out.println("Location Code To Found To Create Replenishment  Before ["+locCodeTo+"]");
@@ -14508,9 +14511,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 								{
 									
 									System.out.println("Inside Normal Block...");
-									//Changed by Rohan on 13-02-13 for passing connection 
-									//double stkQty = getStockQty(itemCode, siteCode, lotNo, lotSl, locCode);
-									double stkQty = getStockQty(itemCode, siteCode, lotNo, lotSl, locCode,conn);
+									
+									double stkQty = getStockQty(itemCode, siteCode, lotNo, lotSl, locCode);
+									
 									System.out.println("Stock Quantity"+stkQty);
 									//if(locInvStat.equalsIgnoreCase(invDeepReserve) || locInvStat.equalsIgnoreCase(invReserve) ||  locInvStat.equalsIgnoreCase(casePickInv))
 									System.out.println("locInvStat::::::>>>>>>>>:::::"+locInvStat);
@@ -18819,29 +18822,18 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 		return returnString;
 	}
 	
-	//Chnaged by Rohan on 13-02-13 for getting stock quantity.start
-	//private double getStockQty(String itemCode,String siteCode,String lotNo,String lotSl,String locCode) throws ITMException
-	private double getStockQty(String itemCode,String siteCode,String lotNo,String lotSl,String locCode,Connection conn) throws ITMException
+	private double getStockQty(String itemCode,String siteCode,String lotNo,String lotSl,String locCode) throws ITMException
 	{
 		double stockQuantity = 0.0;
-		String sql = "";
-		PreparedStatement pstmt = null;
-		ResultSet rs = null;
-		
-				
 		try
 		{
 		
-			/*Changed by Rohna on 14-02-13 for bug fixing
 			ArrayList tempItemInfoList = null;
 			
-			System.out.println("Enter in getStock QTY");
 			if(itemInfoMapForRepl.containsKey(itemCode+":"+siteCode+":"+lotNo+":"+lotSl+":"+locCode))
 			{
-				System.out.println("***************************************************");
 				tempItemInfoList = (ArrayList) itemInfoMapForRepl.get(itemCode+":"+siteCode+":"+lotNo+":"+lotSl+":"+locCode);
 				
-				System.out.println("HTREEEEEEEEEEEEEEEEEEEEEEEEEEEE");
 				Iterator itemIterator= tempItemInfoList.iterator();
 				
 				while(itemIterator.hasNext())
@@ -18851,55 +18843,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				    {
 				    	stockQuantity =(Double)itemSitemap.get("STOCK_QTY");
 				    }
-				}
 			}
-			//Chnaged by Rohan on 13-02-13 for getting stock quantity.start
-			else
-			{
-			*/
-				System.out.println("****&&&&&&&&&&&&&");
-				sql =" SELECT QUANTITY FROM STOCK WHERE ITEM_CODE = ? AND SITE_CODE = ? AND LOC_CODE = ? AND LOT_NO = ? AND LOT_SL = ? "
-					 +" AND (QUANTITY - ALLOC_QTY - CASE WHEN HOLD_QTY IS NULL THEN 0 ELSE HOLD_QTY END) > 0 "	;
-				pstmt =  conn.prepareStatement(sql);
-				pstmt.setString(1, itemCode);
-				pstmt.setString(2, siteCode);
-				pstmt.setString(3, locCode);
-				pstmt.setString(4, lotNo);
-				pstmt.setString(5, lotSl);
-				
-				rs = pstmt.executeQuery();
-				if(rs.next())
-				{
-					stockQuantity = rs.getDouble("QUANTITY");
-				}
-			//}
-			//Chnaged by Rohan on 13-02-13 for getting stock quantity.end
+			}
 		}
 		catch(Exception e)
 		{
 			throw new ITMException(e);
 		}
-		//Chnaged by Rohan
-		finally
-		{
-			try
-			{
-				if(pstmt != null)
-				{
-					pstmt.close();
-					pstmt = null;
-				}
-				if(rs != null)
-				{
-					rs.close();
-					rs= null;
-				}
-			}
-			catch(Exception e)
-			{
-				throw new ITMException(e);
-			}
-		}
+		
 		return stockQuantity;
 	}
 	
@@ -18998,7 +18949,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				pstmtReplHistory.setString(6, pndLoc);
 				//Changed by Rohan on 06-02-13 to retrve only case Repalnishment.end
 				//Changed by Rohan on 13-02-13 add partial reserv location in map
-				///pstmtReplHistory.setString(7, activePickLoc);
+				//pstmtReplHistory.setString(7, activePickLoc);
 				
 				//Changed By Rohan
 				//pstmtReplHistory.setString(5, locCodeHis);