Changed by Rohan on 22-02-13 for repanishment wave cancel.

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

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

@@ -16346,6 +16346,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 	//Changed By Sankara 08/04/12 To pass the argument items Location Type.
 	//Changed By Pragyan Demo4.start
 	//private ArrayList getAvilablePickLocationList(String pickType,Connection conn) throws ITMException
+	//Changed by Rohan on 22-02-13 not used in code.start
+	/*
 	private ArrayList getAvilablePickLocationList(String pickType,Connection conn,String itemLocType) throws ITMException
 	{
 		String sql = "";
@@ -16370,7 +16372,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 		pndInvstat = discommon.getDisparams("999999","PND_INVSTAT",conn);
 		reserveInvStat = discommon.getDisparams("999999","RESERV_LOCATION",conn);
 		*/
-		
+		/*
 		try
 		{
 			
@@ -16525,7 +16527,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 		}
 	 return sugstLocList;	
 	}
+    */
 	//Changed by sumit on 06/08/12 changing method parameter
+	//Changed by Rohan on 22-02-13 not used in code.end
 	//private String getAvilablePickLocation(String pickType,Connection conn,String itemLocType) throws ITMException
 	private String getAvilablePickLocation(String pickType,Connection conn,String itemLocType,int locPrefZone, String locCode,String itemCode,String siteCode,String lotNo,String lpnNo) throws ITMException
 	{
@@ -16580,8 +16584,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 			sqlItemLotOpt1 = "SELECT COUNT(*) AS COUNT FROM STOCK WHERE  ITEM_CODE <> ? AND SITE_CODE = ? AND LOC_CODE = ? AND QUANTITY > 0";
 
 			//orderSql = "SELECT COUNT(*) AS COUNT FROM REPL_ORD_DET  WHERE LOC_CODE__TO = ?";
+			//Changed by Rohan on 19-02-13  free location form cancle Repanishment
+			//orderSql = "SELECT COUNT(*) AS COUNT FROM REPL_ORD_DET O  WHERE O.LOC_CODE__TO = ? AND NOT EXISTS (SELECT 1 FROM REPL_ISS_HDR I WHERE I.REPL_ORDER = O.REPL_ORDER AND I.CONFIRMED = 'Y') "; //changes done by Ashish Sonawane on 10-jul-12
 			
-			orderSql = "SELECT COUNT(*) AS COUNT FROM REPL_ORD_DET O  WHERE O.LOC_CODE__TO = ? AND NOT EXISTS (SELECT 1 FROM REPL_ISS_HDR I WHERE I.REPL_ORDER = O.REPL_ORDER AND I.CONFIRMED = 'Y') "; //changes done by Ashish Sonawane on 10-jul-12
+			orderSql = "SELECT COUNT(*) AS COUNT FROM REPL_ORD_DET O  WHERE O.LOC_CODE__TO = ? " 
+					  +" AND CASE WHEN CANCEL_MODE IS NULL THEN 'N' ELSE CANCEL_MODE END <> 'Y' " 
+					  +" AND NOT EXISTS (SELECT 1 FROM REPL_ISS_HDR I WHERE I.REPL_ORDER = O.REPL_ORDER AND I.CONFIRMED = 'Y') ";
 			
 			if ( "A".equalsIgnoreCase(pickType.trim()) )//Active pick
 			{
@@ -17062,8 +17070,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 			sqlItemLotOpt0 = "SELECT COUNT(*) AS COUNT FROM STOCK WHERE (ITEM_CODE <> ? OR LOT_NO <> ?) AND SITE_CODE = ? AND LOC_CODE = ? AND QUANTITY > 0"; //AND LOT_NO <> ?"
 			
 			sqlItemLotOpt1 = "SELECT COUNT(*) AS COUNT FROM STOCK WHERE  ITEM_CODE <> ? AND SITE_CODE = ? AND LOC_CODE = ? AND QUANTITY > 0";
-			
-			orderSql = "SELECT COUNT(*) AS COUNT FROM REPL_ORD_DET O  WHERE O.LOC_CODE__TO = ? AND NOT EXISTS (SELECT 1 FROM REPL_ISS_HDR I WHERE I.REPL_ORDER = O.REPL_ORDER AND I.CONFIRMED = 'Y') "; //changes done by Ashish Sonawane on 10-jul-12
+			//Changed by Rohan on 19-02-13  free location form cancle Repanishment
+			//orderSql = "SELECT COUNT(*) AS COUNT FROM REPL_ORD_DET O  WHERE O.LOC_CODE__TO = ? AND NOT EXISTS (SELECT 1 FROM REPL_ISS_HDR I WHERE I.REPL_ORDER = O.REPL_ORDER AND I.CONFIRMED = 'Y') "; //changes done by Ashish Sonawane on 10-jul-12
+			orderSql = "SELECT COUNT(*) AS COUNT FROM REPL_ORD_DET O  WHERE O.LOC_CODE__TO = ? " 
+					  +" AND CASE WHEN CANCEL_MODE IS NULL THEN 'N' ELSE CANCEL_MODE END <> 'Y' " 
+					  +" AND NOT EXISTS (SELECT 1 FROM REPL_ISS_HDR I WHERE I.REPL_ORDER = O.REPL_ORDER AND I.CONFIRMED = 'Y') ";
 			
 			if ( "A".equalsIgnoreCase(pickType.trim()) )
 			{
@@ -19063,9 +19074,7 @@ 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";
 			    */
-			 	//Chnged by Rohan on 07-02-13 not consider pnd repanishment in case of active repanishment
-				
-				System.out.println("HGTRRRRRR");
+			 	//Changed 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 "
@@ -19074,13 +19083,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 	        				//Changed by Rohan on 13-02-13 add partial reserv location in map.start
 	        				
 	        				+" 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 ";
+	        				//Change by Rohan on 19-02-13 to not select cancle repanishment & add stock > 0
+	        				//+" AND H.REPL_ORDER = D.REPL_ORDER AND H.ORDER_TYPE NOT IN('Q','T','P','E','I') AND D.ACTUAL_QTY > 0 ";
+	        				+" AND CASE WHEN CANCEL_MODE IS NULL THEN 'N' ELSE CANCEL_MODE END <> 'Y'  "
+	        				+" AND H.REPL_ORDER = D.REPL_ORDER AND H.ORDER_TYPE NOT IN('Q','T','P','E','I') AND D.ACTUAL_QTY > 0 AND S.QUANTITY > 0 ";
 	        				
-	        				/*
-	        				+" 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','P','E','I') AND D.ACTUAL_QTY > 0 ";
-							//Changed by Rohan on 13-02-13 add partial reserv location in map.end
-	        				*/
 				//Changed by Rohan on 06-02-13 to retrive only case Repalnishment.end
 	        			
 				pstmtReplHistory =conn.prepareStatement(sqlReplHistory);
@@ -19093,11 +19100,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				pstmtReplHistory.setString(5, casePickInv);
 				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);
 				
-				//Changed By Rohan
-				//pstmtReplHistory.setString(5, locCodeHis);
 				rsReplHistory = pstmtReplHistory.executeQuery();
 				
 				while (rsReplHistory.next())
@@ -21089,12 +21092,16 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				if(replType == "")
 				{
 					sql= "SELECT R.REPL_ORDER,R.LINE_NO,R.PICK_ORDER,R.LINE_NO__PICK,R.LOC_CODE__TO,R.ACTUAL_QTY FROM REPL_ORD_DET R WHERE R.ITEM_CODE = ? AND R.SITE_CODE = ? "
-						+" AND R.LOC_CODE = ? AND R.LOT_NO = ? AND R.LOT_SL = ? AND R.REPL_TYPE IS NULL AND R.ACTUAL_QTY > 0";
+						//Change by Rohan on 20-02-13 not select uncacle repanishment.	
+						//+" AND R.LOC_CODE = ? AND R.LOT_NO = ? AND R.LOT_SL = ? AND R.REPL_TYPE IS NULL AND R.ACTUAL_QTY > 0";
+					     +" AND R.LOC_CODE = ? AND R.LOT_NO = ? AND R.LOT_SL = ? AND CASE WHEN R.CANCEL_MODE IS NULL THEN 'N' ELSE R.CANCEL_MODE END <> 'Y' AND R.REPL_TYPE IS NULL AND R.ACTUAL_QTY > 0 ";
 				}
 				else
 				{
 					sql= "SELECT R.REPL_ORDER,R.LINE_NO,R.PICK_ORDER,R.LINE_NO__PICK,R.LOC_CODE__TO,R.ACTUAL_QTY FROM REPL_ORD_DET R WHERE R.ITEM_CODE = ? AND R.SITE_CODE = ? "
-						+" AND R.LOC_CODE = ? AND R.LOT_NO = ? AND R.LOT_SL = ? AND R.REPL_TYPE = ? AND R.ACTUAL_QTY > 0";
+							//Chnage by Rohan on 20-02-13 not select uncacel repanishment	
+						//+" AND R.LOC_CODE = ? AND R.LOT_NO = ? AND R.LOT_SL = ? AND R.REPL_TYPE = ? AND R.ACTUAL_QTY > 0";
+						+" AND R.LOC_CODE = ? AND R.LOT_NO = ? AND R.LOT_SL = ? AND CASE WHEN R.CANCEL_MODE IS NULL THEN 'N' ELSE R.CANCEL_MODE END <> 'Y' AND R.REPL_TYPE = ? AND R.ACTUAL_QTY > 0";
 				}