Changed by Rohan on 07-02-13 not consider pnd replanishment in case of active repanishment

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

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

@@ -18839,12 +18839,25 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 								  +" AND D.ITEM_CODE = S.ITEM_CODE AND  D.SITE_CODE =  S.SITE_CODE "
 								  +" AND  D.LOT_NO =  S.LOT_NO AND  D.LOT_SL = S.LOT_SL AND D.ACTUAL_QTY > 0";
 			    */
+				/*
 		        sqlReplHistory = "SELECT D.LOC_CODE,D.REPL_ORDER,D.QUANTITY,D.ACTUAL_QTY,D.LOC_CODE__TO,D.LINE_NO,D.PICK_ORDER,"
 		        				+ " D.LINE_NO__PICK,S.QUANTITY AS STK_QTY FROM REPL_ORD_DET D,STOCK S ,LOCATION L WHERE D.ITEM_CODE = ? AND "
 		        				+" D.SITE_CODE = ? AND D.LOT_NO = ? AND D.LOT_SL = ?"
 		        				+" AND D.ITEM_CODE = S.ITEM_CODE AND  D.SITE_CODE =  S.SITE_CODE "
 		        				+" AND  D.LOT_NO =  S.LOT_NO AND  D.LOT_SL = S.LOT_SL AND D.LOC_CODE__TO = L.LOC_CODE AND L.INV_STAT IN( ?,? ) " 
 		        				+" AND D.ACTUAL_QTY > 0 ";
+		       */ 				
+			    //Changed by Rohan on 06-02-13 to retrive only case Repalnishment.end
+		        
+		        //Chnged by Rohan on 07-02-13 not consider pnd repanishment in case of active repanishment
+				
+		        sqlReplHistory = "SELECT D.LOC_CODE,D.REPL_ORDER,D.QUANTITY,D.ACTUAL_QTY,D.LOC_CODE__TO,D.LINE_NO,D.PICK_ORDER,"
+		        				+ " D.LINE_NO__PICK,S.QUANTITY AS STK_QTY FROM REPL_ORD_DET D,STOCK S ,LOCATION L,REPL_ORD_HDR H WHERE D.ITEM_CODE = ? AND "
+		        				+" D.SITE_CODE = ? AND D.LOT_NO = ? AND D.LOT_SL = ?"
+		        				+" AND D.ITEM_CODE = S.ITEM_CODE AND  D.SITE_CODE =  S.SITE_CODE "
+		        				+" AND  D.LOT_NO =  S.LOT_NO AND  D.LOT_SL = S.LOT_SL AND D.LOC_CODE__TO = L.LOC_CODE AND L.INV_STAT IN( ?,? ) " 
+		        				+" AND H.REPL_ORDER = D.REPL_ORDER AND H.ORDER_TYPE NOT IN('Q','T','P','E','I') AND D.ACTUAL_QTY > 0 ";
+		        
 			    //Changed by Rohan on 06-02-13 to retrive only case Repalnishment.end
 				pstmtReplHistory =conn.prepareStatement(sqlReplHistory);
 				pstmtReplHistory.setString(1, itemCodeHis);