lookup related changes

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

webitm-dashboard/ibase/dashboard/mfg/servlet/DelayDaysProductionSummaryServlet.java

 package ibase.dashboard.mfg.servlet;
+import ibase.dashboard.mfg.ejb.MFGDashboard;
 import ibase.dashboard.mfg.ejb.MFGDashboardRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.webitm.utility.ITMException;
@@ -24,7 +25,7 @@ public class DelayDaysProductionSummaryServlet extends HttpServlet
 	@SuppressWarnings("unchecked")
 	public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
-		MFGDashboardRemote recallDetailsRemote = null;
+		//MFGDashboardRemote recallDetailsRemote = null;
 		InitialContext context                = null;
 		AppConnectParm appConnectParm         = new AppConnectParm();
 		JSONObject jsonObjData                = null;
@@ -54,8 +55,13 @@ public class DelayDaysProductionSummaryServlet extends HttpServlet
 			fromDate			=request.getParameter("fromDate");
 			toDate				=request.getParameter("toDate");			 
 			context        		= new InitialContext(appConnectParm.getProperty());
-			recallDetailsRemote = (MFGDashboardRemote) context.lookup("ibase/MFGDashboard/remote");
-			jsonObjData         = (JSONObject) recallDetailsRemote.getDelayDaysProductionSumm(dataSourceName, businessType, facilityCode,selectedView,sessionSiteCode,fromDate,toDate);			
+			//---Start---Modified by Jaffar S. for lookup changes on 30-07-18
+			/*recallDetailsRemote = (MFGDashboardRemote) context.lookup("ibase/MFGDashboard/remote");
+			jsonObjData         = (JSONObject) recallDetailsRemote.getDelayDaysProductionSumm(dataSourceName, businessType, facilityCode,selectedView,sessionSiteCode,fromDate,toDate);*/
+			MFGDashboard mfgDashboard = new MFGDashboard();
+			jsonObjData         = (JSONObject) mfgDashboard.getDelayDaysProductionSumm(dataSourceName, businessType, facilityCode,selectedView,sessionSiteCode,fromDate,toDate);
+			mfgDashboard        = null;
+			//---End---Modification by Jaffar S. for lookup changes on 30-07-18			
 			outputStream        = response.getOutputStream();
 		    outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/mfg/servlet/DelayProductionDetServlet.java

 package ibase.dashboard.mfg.servlet;
+import ibase.dashboard.mfg.ejb.MFGDashboard;
 import ibase.dashboard.mfg.ejb.MFGDashboardRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.utility.UserInfoBean;
@@ -26,7 +27,7 @@ public class DelayProductionDetServlet extends HttpServlet
 	@SuppressWarnings("unchecked")
 	public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
-		MFGDashboardRemote recallDetailsRemote = null;
+		//MFGDashboardRemote recallDetailsRemote = null;
 		InitialContext context                = null;
 		AppConnectParm appConnectParm         = new AppConnectParm();
 		JSONObject jsonObjData                = null;
@@ -58,8 +59,13 @@ public class DelayProductionDetServlet extends HttpServlet
 		    System.out.println("in DelayProductionDetServlet selectedView :"+selectedView +"getting session=="+sessionSiteCode);
 			 
 			context             = new InitialContext(appConnectParm.getProperty());
-			recallDetailsRemote = (MFGDashboardRemote) context.lookup("ibase/MFGDashboard/remote");
-			jsonObjData         = (JSONObject) recallDetailsRemote.getDelayProductionDet(dataSourceName, businessType, facilityCode,selectedView,sessionSiteCode,fromDate,toDate);			
+			//---Start---Modified by Jaffar S. for lookup changes on 30-07-18
+			/*recallDetailsRemote = (MFGDashboardRemote) context.lookup("ibase/MFGDashboard/remote");
+			jsonObjData         = (JSONObject) recallDetailsRemote.getDelayProductionDet(dataSourceName, businessType, facilityCode,selectedView,sessionSiteCode,fromDate,toDate);*/
+			MFGDashboard mfgDashboard = new MFGDashboard();
+			jsonObjData         = (JSONObject) mfgDashboard.getDelayProductionDet(dataSourceName, businessType, facilityCode,selectedView,sessionSiteCode,fromDate,toDate);
+			mfgDashboard        = null;
+			//---End---Modification by Jaffar S. for lookup changes on 30-07-18	
 			outputStream        = response.getOutputStream();
 		    outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/mfg/servlet/DelayProductionSummaryServlet.java

 package ibase.dashboard.mfg.servlet;
+import ibase.dashboard.mfg.ejb.MFGDashboard;
 import ibase.dashboard.mfg.ejb.MFGDashboardRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.webitm.utility.ITMException;
@@ -24,7 +25,7 @@ public class DelayProductionSummaryServlet extends HttpServlet
 	@SuppressWarnings("unchecked")
 	public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
-		MFGDashboardRemote recallDetailsRemote = null;
+		//MFGDashboardRemote recallDetailsRemote = null;
 		InitialContext context                = null;
 		AppConnectParm appConnectParm         = new AppConnectParm();
 		JSONObject jsonObjData                = null;
@@ -52,8 +53,13 @@ public class DelayProductionSummaryServlet extends HttpServlet
 			fromDate			=request.getParameter("fromDate");
 			toDate				=request.getParameter("toDate");			 
 			context        		= new InitialContext(appConnectParm.getProperty());
-			recallDetailsRemote = (MFGDashboardRemote) context.lookup("ibase/MFGDashboard/remote");
-			jsonObjData         = (JSONObject) recallDetailsRemote.getDelayProductionSumm(dataSourceName, businessType, facilityCode,selectedView,sessionSiteCode,fromDate,toDate);			
+			//---[Start]---Modified by Jaffar S. for lookup changes on 30-07-18
+			/*recallDetailsRemote = (MFGDashboardRemote) context.lookup("ibase/MFGDashboard/remote");
+			jsonObjData         = (JSONObject) recallDetailsRemote.getDelayProductionSumm(dataSourceName, businessType, facilityCode,selectedView,sessionSiteCode,fromDate,toDate);*/
+			MFGDashboard mfgDashboard = new MFGDashboard();
+			jsonObjData         = (JSONObject) mfgDashboard.getDelayProductionSumm(dataSourceName, businessType, facilityCode,selectedView,sessionSiteCode,fromDate,toDate);
+			mfgDashboard        = null;
+			//---[End]---Modification by Jaffar S. for lookup changes on 30-07-18			
 			outputStream        = response.getOutputStream();
 		    outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/mfg/servlet/HalolMFGCommitVsActualServlet.java

 package ibase.dashboard.mfg.servlet;
+import ibase.dashboard.mfg.ejb.HalolMFGCommitVsActual;
 import ibase.dashboard.mfg.ejb.HalolMFGCommitVsActualRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.webitm.utility.ITMException;
@@ -24,7 +25,7 @@ public class HalolMFGCommitVsActualServlet extends HttpServlet
 	@SuppressWarnings("unchecked")
     public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
-		HalolMFGCommitVsActualRemote halolMFGCommitVsActualRemote = null;
+		//HalolMFGCommitVsActualRemote halolMFGCommitVsActualRemote = null;
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		String dataSourceName = "";
@@ -39,10 +40,16 @@ public class HalolMFGCommitVsActualServlet extends HttpServlet
 			geoLoc           = (request.getParameter("month"));	
 			geoLoc           = (request.getParameter("geolocation"));	
 			context = new InitialContext(appConnectParm.getProperty());
-			halolMFGCommitVsActualRemote       = (HalolMFGCommitVsActualRemote) context.lookup("ibase/HalolMFGCommitVsActual/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
+			//---[Start]---Modified by Jaffar S. for lookup changes on 30-07-18
+			/*halolMFGCommitVsActualRemote       = (HalolMFGCommitVsActualRemote) context.lookup("ibase/HalolMFGCommitVsActual/remote");
+			setUserInfo(userInfo) for DB connection on dated:14062016
 			halolMFGCommitVsActualRemote.setUserInfo(userInfo);
-			JSONObject jsonObjData      = (JSONObject)halolMFGCommitVsActualRemote.getHalolMFGCommitVsActual(dataSourceName,month,geoLoc);
+			JSONObject jsonObjData      = (JSONObject)halolMFGCommitVsActualRemote.getHalolMFGCommitVsActual(dataSourceName,month,geoLoc);*/
+			HalolMFGCommitVsActual halolMFGCommitVsActual = new HalolMFGCommitVsActual();
+			halolMFGCommitVsActual.setUserInfo(userInfo);
+			JSONObject jsonObjData      = (JSONObject)halolMFGCommitVsActual.getHalolMFGCommitVsActual(dataSourceName,month,geoLoc);
+			halolMFGCommitVsActual      = null;
+			//---[End]---Modification by Jaffar S. for lookup changes on 30-07-18
 			OutputStream outputStream   = response.getOutputStream();			
 		    outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/mfg/servlet/HalolMFGMonthWiseSummaryServlet.java

 package ibase.dashboard.mfg.servlet;
+import ibase.dashboard.mfg.ejb.HalolMFGRelease;
 import ibase.dashboard.mfg.ejb.HalolMFGReleaseRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.webitm.utility.ITMException;
@@ -25,7 +26,7 @@ public class HalolMFGMonthWiseSummaryServlet extends HttpServlet
 	@SuppressWarnings("unchecked")
     public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
-		HalolMFGReleaseRemote halolMFGReleaseRemote = null;
+		//HalolMFGReleaseRemote halolMFGReleaseRemote = null;
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		String dataSourceName = "",geoLoc="";
@@ -40,10 +41,16 @@ public class HalolMFGMonthWiseSummaryServlet extends HttpServlet
 			month                   = (request.getParameter("month"));		
 			geoLoc                  = (request.getParameter("geolocation"));
 			context                 = new InitialContext(appConnectParm.getProperty());
-			halolMFGReleaseRemote   = (HalolMFGReleaseRemote) context.lookup("ibase/HalolMFGRelease/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
+			//---[Start]---Modified by Jaffar S. for lookup changes on 30-07-18
+			/*halolMFGReleaseRemote   = (HalolMFGReleaseRemote) context.lookup("ibase/HalolMFGRelease/remote");
+			setUserInfo(userInfo) for DB connection on dated:14062016
 			halolMFGReleaseRemote.setUserInfo(userInfo);
-			JSONObject jsonObjData  = (JSONObject)halolMFGReleaseRemote.getSummaryGrid(dataSourceName, month,geoLoc);			
+			JSONObject jsonObjData  = (JSONObject)halolMFGReleaseRemote.getSummaryGrid(dataSourceName, month,geoLoc);*/
+			HalolMFGRelease halolMFGRelease = new HalolMFGRelease();
+			halolMFGRelease.setUserInfo(userInfo);
+			JSONObject jsonObjData  = (JSONObject)halolMFGRelease.getSummaryGrid(dataSourceName, month,geoLoc);
+			halolMFGRelease         = null;
+			//---[End]---Modification by Jaffar S. for lookup changes on 30-07-18			
 			OutputStream outputStream  = response.getOutputStream();			
 		    outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/mfg/servlet/HalolMFGReleaseServlet.java

 package ibase.dashboard.mfg.servlet;
+import ibase.dashboard.mfg.ejb.HalolMFGRelease;
 import ibase.dashboard.mfg.ejb.HalolMFGReleaseRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.webitm.utility.ITMException;
@@ -27,7 +28,7 @@ public class HalolMFGReleaseServlet extends HttpServlet
 	@SuppressWarnings("unchecked")
     public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
-		HalolMFGReleaseRemote halolMFGReleaseRemote = null;
+		//HalolMFGReleaseRemote halolMFGReleaseRemote = null;
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		String dataSourceName = "";
@@ -42,10 +43,16 @@ public class HalolMFGReleaseServlet extends HttpServlet
 			month           = (request.getParameter("month"));
 			geoLoc           = (request.getParameter("geolocation"));		
 			context = new InitialContext(appConnectParm.getProperty());
-			halolMFGReleaseRemote       = (HalolMFGReleaseRemote) context.lookup("ibase/HalolMFGRelease/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
+			//---[Start]---Modified by Jaffar S. for lookup changes on 30-07-18
+			/*halolMFGReleaseRemote       = (HalolMFGReleaseRemote) context.lookup("ibase/HalolMFGRelease/remote");
+			setUserInfo(userInfo) for DB connection on dated:14062016
 			halolMFGReleaseRemote.setUserInfo(userInfo);
-			JSONObject jsonObjData      = (JSONObject)halolMFGReleaseRemote.getHalolMFGReleaseBatches(dataSourceName,month,geoLoc);			
+			JSONObject jsonObjData      = (JSONObject)halolMFGReleaseRemote.getHalolMFGReleaseBatches(dataSourceName,month,geoLoc);*/
+			HalolMFGRelease halolMFGRelease = new HalolMFGRelease();
+			halolMFGRelease.setUserInfo(userInfo);
+			JSONObject jsonObjData      = (JSONObject)halolMFGRelease.getHalolMFGReleaseBatches(dataSourceName,month,geoLoc);
+			halolMFGRelease             = null;
+			//---[End]---Modification by Jaffar S. for lookup changes on 30-07-18			
 			OutputStream outputStream   = response.getOutputStream();			
 		    outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/mfg/servlet/HalolMFGUnreleasedBatchServlet.java

 package ibase.dashboard.mfg.servlet;
+import ibase.dashboard.mfg.ejb.HalolMFGRelease;
 import ibase.dashboard.mfg.ejb.HalolMFGReleaseRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.webitm.utility.ITMException;
@@ -25,7 +26,7 @@ public class HalolMFGUnreleasedBatchServlet extends HttpServlet
 	@SuppressWarnings("unchecked")
     public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
-		HalolMFGReleaseRemote halolMFGReleaseRemote = null;
+		//HalolMFGReleaseRemote halolMFGReleaseRemote = null;
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		String dataSourceName = "",geoLoc="";
@@ -40,10 +41,16 @@ public class HalolMFGUnreleasedBatchServlet extends HttpServlet
 			month                   = (request.getParameter("month"));		
 			geoLoc                  = (request.getParameter("geolocation"));
 			context                 = new InitialContext(appConnectParm.getProperty());
-			halolMFGReleaseRemote   = (HalolMFGReleaseRemote) context.lookup("ibase/HalolMFGRelease/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
+			//---[Start]---Modified by Jaffar S. for lookup changes on 30-07-18
+			/*halolMFGReleaseRemote   = (HalolMFGReleaseRemote) context.lookup("ibase/HalolMFGRelease/remote");
+			setUserInfo(userInfo) for DB connection on dated:14062016
 			halolMFGReleaseRemote.setUserInfo(userInfo);
-			JSONObject jsonObjData  = (JSONObject)halolMFGReleaseRemote.getUnreleasedSummaryGrid(dataSourceName, month,geoLoc);			
+			JSONObject jsonObjData  = (JSONObject)halolMFGReleaseRemote.getUnreleasedSummaryGrid(dataSourceName, month,geoLoc);*/
+			HalolMFGRelease halolMFGRelease = new HalolMFGRelease();
+			halolMFGRelease.setUserInfo(userInfo);
+			JSONObject jsonObjData  = (JSONObject)halolMFGRelease.getUnreleasedSummaryGrid(dataSourceName, month,geoLoc);
+			halolMFGRelease         = null;
+			//---[End]---Modification by Jaffar S. for lookup changes on 30-07-18			
 			OutputStream outputStream  = response.getOutputStream();			
 		    outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/mfg/servlet/HalolMonthWiseActReleaseServlet.java

 package ibase.dashboard.mfg.servlet;
+import ibase.dashboard.mfg.ejb.HalolMFGRelease;
 import ibase.dashboard.mfg.ejb.HalolMFGReleaseRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.webitm.utility.ITMException;
@@ -24,7 +25,7 @@ public class HalolMonthWiseActReleaseServlet extends HttpServlet
 	@SuppressWarnings("unchecked")
     public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
-		HalolMFGReleaseRemote halolMFGReleaseRemote = null;
+		//HalolMFGReleaseRemote halolMFGReleaseRemote = null;
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		String dataSourceName = "";
@@ -38,10 +39,16 @@ public class HalolMonthWiseActReleaseServlet extends HttpServlet
 			month                      = (request.getParameter("prd_code"));	
 			geoLoc  = (request.getParameter("geolocation"));
 			context = new InitialContext(appConnectParm.getProperty());
-			halolMFGReleaseRemote       = (HalolMFGReleaseRemote) context.lookup("ibase/HalolMFGRelease/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
+			//---[Start]---Modified by Jaffar S. for lookup changes on 30-07-18
+			/*halolMFGReleaseRemote       = (HalolMFGReleaseRemote) context.lookup("ibase/HalolMFGRelease/remote");
+			setUserInfo(userInfo) for DB connection on dated:14062016
 			halolMFGReleaseRemote.setUserInfo(userInfo);
-			JSONObject jsonObjData      = (JSONObject)halolMFGReleaseRemote.getMonthWiseActualRelease (dataSourceName,month,geoLoc);
+			JSONObject jsonObjData      = (JSONObject)halolMFGReleaseRemote.getMonthWiseActualRelease (dataSourceName,month,geoLoc);*/
+			HalolMFGRelease halolMFGRelease = new HalolMFGRelease();
+			halolMFGRelease.setUserInfo(userInfo);
+			JSONObject jsonObjData      = (JSONObject)halolMFGRelease.getMonthWiseActualRelease (dataSourceName,month,geoLoc);
+			halolMFGRelease             = null;
+			//---[End]---Modification by Jaffar S. for lookup changes on 30-07-18
 			OutputStream outputStream   = response.getOutputStream();			
 		    outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/mfg/servlet/HalolMonthWisePendingReleaseServlet.java

 package ibase.dashboard.mfg.servlet;
+import ibase.dashboard.mfg.ejb.HalolMFGRelease;
 import ibase.dashboard.mfg.ejb.HalolMFGReleaseRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.webitm.utility.ITMException;
@@ -24,7 +25,7 @@ public class HalolMonthWisePendingReleaseServlet extends HttpServlet
 	@SuppressWarnings("unchecked")
     public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
-		HalolMFGReleaseRemote halolMFGReleaseRemote = null;
+		//HalolMFGReleaseRemote halolMFGReleaseRemote = null;
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		String dataSourceName = "";
@@ -45,14 +46,20 @@ public class HalolMonthWisePendingReleaseServlet extends HttpServlet
 			System.out.println("metadataName--in Pending Servlet-------->"+metadataName);
 			System.out.println(" month and week ===" + month+"prd_code===="+prd_code);	
 			context = new InitialContext(appConnectParm.getProperty());
-			halolMFGReleaseRemote       = (HalolMFGReleaseRemote) context.lookup("ibase/HalolMFGRelease/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
-			halolMFGReleaseRemote.setUserInfo(userInfo);
+			//---[Start]---Modified by Jaffar S. on 30-07-18
+			/*halolMFGReleaseRemote       = (HalolMFGReleaseRemote) context.lookup("ibase/HalolMFGRelease/remote");
+			setUserInfo(userInfo) for DB connection on dated:14062016
+			halolMFGReleaseRemote.setUserInfo(userInfo);*/
+			HalolMFGRelease halolMFGRelease = new HalolMFGRelease();
+			halolMFGRelease.setUserInfo(userInfo);
+			//---[End]---Modified by Jaffar S. on 30-07-18
 			if(metadataName.equals("monthwisepending"))
 			{
 				System.out.println("in monthwisepending");
-				
-				JSONObject jsonObjData      = (JSONObject)halolMFGReleaseRemote.getMonthWisePendingRelease (dataSourceName,month,geoLoc);
+				//---[Start]---Modified by Jaffar S. on 30-07-18
+				//JSONObject jsonObjData      = (JSONObject)halolMFGReleaseRemote.getMonthWisePendingRelease (dataSourceName,month,geoLoc);
+				JSONObject jsonObjData      = (JSONObject)halolMFGRelease.getMonthWisePendingRelease (dataSourceName,month,geoLoc);
+				//---[End]---Modified by Jaffar S. on 30-07-18
 				OutputStream outputStream   = response.getOutputStream();			
 				outputStream.write(jsonObjData.toString().getBytes());
 				outputStream.flush();
@@ -61,7 +68,10 @@ public class HalolMonthWisePendingReleaseServlet extends HttpServlet
 			}else if(metadataName.equals("tbdbatch"))
 			{
 				System.out.println("in tbdbatch");
-				JSONObject jsonObjData  = (JSONObject)halolMFGReleaseRemote.getTBDBatch(dataSourceName, month,geoLoc);
+				//---[Start]---Modified by Jaffar S. on 30-07-18
+				//JSONObject jsonObjData  = (JSONObject)halolMFGReleaseRemote.getTBDBatch(dataSourceName, month,geoLoc);
+				JSONObject jsonObjData  = (JSONObject)halolMFGRelease.getTBDBatch(dataSourceName, month,geoLoc);
+				//---[End]---Modified by Jaffar S. on 30-07-18
 				OutputStream outputStream   = response.getOutputStream();			
 				outputStream.write(jsonObjData.toString().getBytes());
 				outputStream.flush();
@@ -69,6 +79,8 @@ public class HalolMonthWisePendingReleaseServlet extends HttpServlet
 				System.out.println(" Final data set inside HalolMonthWiseActReleaseServlet build the Graph is===" + jsonObjData);	
 			}
 			
+			halolMFGRelease = null;		//Added by Jaffar S. on 30-07-18
+			
 		} catch (Exception e)
 		{
 			System.out.println("Exception : HalolMonthWiseActReleaseServlet :doPost(HttpServletRequest request, HttpServletResponse response) :" + e.getMessage());

webitm-dashboard/ibase/dashboard/mfg/servlet/HalolWeekWiseActReleaseServlet.java

 package ibase.dashboard.mfg.servlet;
+import ibase.dashboard.mfg.ejb.HalolMFGCommitVsActual;
 import ibase.dashboard.mfg.ejb.HalolMFGCommitVsActualRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.webitm.utility.ITMException;
@@ -24,7 +25,7 @@ public class HalolWeekWiseActReleaseServlet extends HttpServlet
 	@SuppressWarnings("unchecked")
     public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
-		HalolMFGCommitVsActualRemote halolMFGCommitVsActualRemote = null;
+		//HalolMFGCommitVsActualRemote halolMFGCommitVsActualRemote = null;
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		String dataSourceName = "";
@@ -41,10 +42,16 @@ public class HalolWeekWiseActReleaseServlet extends HttpServlet
 			week = (request.getParameter("week"));		
 			geoLoc  = (request.getParameter("geolocation"));
 			context = new InitialContext(appConnectParm.getProperty());
-			halolMFGCommitVsActualRemote = (HalolMFGCommitVsActualRemote) context.lookup("ibase/HalolMFGCommitVsActual/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
+			//---[Start]---Modified by Jaffar S. for lookup changes on 30-07-18
+			/*halolMFGCommitVsActualRemote = (HalolMFGCommitVsActualRemote) context.lookup("ibase/HalolMFGCommitVsActual/remote");
+			setUserInfo(userInfo) for DB connection on dated:14062016
 			halolMFGCommitVsActualRemote.setUserInfo(userInfo);
-			JSONObject jsonObjData       = (JSONObject)halolMFGCommitVsActualRemote.getWeekWiseActualRelease(dataSourceName,month,week,geoLoc);
+			JSONObject jsonObjData       = (JSONObject)halolMFGCommitVsActualRemote.getWeekWiseActualRelease(dataSourceName,month,week,geoLoc);*/
+			HalolMFGCommitVsActual halolMFGCommitVsActual = new HalolMFGCommitVsActual();
+			halolMFGCommitVsActual.setUserInfo(userInfo);
+			JSONObject jsonObjData       = (JSONObject)halolMFGCommitVsActual.getWeekWiseActualRelease(dataSourceName,month,week,geoLoc);
+			halolMFGCommitVsActual       = null;
+			//---[End]---Modification by Jaffar S. for lookup changes on 30-07-18
 			OutputStream outputStream    = response.getOutputStream();			
 		    outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/mfg/servlet/HalolWeekWiseCommitedReleaseServlet.java

 package ibase.dashboard.mfg.servlet;
+import ibase.dashboard.mfg.ejb.HalolMFGCommitVsActual;
 import ibase.dashboard.mfg.ejb.HalolMFGCommitVsActualRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.webitm.utility.ITMException;
@@ -24,7 +25,7 @@ public class HalolWeekWiseCommitedReleaseServlet extends HttpServlet
 	@SuppressWarnings("unchecked")
     public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
-		HalolMFGCommitVsActualRemote halolMFGCommitVsActualRemote = null;
+		//HalolMFGCommitVsActualRemote halolMFGCommitVsActualRemote = null;
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		String dataSourceName = "";
@@ -40,10 +41,16 @@ public class HalolWeekWiseCommitedReleaseServlet extends HttpServlet
 			week  = (request.getParameter("week"));
 			geoLoc  = (request.getParameter("geolocation"));
 			context = new InitialContext(appConnectParm.getProperty());
-			halolMFGCommitVsActualRemote = (HalolMFGCommitVsActualRemote) context.lookup("ibase/HalolMFGCommitVsActual/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
+			//---[Start]---Modified by Jaffar S. for lookup changes on 30-07-18
+			/*halolMFGCommitVsActualRemote = (HalolMFGCommitVsActualRemote) context.lookup("ibase/HalolMFGCommitVsActual/remote");
+			setUserInfo(userInfo) for DB connection on dated:14062016
 			halolMFGCommitVsActualRemote.setUserInfo(userInfo);
-			JSONObject jsonObjData       = (JSONObject)halolMFGCommitVsActualRemote.getWeekWiseCommitedRelease(dataSourceName,month,week,geoLoc);
+			JSONObject jsonObjData       = (JSONObject)halolMFGCommitVsActualRemote.getWeekWiseCommitedRelease(dataSourceName,month,week,geoLoc);*/
+			HalolMFGCommitVsActual halolMFGCommitVsActual = new HalolMFGCommitVsActual();
+			halolMFGCommitVsActual.setUserInfo(userInfo);
+			JSONObject jsonObjData       = (JSONObject)halolMFGCommitVsActual.getWeekWiseCommitedRelease(dataSourceName,month,week,geoLoc);
+			halolMFGCommitVsActual       = null;
+			//---[End]---Modification by Jaffar S. for lookup changes on 30-07-18
 			OutputStream outputStream    = response.getOutputStream();			
 		    outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/mfg/servlet/MarketWiseRecallServlet.java

 package ibase.dashboard.mfg.servlet;
 
+import ibase.dashboard.mfg.ejb.RecallDetails;
 import ibase.dashboard.mfg.ejb.RecallDetailsRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.webitm.utility.ITMException;
@@ -26,7 +27,7 @@ public class MarketWiseRecallServlet extends HttpServlet
 	@SuppressWarnings("unchecked")
     public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
-		RecallDetailsRemote recallDetailsRemote = null;
+		//RecallDetailsRemote recallDetailsRemote = null;
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		String dataSourceName = "";
@@ -40,11 +41,17 @@ public class MarketWiseRecallServlet extends HttpServlet
 			lastMonth = request.getParameter("lastMonth");
 			System.out.println("in doPost" + "lastMonth is =:" + lastMonth+":" );
 			
-			context = new InitialContext(appConnectParm.getProperty());
+			//---[Start]---Modified by Jaffar S. for lookup changes on 30-07-18
+			/*context = new InitialContext(appConnectParm.getProperty());
 			recallDetailsRemote = (RecallDetailsRemote) context.lookup("ibase/RecallDetails/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
+			setUserInfo(userInfo) for DB connection on dated:14062016
 			recallDetailsRemote.setUserInfo(userInfo);
-			JSONObject jsonObjData      = (JSONObject)recallDetailsRemote.getMarketWiseRecallDetails(dataSourceName,lastMonth);
+			JSONObject jsonObjData      = (JSONObject)recallDetailsRemote.getMarketWiseRecallDetails(dataSourceName,lastMonth);*/
+			RecallDetails recallDetails = new RecallDetails();
+			recallDetails.setUserInfo(userInfo);
+			JSONObject jsonObjData      = (JSONObject)recallDetails.getMarketWiseRecallDetails(dataSourceName,lastMonth);
+			recallDetails               = null;
+			//---[End]---Modification by Jaffar S. for lookup changes on 30-07-18
 			OutputStream outputStream   = response.getOutputStream();			
 		    outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/mfg/servlet/PWDSiteWiseOrderServlet.java

 package ibase.dashboard.mfg.servlet;
+import ibase.dashboard.mfg.ejb.MFGDashboard;
 import ibase.dashboard.mfg.ejb.MFGDashboardRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.utility.UserInfoBean;
@@ -26,7 +27,7 @@ public class PWDSiteWiseOrderServlet extends HttpServlet
 	@SuppressWarnings("unchecked")
 	public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
-		MFGDashboardRemote recallDetailsRemote = null;
+		//MFGDashboardRemote recallDetailsRemote = null;
 		InitialContext context                = null;
 		AppConnectParm appConnectParm         = new AppConnectParm();
 		JSONObject jsonObjData                = null;
@@ -62,9 +63,14 @@ public class PWDSiteWiseOrderServlet extends HttpServlet
 		    sitedescr=request.getParameter("caption");
 		    System.out.println("Caption: "+sitedescr);
 		    
-			context             = new InitialContext(appConnectParm.getProperty());
+		    //---[Start]---Modified by Jaffar S. for lookup changes on 30-07-18
+		    /*context             = new InitialContext(appConnectParm.getProperty());
 			recallDetailsRemote = (MFGDashboardRemote) context.lookup("ibase/MFGDashboard/remote");
-			jsonObjData         = (JSONObject) recallDetailsRemote.getPWDSiteOrder(dataSourceName, businessType, facilityCode,selectedView,sessionSiteCode,fromDate,toDate,sitedescr,unitForm);			
+			jsonObjData         = (JSONObject) recallDetailsRemote.getPWDSiteOrder(dataSourceName, businessType, facilityCode,selectedView,sessionSiteCode,fromDate,toDate,sitedescr,unitForm);*/
+			MFGDashboard mfgDashboard = new MFGDashboard();
+			jsonObjData         = (JSONObject) mfgDashboard.getPWDSiteOrder(dataSourceName, businessType, facilityCode,selectedView,sessionSiteCode,fromDate,toDate,sitedescr,unitForm);
+			mfgDashboard        = null;
+			//---[End]---Modification by Jaffar S. for lookup changes on 30-07-18			
 			outputStream        = response.getOutputStream();
 		    outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/mfg/servlet/PendingManualQCOrderGridServlet.java

 package ibase.dashboard.mfg.servlet;
 
+import ibase.dashboard.mfg.ejb.PendingQCPurchaseOrder;
 import ibase.dashboard.mfg.ejb.PendingQCPurchaseOrderRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.webitm.utility.ITMException;
@@ -24,7 +25,7 @@ public class PendingManualQCOrderGridServlet extends HttpServlet
 
 	public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
-		PendingQCPurchaseOrderRemote pendingQCOrderRemote = null;
+		//PendingQCPurchaseOrderRemote pendingQCOrderRemote = null;
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		String dataSourceName = "";
@@ -43,11 +44,17 @@ public class PendingManualQCOrderGridServlet extends HttpServlet
 			geoLocation 	= request.getParameter("geoLocation");
 			geoLocation 	= geoLocation.replace("@", "&");			
 			System.out.println("in PendingManualQCOrderGridServlet SiteCode :"+siteCode+"----geoLocation :"+geoLocation);		
-			context = new InitialContext(appConnectParm.getProperty());
+			//---[Start]---Modified by Jaffar S. for lookup changes on 30-07-18
+			/*context = new InitialContext(appConnectParm.getProperty());
 			pendingQCOrderRemote = (PendingQCPurchaseOrderRemote) context.lookup("ibase/PendingQCPurchaseOrder/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
+			setUserInfo(userInfo) for DB connection on dated:14062016
 			pendingQCOrderRemote.setUserInfo(userInfo);
-			JSONObject jsonObjData = (JSONObject) pendingQCOrderRemote.getPendingManualQCOrderGrid(geoLocation,siteCode,dataSourceName);
+			JSONObject jsonObjData = (JSONObject) pendingQCOrderRemote.getPendingManualQCOrderGrid(geoLocation,siteCode,dataSourceName);*/
+			PendingQCPurchaseOrder pendingQCPurchaseOrder = new PendingQCPurchaseOrder();
+			pendingQCPurchaseOrder.setUserInfo(userInfo);
+			JSONObject jsonObjData = (JSONObject) pendingQCPurchaseOrder.getPendingManualQCOrderGrid(geoLocation,siteCode,dataSourceName);
+			pendingQCPurchaseOrder = null;
+			//---[End]---Modification by Jaffar S. for lookup changes on 30-07-18
 			OutputStream outputStream = response.getOutputStream();
 			outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/mfg/servlet/PendingManualQCOrderServlet.java

 package ibase.dashboard.mfg.servlet;
 
+import ibase.dashboard.mfg.ejb.PendingQCPurchaseOrder;
 import ibase.dashboard.mfg.ejb.PendingQCPurchaseOrderRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.webitm.utility.ITMException;
@@ -27,7 +28,7 @@ public class PendingManualQCOrderServlet extends HttpServlet
 
 	public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
-		PendingQCPurchaseOrderRemote pendingQCOrderRemote = null;
+		//PendingQCPurchaseOrderRemote pendingQCOrderRemote = null;
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		String dataSourceName = "";
@@ -47,12 +48,17 @@ public class PendingManualQCOrderServlet extends HttpServlet
 			geoLocation 	= geoLocation.replace("@", "&");
 			
 			System.out.println("in PendingQCOrderPurchaseServlet SiteCode :"+siteCode+"----geoLocation :"+geoLocation);
-			
-			context = new InitialContext(appConnectParm.getProperty());
+			//---[Start]---Modified by Jaffar S. for lookup changes on 30-07-18
+			/*context = new InitialContext(appConnectParm.getProperty());
 			pendingQCOrderRemote = (PendingQCPurchaseOrderRemote) context.lookup("ibase/PendingQCPurchaseOrder/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
+			setUserInfo(userInfo) for DB connection on dated:14062016
 			pendingQCOrderRemote.setUserInfo(userInfo);
-			JSONObject jsonObjData = (JSONObject) pendingQCOrderRemote.getPendingManualQCOrder(geoLocation,siteCode,dataSourceName);
+			JSONObject jsonObjData = (JSONObject) pendingQCOrderRemote.getPendingManualQCOrder(geoLocation,siteCode,dataSourceName);*/
+			PendingQCPurchaseOrder pendingQCPurchaseOrder = new PendingQCPurchaseOrder();
+			pendingQCPurchaseOrder.setUserInfo(userInfo);
+			JSONObject jsonObjData = (JSONObject) pendingQCPurchaseOrder.getPendingManualQCOrder(geoLocation,siteCode,dataSourceName);
+			pendingQCPurchaseOrder = null;
+			//---[End]---Modification by Jaffar S. for lookup changes on 30-07-18
 			OutputStream outputStream = response.getOutputStream();
 			outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/mfg/servlet/PendingQCOrderPurchaseGridServlet.java

 package ibase.dashboard.mfg.servlet;
 
+import ibase.dashboard.mfg.ejb.PendingQCPurchaseOrder;
 import ibase.dashboard.mfg.ejb.PendingQCPurchaseOrderRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.webitm.utility.ITMException;
@@ -27,7 +28,7 @@ public class PendingQCOrderPurchaseGridServlet extends HttpServlet
 
 	public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
-		PendingQCPurchaseOrderRemote pendingQCOrderRemote = null;
+		//PendingQCPurchaseOrderRemote pendingQCOrderRemote = null;
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		String dataSourceName = "";
@@ -48,11 +49,17 @@ public class PendingQCOrderPurchaseGridServlet extends HttpServlet
 			
 			System.out.println("in PendingQCOrderPurchaseGridServlet SiteCode :"+siteCode+"----geoLocation :"+geoLocation);
 			
-			context = new InitialContext(appConnectParm.getProperty());
+			//---[Start]---Modified by Jaffar S. for lookup changes on 30-07-18
+			/*context = new InitialContext(appConnectParm.getProperty());
 			pendingQCOrderRemote = (PendingQCPurchaseOrderRemote) context.lookup("ibase/PendingQCPurchaseOrder/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
+			setUserInfo(userInfo) for DB connection on dated:14062016
 			pendingQCOrderRemote.setUserInfo(userInfo);
-			JSONObject jsonObjData = (JSONObject) pendingQCOrderRemote.getPendingQCOrderPurchaseGrid(geoLocation,siteCode,dataSourceName);
+			JSONObject jsonObjData = (JSONObject) pendingQCOrderRemote.getPendingQCOrderPurchaseGrid(geoLocation,siteCode,dataSourceName);*/
+			PendingQCPurchaseOrder pendingQCPurchaseOrder = new PendingQCPurchaseOrder();
+			pendingQCPurchaseOrder.setUserInfo(userInfo);
+			JSONObject jsonObjData = (JSONObject) pendingQCPurchaseOrder.getPendingQCOrderPurchaseGrid(geoLocation,siteCode,dataSourceName);
+			pendingQCPurchaseOrder = null;
+			//---[End]---Modification by Jaffar S. for lookup changes on 30-07-18
 			OutputStream outputStream = response.getOutputStream();
 			outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/mfg/servlet/PendingQCOrderPurchaseServlet.java

 package ibase.dashboard.mfg.servlet;
 
+import ibase.dashboard.mfg.ejb.PendingQCPurchaseOrder;
 import ibase.dashboard.mfg.ejb.PendingQCPurchaseOrderRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.webitm.utility.ITMException;
@@ -27,7 +28,7 @@ public class PendingQCOrderPurchaseServlet extends HttpServlet
 
 	public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
-		PendingQCPurchaseOrderRemote pendingQCOrderRemote = null;
+		//PendingQCPurchaseOrderRemote pendingQCOrderRemote = null;
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		String dataSourceName = "";
@@ -51,11 +52,17 @@ public class PendingQCOrderPurchaseServlet extends HttpServlet
 			
 			System.out.println("in PendingQCOrderPurchaseServlet SiteCode :"+siteCode+"----geoLocation :"+geoLocation);
 			
-			context = new InitialContext(appConnectParm.getProperty());
+			//---[Start]---Modified by Jaffar S. for lookup changes on 30-07-18
+			/*context = new InitialContext(appConnectParm.getProperty());
 			pendingQCOrderRemote = (PendingQCPurchaseOrderRemote) context.lookup("ibase/PendingQCPurchaseOrder/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
+			setUserInfo(userInfo) for DB connection on dated:14062016
 			pendingQCOrderRemote.setUserInfo(userInfo);
-			JSONObject jsonObjData = (JSONObject) pendingQCOrderRemote.getPendingQCOrderPurchase(geoLocation,siteCode,dataSourceName);
+			JSONObject jsonObjData = (JSONObject) pendingQCOrderRemote.getPendingQCOrderPurchase(geoLocation,siteCode,dataSourceName);*/
+			PendingQCPurchaseOrder pendingQCPurchaseOrder = new PendingQCPurchaseOrder();
+			pendingQCPurchaseOrder.setUserInfo(userInfo);
+			JSONObject jsonObjData = (JSONObject) pendingQCPurchaseOrder.getPendingQCOrderPurchase(geoLocation,siteCode,dataSourceName);
+			pendingQCPurchaseOrder = null;
+			//---[End]---Modification by Jaffar S. for lookup changes on 30-07-18
 			OutputStream outputStream = response.getOutputStream();
 			outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/mfg/servlet/PendingQCPurcExportPDFServlet.java

 package ibase.dashboard.mfg.servlet;
+import ibase.dashboard.mfg.ejb.PendingQCPurchaseOrder;
 import ibase.dashboard.mfg.ejb.PendingQCPurchaseOrderRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.webitm.utility.ITMException;
@@ -28,7 +29,7 @@ public class PendingQCPurcExportPDFServlet extends HttpServlet
 		 String userID          ="";
 		 String imgName         = "";
 		 String resultString    ="";
-		 PendingQCPurchaseOrderRemote pendingQCPurchaseOrderRemote = null;
+		 //PendingQCPurchaseOrderRemote pendingQCPurchaseOrderRemote = null;
 		 InitialContext context = null;
 		 AppConnectParm appConnectParm = new AppConnectParm();
 		System.out.println(" ENTER - PendingQCPurcExportPDFServlet  ***********************");
@@ -52,11 +53,19 @@ public class PendingQCPurcExportPDFServlet extends HttpServlet
 		    imgName          = request.getParameter("imgNameList");
 		    System.out.println("userID inside WIPStatusExportPDFServlet====="+ userID +"---rptTitle----->"+rptTitle + "---remark--->"+remark+"---imgName--->"+imgName); 		     
 		    // call EJB method for PDF creation******************* 
-		    context = new InitialContext(appConnectParm.getProperty());
+		    
+		    //---[Start]---Modified by Jaffar S. for lookup changes on 30-07-18
+		    /*context = new InitialContext(appConnectParm.getProperty());
 			pendingQCPurchaseOrderRemote  = (PendingQCPurchaseOrderRemote) context.lookup("ibase/PendingQCPurchaseOrder/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
+			setUserInfo(userInfo) for DB connection on dated:14062016
 			pendingQCPurchaseOrderRemote.setUserInfo(userInfo);
-			resultString          =  pendingQCPurchaseOrderRemote.getPDFByScheduler(rptTitle,remark,userID,imgName,sessionCity,sessionSiteCode);
+			resultString          =  pendingQCPurchaseOrderRemote.getPDFByScheduler(rptTitle,remark,userID,imgName,sessionCity,sessionSiteCode);*/
+			
+			PendingQCPurchaseOrder pendingQCPurchaseOrder = new PendingQCPurchaseOrder();
+			pendingQCPurchaseOrder.setUserInfo(userInfo);
+			resultString          =  pendingQCPurchaseOrder.getPDFByScheduler(rptTitle,remark,userID,imgName,sessionCity,sessionSiteCode);
+			//---[End]---Modification by Jaffar S. for lookup changes on 30-07-18
+			
 			response.setContentType("text/html");
 			if(resultString.equals("false"))
 			{
@@ -66,6 +75,8 @@ public class PendingQCPurcExportPDFServlet extends HttpServlet
 			{
 				response.getWriter().write("true");
 			}
+			
+			pendingQCPurchaseOrder = null;		//Added by Jaffar S. on 30-07-18
 		}
 		catch (Exception e)
 		{

webitm-dashboard/ibase/dashboard/mfg/servlet/PendingQCReceiptExportPDFServlet.java

 package ibase.dashboard.mfg.servlet;
+import ibase.dashboard.mfg.ejb.PendingQCWorkOrder;
 import ibase.dashboard.mfg.ejb.PendingQCWorkOrderRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.webitm.utility.ITMException;
@@ -28,7 +29,7 @@ public class PendingQCReceiptExportPDFServlet extends HttpServlet
 		 String userID          ="";
 		 String imgName         = "";
 		 String resultString    ="";
-		 PendingQCWorkOrderRemote PendingQCWorkOrderRemote = null;
+		 //PendingQCWorkOrderRemote PendingQCWorkOrderRemote = null;
 		 InitialContext context = null;
 		 AppConnectParm appConnectParm = new AppConnectParm();
 		System.out.println(" ENTER - PendingQCReceiptExportPDFServlet  ***********************");
@@ -52,11 +53,18 @@ public class PendingQCReceiptExportPDFServlet extends HttpServlet
 		    imgName          = request.getParameter("imgNameList");
 		    System.out.println("userID inside WIPStatusExportPDFServlet====="+ userID +"---rptTitle----->"+rptTitle + "---remark--->"+remark+"---imgName--->"+imgName); 		     
 		    // call EJB method for PDF creation******************* 
-		    context = new InitialContext(appConnectParm.getProperty());
+		    
+		    //---[Start]---Modified by Jaffar S. for lookup changes on 30-07-18
+		    /*context = new InitialContext(appConnectParm.getProperty());
 		    PendingQCWorkOrderRemote  = (PendingQCWorkOrderRemote) context.lookup("ibase/PendingQCWorkOrder/remote");
-		    /*setUserInfo(userInfo) for DB connection on dated:14062016*/
+		    setUserInfo(userInfo) for DB connection on dated:14062016
 		    PendingQCWorkOrderRemote.setUserInfo(userInfo);
-		    resultString          =  PendingQCWorkOrderRemote.getPDFByScheduler(rptTitle,remark,userID,imgName,sessionCity,sessionSiteCode);
+		    resultString          =  PendingQCWorkOrderRemote.getPDFByScheduler(rptTitle,remark,userID,imgName,sessionCity,sessionSiteCode);*/
+		    PendingQCWorkOrder pendingQCWorkOrder = new PendingQCWorkOrder();
+		    pendingQCWorkOrder.setUserInfo(userInfo);
+		    resultString          =  pendingQCWorkOrder.getPDFByScheduler(rptTitle,remark,userID,imgName,sessionCity,sessionSiteCode);
+		    //---[End]---Modification by Jaffar S. for lookup changes on 30-07-18
+		    
 			response.setContentType("text/html");
 			if(resultString.equals("false"))
 			{
@@ -66,6 +74,8 @@ public class PendingQCReceiptExportPDFServlet extends HttpServlet
 			{
 				response.getWriter().write("true");
 			}
+			
+			pendingQCWorkOrder = null;		//Added by Jaffar S. on 30-07-18
 		}
 		catch (Exception e)
 		{

webitm-dashboard/ibase/dashboard/mfg/servlet/PendingQCWorkOrderGridServlet.java

 package ibase.dashboard.mfg.servlet;
 
+import ibase.dashboard.mfg.ejb.PendingQCWorkOrder;
 import ibase.dashboard.mfg.ejb.PendingQCWorkOrderRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.webitm.utility.ITMException;
@@ -27,7 +28,7 @@ public class PendingQCWorkOrderGridServlet extends HttpServlet
 
 	public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
-		PendingQCWorkOrderRemote pendingQCWorkOrderRemote = null;
+		//PendingQCWorkOrderRemote pendingQCWorkOrderRemote = null;
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		String dataSourceName = "";
@@ -48,11 +49,17 @@ public class PendingQCWorkOrderGridServlet extends HttpServlet
 			
 			System.out.println("in PendingQCWorkOrderGridServlet SiteCode :"+siteCode+"----geoLocation :"+geoLocation);
 			
-			context = new InitialContext(appConnectParm.getProperty());
+			//---[Start]---Modified by Jaffar S. for lookup changes on 30-07-18
+			/*context = new InitialContext(appConnectParm.getProperty());
 			pendingQCWorkOrderRemote = (PendingQCWorkOrderRemote) context.lookup("ibase/PendingQCWorkOrder/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
+			setUserInfo(userInfo) for DB connection on dated:14062016
 			pendingQCWorkOrderRemote.setUserInfo(userInfo);
-			JSONObject jsonObjData = (JSONObject) pendingQCWorkOrderRemote.getPendingQCWorkOrderGrid(geoLocation,siteCode,dataSourceName);
+			JSONObject jsonObjData = (JSONObject) pendingQCWorkOrderRemote.getPendingQCWorkOrderGrid(geoLocation,siteCode,dataSourceName);*/
+			PendingQCWorkOrder pendingQCWorkOrder = new PendingQCWorkOrder();
+			pendingQCWorkOrder.setUserInfo(userInfo);
+			JSONObject jsonObjData = (JSONObject) pendingQCWorkOrder.getPendingQCWorkOrderGrid(geoLocation,siteCode,dataSourceName);
+			pendingQCWorkOrder     = null;
+			//---[End]---Modification by Jaffar S. for lookup changes on 30-07-18
 			OutputStream outputStream = response.getOutputStream();
 			outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/mfg/servlet/PendingQCWorkOrderServlet.java

 package ibase.dashboard.mfg.servlet;
 
+import ibase.dashboard.mfg.ejb.PendingQCWorkOrder;
 import ibase.dashboard.mfg.ejb.PendingQCWorkOrderRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.webitm.utility.ITMException;
@@ -27,7 +28,7 @@ public class PendingQCWorkOrderServlet extends HttpServlet
 
 	public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
-		PendingQCWorkOrderRemote pendingQCWorkOrderRemote = null;
+		//PendingQCWorkOrderRemote pendingQCWorkOrderRemote = null;
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		String dataSourceName = "";
@@ -51,11 +52,17 @@ public class PendingQCWorkOrderServlet extends HttpServlet
 			
 			System.out.println("in PendingQCWorkOrderServlet SiteCode :"+siteCode+"----geoLocation :"+geoLocation);
 			
-			context = new InitialContext(appConnectParm.getProperty());
+			//---[Start]---Modified by Jaffar S. for lookup changes on 30-07-18
+			/*context = new InitialContext(appConnectParm.getProperty());
 			pendingQCWorkOrderRemote = (PendingQCWorkOrderRemote) context.lookup("ibase/PendingQCWorkOrder/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
+			setUserInfo(userInfo) for DB connection on dated:14062016
 			pendingQCWorkOrderRemote.setUserInfo(userInfo);
-			JSONObject jsonObjData = (JSONObject) pendingQCWorkOrderRemote.getPendingQCWorkOrder(geoLocation,siteCode,dataSourceName);
+			JSONObject jsonObjData = (JSONObject) pendingQCWorkOrderRemote.getPendingQCWorkOrder(geoLocation,siteCode,dataSourceName);*/
+			PendingQCWorkOrder pendingQCWorkOrder = new PendingQCWorkOrder();
+			pendingQCWorkOrder.setUserInfo(userInfo);
+			JSONObject jsonObjData = (JSONObject) pendingQCWorkOrder.getPendingQCWorkOrder(geoLocation,siteCode,dataSourceName);
+			pendingQCWorkOrder     = null;
+			//---[End]---Modification by Jaffar S. for lookup changes on 30-07-18
 			OutputStream outputStream = response.getOutputStream();
 			outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/mfg/servlet/PlantWiseRecallServlet.java

 package ibase.dashboard.mfg.servlet;
 
+import ibase.dashboard.mfg.ejb.RecallDetails;
 import ibase.dashboard.mfg.ejb.RecallDetailsRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.webitm.utility.ITMException;
@@ -29,7 +30,7 @@ public class PlantWiseRecallServlet extends HttpServlet
 	@SuppressWarnings("unchecked")
     public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
-		RecallDetailsRemote recallDetailsRemote = null;
+		//RecallDetailsRemote recallDetailsRemote = null;
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		String dataSourceName = "";
@@ -43,11 +44,18 @@ public class PlantWiseRecallServlet extends HttpServlet
 			lastMonth 		  = request.getParameter("lastMonth");
 			System.out.println("in doPost lastMonth is ==:" + lastMonth  );
 			
-			context = new InitialContext(appConnectParm.getProperty());
+			//---[Start]---Modified by Jaffar S. for lookup changes on 30-07-18
+			/*context = new InitialContext(appConnectParm.getProperty());
 			recallDetailsRemote = (RecallDetailsRemote) context.lookup("ibase/RecallDetails/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
+			setUserInfo(userInfo) for DB connection on dated:14062016
 			recallDetailsRemote.setUserInfo(userInfo);
-			JSONObject jsonObjData      = (JSONObject)recallDetailsRemote.getPlantWiseRecallDetails(dataSourceName,lastMonth);
+			JSONObject jsonObjData      = (JSONObject)recallDetailsRemote.getPlantWiseRecallDetails(dataSourceName,lastMonth);*/
+			RecallDetails recallDetails = new RecallDetails();
+			recallDetails.setUserInfo(userInfo);
+			JSONObject jsonObjData      = (JSONObject)recallDetails.getPlantWiseRecallDetails(dataSourceName,lastMonth);
+			recallDetails               = null;
+			//---[End]---Modification by Jaffar S. for lookup changes on 30-07-18
+			
 			OutputStream outputStream   = response.getOutputStream();			
 		    outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/mfg/servlet/ProcessStageDetServlet.java

 package ibase.dashboard.mfg.servlet;
+import ibase.dashboard.mfg.ejb.MFGDashboard;
 import ibase.dashboard.mfg.ejb.MFGDashboardRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.utility.UserInfoBean;
@@ -29,7 +30,7 @@ public class ProcessStageDetServlet extends HttpServlet
 	@SuppressWarnings("unchecked")
 	public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
-		MFGDashboardRemote recallDetailsRemote = null;
+		//MFGDashboardRemote recallDetailsRemote = null;
 		InitialContext context                 = null;
 		AppConnectParm appConnectParm          = new AppConnectParm();
 		JSONObject jsonObjData    = null;
@@ -56,9 +57,14 @@ public class ProcessStageDetServlet extends HttpServlet
 			businessType        = request.getParameter("businessType");
 			fromDate=request.getParameter("fromDate");
 			toDate=request.getParameter("toDate");
-			context             = new InitialContext(appConnectParm.getProperty());
+			//---[Start]---Modified by Jaffar S. for lookup changes on 30-07-18
+			/*context             = new InitialContext(appConnectParm.getProperty());
 			recallDetailsRemote    = (MFGDashboardRemote) context.lookup("ibase/MFGDashboard/remote");
-			jsonObjData         = (JSONObject) recallDetailsRemote.getProcessStageDet(dataSourceName, businessType, facilityCode, selectedView, sessionSiteCode, fromDate, toDate);
+			jsonObjData         = (JSONObject) recallDetailsRemote.getProcessStageDet(dataSourceName, businessType, facilityCode, selectedView, sessionSiteCode, fromDate, toDate);*/
+			MFGDashboard mfgDashboard = new MFGDashboard();
+			jsonObjData         = (JSONObject) mfgDashboard.getProcessStageDet(dataSourceName, businessType, facilityCode, selectedView, sessionSiteCode, fromDate, toDate);
+			mfgDashboard        = null;
+			//---[End]---Modification by Jaffar S. for lookup changes on 30-07-18
 			outputStream        = response.getOutputStream();
 		    outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/mfg/servlet/ProcessStageServlet.java

 package ibase.dashboard.mfg.servlet;
+import ibase.dashboard.mfg.ejb.MFGDashboard;
 import ibase.dashboard.mfg.ejb.MFGDashboardRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.utility.UserInfoBean;
@@ -29,7 +30,7 @@ public class ProcessStageServlet extends HttpServlet
 	@SuppressWarnings("unchecked")
 	public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
-		MFGDashboardRemote recallDetailsRemote = null;
+		//MFGDashboardRemote recallDetailsRemote = null;
 		InitialContext context                 = null;
 		AppConnectParm appConnectParm          = new AppConnectParm();
 		JSONObject jsonObjData    = null;
@@ -58,10 +59,14 @@ public class ProcessStageServlet extends HttpServlet
 			businessType        = request.getParameter("businessType");
 			fromDate			=request.getParameter("fromDate");
 			toDate				=request.getParameter("toDate");
-			context             = new InitialContext(appConnectParm.getProperty());
+			//---[Start]---Modified by Jaffar S. for lookup changes on 30-07-18
+			/*context             = new InitialContext(appConnectParm.getProperty());
 			recallDetailsRemote = (MFGDashboardRemote) context.lookup("ibase/MFGDashboard/remote");
-			
-			jsonObjData         = (JSONObject) recallDetailsRemote.getProcessStageSumm(dataSourceName, businessType, facilityCode, selectedView, sessionSiteCode, fromDate, toDate);
+			jsonObjData         = (JSONObject) recallDetailsRemote.getProcessStageSumm(dataSourceName, businessType, facilityCode, selectedView, sessionSiteCode, fromDate, toDate);*/
+			MFGDashboard mfgDashboard = new MFGDashboard();
+			jsonObjData         = (JSONObject) mfgDashboard.getProcessStageSumm(dataSourceName, businessType, facilityCode, selectedView, sessionSiteCode, fromDate, toDate);
+			mfgDashboard        = null;
+			//---[End]---Modification by Jaffar S. for lookup changes on 30-07-18
 			outputStream        = response.getOutputStream();
 		    outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/mfg/servlet/ProcessStageSiteOrderServlet.java

 package ibase.dashboard.mfg.servlet;
+import ibase.dashboard.mfg.ejb.MFGDashboard;
 import ibase.dashboard.mfg.ejb.MFGDashboardRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.utility.UserInfoBean;
@@ -29,7 +30,7 @@ public class ProcessStageSiteOrderServlet extends HttpServlet
 	@SuppressWarnings("unchecked")
 	public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
-		MFGDashboardRemote recallDetailsRemote = null;
+		//MFGDashboardRemote recallDetailsRemote = null;
 		InitialContext context                 = null;
 		AppConnectParm appConnectParm          = new AppConnectParm();
 		JSONObject jsonObjData    = null;
@@ -62,9 +63,14 @@ public class ProcessStageSiteOrderServlet extends HttpServlet
 			sitedescr=request.getParameter("caption");
 			unitForm			=request.getParameter("unit_form");
 			process				=request.getParameter("category_value");
-			context             = new InitialContext(appConnectParm.getProperty());
+			//---[Start]---Modified by Jaffar S. for lookup changes on 30-07-18
+			/*context             = new InitialContext(appConnectParm.getProperty());
 			recallDetailsRemote    = (MFGDashboardRemote) context.lookup("ibase/MFGDashboard/remote");
-			jsonObjData         = (JSONObject) recallDetailsRemote.getProcessStageSiteOrder(dataSourceName, businessType, facilityCode, selectedView, sessionSiteCode, fromDate, toDate, sitedescr, unitForm, process);
+			jsonObjData         = (JSONObject) recallDetailsRemote.getProcessStageSiteOrder(dataSourceName, businessType, facilityCode, selectedView, sessionSiteCode, fromDate, toDate, sitedescr, unitForm, process);*/
+			MFGDashboard mfgDashboard = new MFGDashboard();
+			jsonObjData         = (JSONObject) mfgDashboard.getProcessStageSiteOrder(dataSourceName, businessType, facilityCode, selectedView, sessionSiteCode, fromDate, toDate, sitedescr, unitForm, process);
+			mfgDashboard        = null;
+			//---[End]---Modification by Jaffar S. for lookup changes on 30-07-18
 			outputStream        = response.getOutputStream();
 		    outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/mfg/servlet/ProductDevGainWorkOrderServlet.java

 package ibase.dashboard.mfg.servlet;
+import ibase.dashboard.mfg.ejb.MFGDashboard;
 import ibase.dashboard.mfg.ejb.MFGDashboardRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.utility.UserInfoBean;
@@ -26,7 +27,7 @@ public class ProductDevGainWorkOrderServlet extends HttpServlet
 	@SuppressWarnings("unchecked")
 	public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
-		MFGDashboardRemote recallDetailsRemote = null;
+		//MFGDashboardRemote recallDetailsRemote = null;
 		InitialContext context                = null;
 		AppConnectParm appConnectParm         = new AppConnectParm();
 		JSONObject jsonObjData                = null;
@@ -59,10 +60,14 @@ public class ProductDevGainWorkOrderServlet extends HttpServlet
 			
 		    sitedescr=request.getParameter("siteCode");
 		    System.out.println("Site Code: "+sitedescr+"\nfromDate: "+fromDate+"\ntoDate: "+toDate+"\nfacilityCode: "+facilityCode);
-		    
-			context             = new InitialContext(appConnectParm.getProperty());
+		    //---[Start]---Modified by Jaffar S. for lookup changes on 30-07-18
+			/*context             = new InitialContext(appConnectParm.getProperty());
 			recallDetailsRemote = (MFGDashboardRemote) context.lookup("ibase/MFGDashboard/remote");
-			jsonObjData         = (JSONObject) recallDetailsRemote.getProductDevGainWorkOrder(dataSourceName, businessType, facilityCode,selectedView,sessionSiteCode,fromDate,toDate,sitedescr);			
+			jsonObjData         = (JSONObject) recallDetailsRemote.getProductDevGainWorkOrder(dataSourceName, businessType, facilityCode,selectedView,sessionSiteCode,fromDate,toDate,sitedescr);*/			
+			MFGDashboard mfgDashboard = new MFGDashboard();
+			jsonObjData         = (JSONObject) mfgDashboard.getProductDevGainWorkOrder(dataSourceName, businessType, facilityCode,selectedView,sessionSiteCode,fromDate,toDate,sitedescr);
+			mfgDashboard        = null;
+			//---[End]---Modification by Jaffar S. for lookup changes on 30-07-18			
 			outputStream        = response.getOutputStream();
 		    outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/mfg/servlet/ProductDevIssueReworkOrderServlet.java

 package ibase.dashboard.mfg.servlet;
+import ibase.dashboard.mfg.ejb.MFGDashboard;
 import ibase.dashboard.mfg.ejb.MFGDashboardRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.utility.UserInfoBean;
@@ -26,7 +27,7 @@ public class ProductDevIssueReworkOrderServlet extends HttpServlet
 	@SuppressWarnings("unchecked")
 	public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
-		MFGDashboardRemote recallDetailsRemote = null;
+		//MFGDashboardRemote recallDetailsRemote = null;
 		InitialContext context                = null;
 		AppConnectParm appConnectParm         = new AppConnectParm();
 		JSONObject jsonObjData                = null;
@@ -61,10 +62,14 @@ public class ProductDevIssueReworkOrderServlet extends HttpServlet
 			System.out.println("linklable: "+linkLable+"\nSite Code: "+sitedescr+"\nfromDate: "+fromDate+"\ntoDate: "+toDate+"\nfacilityCode: "+facilityCode);
 			sitedescr=request.getParameter("siteCode");
 		    System.out.println();
-		    
-			context             = new InitialContext(appConnectParm.getProperty());
+		    //---[Start]---Modified by Jaffar S. for lookup changes on 30-07-18
+			/*context             = new InitialContext(appConnectParm.getProperty());
 			recallDetailsRemote = (MFGDashboardRemote) context.lookup("ibase/MFGDashboard/remote");
-			jsonObjData         = (JSONObject) recallDetailsRemote.getProductDeviationWorkOrder(dataSourceName, businessType, facilityCode,selectedView,sessionSiteCode,fromDate,toDate,sitedescr,linkLable);			
+			jsonObjData         = (JSONObject) recallDetailsRemote.getProductDeviationWorkOrder(dataSourceName, businessType, facilityCode,selectedView,sessionSiteCode,fromDate,toDate,sitedescr,linkLable);*/			
+			MFGDashboard mfgDashboard = new MFGDashboard();
+			jsonObjData         = (JSONObject) mfgDashboard.getProductDeviationWorkOrder(dataSourceName, businessType, facilityCode,selectedView,sessionSiteCode,fromDate,toDate,sitedescr,linkLable);
+			mfgDashboard        = null;
+			//---[End]---Modification by Jaffar S. for lookup changes on 30-07-18			
 			outputStream        = response.getOutputStream();
 		    outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/mfg/servlet/ProductDevLossWorkOrderServlet.java

 package ibase.dashboard.mfg.servlet;
+import ibase.dashboard.mfg.ejb.MFGDashboard;
 import ibase.dashboard.mfg.ejb.MFGDashboardRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.utility.UserInfoBean;
@@ -26,7 +27,7 @@ public class ProductDevLossWorkOrderServlet extends HttpServlet
 	@SuppressWarnings("unchecked")
 	public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
-		MFGDashboardRemote recallDetailsRemote = null;
+		//MFGDashboardRemote recallDetailsRemote = null;
 		InitialContext context                = null;
 		AppConnectParm appConnectParm         = new AppConnectParm();
 		JSONObject jsonObjData                = null;
@@ -60,9 +61,14 @@ public class ProductDevLossWorkOrderServlet extends HttpServlet
 		    sitedescr=request.getParameter("siteCode");
 		    System.out.println("Site Code: "+sitedescr+"\nfromDate: "+fromDate+"\ntoDate: "+toDate+"\nfacilityCode: "+facilityCode);
 		    
-			context             = new InitialContext(appConnectParm.getProperty());
+		    //---[Start]---Modified by Jaffar S. for lookup changes on 30-07-18
+			/*context             = new InitialContext(appConnectParm.getProperty());
 			recallDetailsRemote = (MFGDashboardRemote) context.lookup("ibase/MFGDashboard/remote");
-			jsonObjData         = (JSONObject) recallDetailsRemote.getProductDevLossWorkOrder(dataSourceName, businessType, facilityCode,selectedView,sessionSiteCode,fromDate,toDate,sitedescr);			
+			jsonObjData         = (JSONObject) recallDetailsRemote.getProductDevLossWorkOrder(dataSourceName, businessType, facilityCode,selectedView,sessionSiteCode,fromDate,toDate,sitedescr);*/			
+			MFGDashboard mfgDashboard = new MFGDashboard();
+			jsonObjData         = (JSONObject) mfgDashboard.getProductDevLossWorkOrder(dataSourceName, businessType, facilityCode,selectedView,sessionSiteCode,fromDate,toDate,sitedescr);
+			mfgDashboard        = null;
+			//---[End]---Modification by Jaffar S. for lookup changes on 30-07-18			
 			outputStream        = response.getOutputStream();
 		    outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/mfg/servlet/ProductDeviationDetServlet.java

 package ibase.dashboard.mfg.servlet;
+import ibase.dashboard.mfg.ejb.MFGDashboard;
 import ibase.dashboard.mfg.ejb.MFGDashboardRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.utility.UserInfoBean;
@@ -28,7 +29,7 @@ public class ProductDeviationDetServlet extends HttpServlet
 	@SuppressWarnings("unchecked")
 	public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
-		MFGDashboardRemote mfgDashboardRemote = null;
+		//MFGDashboardRemote mfgDashboardRemote = null;
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		JSONObject jsonObjData = null;
@@ -57,9 +58,15 @@ public class ProductDeviationDetServlet extends HttpServlet
 			fromDate			= request.getParameter("fromDate");
 			toDate				= request.getParameter("toDate");
 			System.out.println(fromDate+" : To date: "+toDate);
-			context             = new InitialContext(appConnectParm.getProperty());
+			
+			//---[Start]---Modified by Jaffar S. for lookup changes on 30-07-18
+			/*context             = new InitialContext(appConnectParm.getProperty());
 			mfgDashboardRemote  = (MFGDashboardRemote) context.lookup("ibase/MFGDashboard/remote");
-			jsonObjData         = (JSONObject) mfgDashboardRemote.getProductDeviationDet(dataSourceName, businessType, facilityCode, selectedView, sessionSiteCode, fromDate, toDate);
+			jsonObjData         = (JSONObject) mfgDashboardRemote.getProductDeviationDet(dataSourceName, businessType, facilityCode, selectedView, sessionSiteCode, fromDate, toDate);*/
+			MFGDashboard mfgDashboard = new MFGDashboard();
+			jsonObjData         = (JSONObject) mfgDashboard.getProductDeviationDet(dataSourceName, businessType, facilityCode, selectedView, sessionSiteCode, fromDate, toDate);
+			mfgDashboard        = null;
+			//---[End]---Modification by Jaffar S. for lookup changes on 30-07-18
 			outputStream        = response.getOutputStream();
 		    outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/mfg/servlet/ProductDeviationServlet.java

 package ibase.dashboard.mfg.servlet;
+import ibase.dashboard.mfg.ejb.MFGDashboard;
 import ibase.dashboard.mfg.ejb.MFGDashboardRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.utility.UserInfoBean;
@@ -28,7 +29,7 @@ public class ProductDeviationServlet extends HttpServlet
 	@SuppressWarnings("unchecked")
 	public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
-		MFGDashboardRemote mfgDashboardRemote = null;
+		//MFGDashboardRemote mfgDashboardRemote = null;
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		JSONObject jsonObjData = null;
@@ -58,9 +59,15 @@ public class ProductDeviationServlet extends HttpServlet
 			businessType        = request.getParameter("businessType");
 			fromDate			=request.getParameter("fromDate");
 			toDate				=request.getParameter("toDate");
-			context             = new InitialContext(appConnectParm.getProperty());
+			
+			//---[Start]---Modified by Jaffar S. for lookup changes on 30-07-18
+			/*context             = new InitialContext(appConnectParm.getProperty());
 			mfgDashboardRemote  = (MFGDashboardRemote) context.lookup("ibase/MFGDashboard/remote");
-			jsonObjData         = (JSONObject) mfgDashboardRemote.getProductDeviationSumm(dataSourceName, businessType, facilityCode, selectedView, sessionSiteCode, fromDate, toDate);
+			jsonObjData         = (JSONObject) mfgDashboardRemote.getProductDeviationSumm(dataSourceName, businessType, facilityCode, selectedView, sessionSiteCode, fromDate, toDate);*/
+			MFGDashboard mfgDashboard = new MFGDashboard();
+			jsonObjData         = (JSONObject) mfgDashboard.getProductDeviationSumm(dataSourceName, businessType, facilityCode, selectedView, sessionSiteCode, fromDate, toDate);
+			mfgDashboard        = null;
+			//---[End]---Modification by Jaffar S. for lookup changes on 30-07-18
 			outputStream        = response.getOutputStream();
 		    outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/mfg/servlet/ProductWiseRecallServlet.java

 package ibase.dashboard.mfg.servlet;
 
+import ibase.dashboard.mfg.ejb.RecallDetails;
 import ibase.dashboard.mfg.ejb.RecallDetailsRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.webitm.utility.ITMException;
@@ -29,7 +30,7 @@ public class ProductWiseRecallServlet extends HttpServlet
 	@SuppressWarnings("unchecked")
     public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
-		RecallDetailsRemote recallDetailsRemote = null;
+		//RecallDetailsRemote recallDetailsRemote = null;
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		String dataSourceName = "";
@@ -44,11 +45,18 @@ public class ProductWiseRecallServlet extends HttpServlet
 			System.out.println("in doPost" + "lastMonth is ==:" + lastMonth+":" );
 			
 			
-			context = new InitialContext(appConnectParm.getProperty());
+			//---[Start]---Modified by Jaffar S. for lookup changes on 30-07-18
+			/*context = new InitialContext(appConnectParm.getProperty());
 			recallDetailsRemote = (RecallDetailsRemote) context.lookup("ibase/RecallDetails/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
+			setUserInfo(userInfo) for DB connection on dated:14062016
 			recallDetailsRemote.setUserInfo(userInfo);
-			JSONObject jsonObjData      = (JSONObject)recallDetailsRemote.getProductWiseRecallDetails(dataSourceName,lastMonth);
+			JSONObject jsonObjData      = (JSONObject)recallDetailsRemote.getProductWiseRecallDetails(dataSourceName,lastMonth);*/
+			RecallDetails recallDetails = new RecallDetails();
+			recallDetails.setUserInfo(userInfo);
+			JSONObject jsonObjData      = (JSONObject)recallDetails.getProductWiseRecallDetails(dataSourceName,lastMonth);
+			recallDetails               = null;
+			//---[End]---Modification by Jaffar S. for lookup changes on 30-07-18
+			
 			OutputStream outputStream   = response.getOutputStream();			
 		    outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/mfg/servlet/ProfitLossBalSheetServlet.java

 package ibase.dashboard.mfg.servlet;
 
+import ibase.dashboard.mfg.ejb.ProfitLossBalSheet;
 import ibase.dashboard.mfg.ejb.ProfitLossBalSheetRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.webitm.utility.ITMException;
@@ -29,7 +30,7 @@ public class ProfitLossBalSheetServlet extends HttpServlet
 	@SuppressWarnings("unchecked")
     public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
-		ProfitLossBalSheetRemote profitLossBalSheetRemote = null;
+		//ProfitLossBalSheetRemote profitLossBalSheetRemote = null;
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		String dataSourceName = "";
@@ -54,11 +55,17 @@ public class ProfitLossBalSheetServlet extends HttpServlet
 			System.out.println("days is =" + formatcode );
 			System.out.println("days is =" + reporttype );
 			
-			context = new InitialContext(appConnectParm.getProperty());
+			//---[Start]---Modified by Jaffar S. for lookup changes on 30-07-18
+			/*context = new InitialContext(appConnectParm.getProperty());
 			profitLossBalSheetRemote = (ProfitLossBalSheetRemote) context.lookup("ibase/ProfitLossBalSheet/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
+			setUserInfo(userInfo) for DB connection on dated:14062016
 			profitLossBalSheetRemote.setUserInfo(userInfo);
-			JSONObject jsonObjData      = (JSONObject)profitLossBalSheetRemote.getProfitBalanceSheetDetails(sitecode,prdfrom,prdto,acctprd,formatcode,reporttype,dataSourceName);
+			JSONObject jsonObjData      = (JSONObject)profitLossBalSheetRemote.getProfitBalanceSheetDetails(sitecode,prdfrom,prdto,acctprd,formatcode,reporttype,dataSourceName);*/
+			ProfitLossBalSheet profitLossBalSheet = new ProfitLossBalSheet();
+			profitLossBalSheet.setUserInfo(userInfo);
+			JSONObject jsonObjData      = (JSONObject)profitLossBalSheet.getProfitBalanceSheetDetails(sitecode,prdfrom,prdto,acctprd,formatcode,reporttype,dataSourceName);
+			profitLossBalSheet          = null;
+			//---[End]---Modification by Jaffar S. for lookup changes on 30-07-18
 			OutputStream outputStream   = response.getOutputStream();			
 		    outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/mfg/servlet/QCBatchExportPDFServlet.java

 package ibase.dashboard.mfg.servlet;
+import ibase.dashboard.mfg.ejb.HalolMFGRelease;
 import ibase.dashboard.mfg.ejb.HalolMFGReleaseRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.webitm.utility.ITMException;
@@ -27,7 +28,7 @@ public class QCBatchExportPDFServlet extends HttpServlet
 		 String userID          ="";
 		 String imgName         = "";
 		 String resultString    ="";
-	     HalolMFGReleaseRemote halolMFGReleaseRemote = null;
+	     //HalolMFGReleaseRemote halolMFGReleaseRemote = null;
 		 InitialContext context = null;
 		 AppConnectParm appConnectParm = new AppConnectParm();
 		 System.out.println(" ENTER - QCBatchExportPDFServlet  ***********************");
@@ -43,11 +44,19 @@ public class QCBatchExportPDFServlet extends HttpServlet
 		    imgName          = request.getParameter("imgNameList");
 		    System.out.println("userID inside QCBatchExportPDFServlet====="+ userID +"---rptTitle----->"+rptTitle + "---remark--->"+remark); 		     
 		    // call EJB method for PDF creation******************* 
-		    context = new InitialContext(appConnectParm.getProperty());
+		    
+		    //---[Start]---Modified by Jaffar S. for lookup changes on 30-07-18
+		    /*context = new InitialContext(appConnectParm.getProperty());
 			halolMFGReleaseRemote  = (HalolMFGReleaseRemote) context.lookup("ibase/HalolMFGRelease/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
+			setUserInfo(userInfo) for DB connection on dated:14062016
 			halolMFGReleaseRemote.setUserInfo(userInfo);
-			resultString           =  halolMFGReleaseRemote.getPDFByScheduler(rptTitle,remark,userID,imgName);
+			resultString           =  halolMFGReleaseRemote.getPDFByScheduler(rptTitle,remark,userID,imgName);*/
+			HalolMFGRelease halolMFGRelease = new HalolMFGRelease();
+			halolMFGRelease.setUserInfo(userInfo);
+			resultString           =  halolMFGRelease.getPDFByScheduler(rptTitle,remark,userID,imgName);
+			halolMFGRelease        = null;
+			//---[End]---Modification by Jaffar S. for lookup changes on 30-07-18
+			
 			 response.setContentType("text/html");
 			 if(resultString.equals("false"))
 			 {

webitm-dashboard/ibase/dashboard/mfg/servlet/QCSampleCostServlet.java

 package ibase.dashboard.mfg.servlet;
 
+import ibase.dashboard.mfg.ejb.QCSampleCost;
 import ibase.dashboard.mfg.ejb.QCSampleCostRemote;
 import ibase.dashboard.mfg.ejb.SampleRCpDtlRemote;
 import ibase.system.config.AppConnectParm;
@@ -32,7 +33,7 @@ public class QCSampleCostServlet extends HttpServlet
 	@SuppressWarnings("unchecked")
 	public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
-		QCSampleCostRemote qCSampleCostRemote = null;
+		//QCSampleCostRemote qCSampleCostRemote = null;
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		String dataSourceName = "";
@@ -46,11 +47,17 @@ public class QCSampleCostServlet extends HttpServlet
 			dataSourceName = request.getParameter("dataSourceName");
 			geoLocation = request.getParameter("geoLocation");
 			lastMonth = request.getParameter("lastMonth");
-			context = new InitialContext(appConnectParm.getProperty());
+			//---[Start]---Modified by Jaffar S. for lookup changes on 30-07-18
+			/*context = new InitialContext(appConnectParm.getProperty());
 			qCSampleCostRemote = (QCSampleCostRemote) context.lookup("ibase/QCSampleCost/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
+			setUserInfo(userInfo) for DB connection on dated:14062016
 			qCSampleCostRemote.setUserInfo(userInfo);
-			JSONObject jsonObjData = (JSONObject) qCSampleCostRemote.getQCSampleCostData(dataSourceName,geoLocation,lastMonth);
+			JSONObject jsonObjData = (JSONObject) qCSampleCostRemote.getQCSampleCostData(dataSourceName,geoLocation,lastMonth);*/
+			QCSampleCost qcSampleCost = new QCSampleCost();
+			qcSampleCost.setUserInfo(userInfo);
+			JSONObject jsonObjData = (JSONObject) qcSampleCost.getQCSampleCostData(dataSourceName,geoLocation,lastMonth);
+			qcSampleCost           = null;
+			//---[End]---Modification by Jaffar S. for lookup changes on 30-07-18
 			OutputStream outputStream = response.getOutputStream();
 			outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/mfg/servlet/SampleRcpDtlServlet.java

 package ibase.dashboard.mfg.servlet;
 
+import ibase.dashboard.mfg.ejb.SampleRCpDtl;
 import ibase.dashboard.mfg.ejb.SampleRCpDtlRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.webitm.utility.ITMException;
@@ -31,7 +32,7 @@ public class SampleRcpDtlServlet extends HttpServlet
 	@SuppressWarnings("unchecked")
 	public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
-		SampleRCpDtlRemote sampleRCpDtlRemote = null;
+		//SampleRCpDtlRemote sampleRCpDtlRemote = null;
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		String dataSourceName = "";
@@ -43,11 +44,18 @@ public class SampleRcpDtlServlet extends HttpServlet
 			ibase.utility.UserInfoBean userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO");
 			dataSourceName = request.getParameter("dataSourceName");
 			lastMonth = request.getParameter("lastMonth");
-			context = new InitialContext(appConnectParm.getProperty());
+			
+			//---[Start]---Modified by Jaffar S. for lookup changes on 30-07-18
+			/*context = new InitialContext(appConnectParm.getProperty());
 			sampleRCpDtlRemote = (SampleRCpDtlRemote) context.lookup("ibase/SampleRCpDtl/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
+			setUserInfo(userInfo) for DB connection on dated:14062016
 			sampleRCpDtlRemote.setUserInfo(userInfo);
-			JSONObject jsonObjData = (JSONObject) sampleRCpDtlRemote.getSampleRCPDtlData(dataSourceName,lastMonth);
+			JSONObject jsonObjData = (JSONObject) sampleRCpDtlRemote.getSampleRCPDtlData(dataSourceName,lastMonth);*/
+			SampleRCpDtl sampleRCpDtl = new SampleRCpDtl();
+			sampleRCpDtl.setUserInfo(userInfo);
+			JSONObject jsonObjData = (JSONObject) sampleRCpDtl.getSampleRCPDtlData(dataSourceName,lastMonth);
+			sampleRCpDtl           = null;
+			//---[End]---Modification by Jaffar S. for lookup changes on 30-07-18
 			OutputStream outputStream = response.getOutputStream();
 			outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/mfg/servlet/WIPStatusExportPDFServlet.java

 package ibase.dashboard.mfg.servlet;
+import ibase.dashboard.mfg.ejb.WIPStatus;
 import ibase.dashboard.mfg.ejb.WIPStatusRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.webitm.utility.ITMException;
@@ -28,7 +29,7 @@ public class WIPStatusExportPDFServlet extends HttpServlet
 		 String userID          ="";
 		 String imgName         = "";
 		 String resultString    ="";
-		 WIPStatusRemote wipStatusRemote = null;
+		 //WIPStatusRemote wipStatusRemote = null;
 		 InitialContext context = null;
 		 AppConnectParm appConnectParm = new AppConnectParm();
 		System.out.println(" ENTER - WIPStatusExportPDFServlet  ***********************");
@@ -49,11 +50,19 @@ public class WIPStatusExportPDFServlet extends HttpServlet
 		    remark           = request.getParameter("remark");
 		    imgName          = request.getParameter("imgNameList");
 		    System.out.println("userID inside WIPStatusExportPDFServlet====="+ userID +"---rptTitle----->"+rptTitle + "---remark--->"+remark+"---imgName--->"+imgName); 		     
-		    context = new InitialContext(appConnectParm.getProperty());
+		  
+		    //---[Start]---Modified by Jaffar S. for lookup changes on 30-07-18
+		    /*context = new InitialContext(appConnectParm.getProperty());
 			wipStatusRemote  = (WIPStatusRemote) context.lookup("ibase/WIPStatus/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
+			setUserInfo(userInfo) for DB connection on dated:14062016
 			wipStatusRemote.setUserInfo(userInfo);
-			resultString          =  wipStatusRemote.getPDFByScheduler(rptTitle,remark,userID,imgName,sessionCity,sessionSiteCode);
+			resultString        =  wipStatusRemote.getPDFByScheduler(rptTitle,remark,userID,imgName,sessionCity,sessionSiteCode);*/
+			WIPStatus wipStatus = new WIPStatus();
+			wipStatus.setUserInfo(userInfo);
+			resultString        =  wipStatus.getPDFByScheduler(rptTitle,remark,userID,imgName,sessionCity,sessionSiteCode);
+			wipStatus = null;
+			//---[End]---Modification by Jaffar S. for lookup changes on 30-07-18
+			
 			 response.setContentType("text/html");
 			 if(resultString.equals("false"))
 			 {

webitm-dashboard/ibase/dashboard/mfg/servlet/WIPStatusGridLinkServlet.java

 package ibase.dashboard.mfg.servlet;
+import ibase.dashboard.mfg.ejb.WIPStatus;
 import ibase.dashboard.mfg.ejb.WIPStatusRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.webitm.utility.ITMException;
@@ -27,7 +28,7 @@ public class WIPStatusGridLinkServlet extends HttpServlet
 	@SuppressWarnings("unchecked")
     public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
-		WIPStatusRemote wipStatusRemote = null;
+		//WIPStatusRemote wipStatusRemote = null;
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		String dataSourceName = "";
@@ -53,11 +54,19 @@ public class WIPStatusGridLinkServlet extends HttpServlet
 			System.out.println("month :"+month+"---city :"+city+"----category :"+category);
 			
 			dataSourceName    = request.getParameter("dataSourceName"); 
-			context = new InitialContext(appConnectParm.getProperty());
+			
+			//---[Start]---Modified by Jaffar S. for lookup changes on 30-07-18
+			/*context = new InitialContext(appConnectParm.getProperty());
 			wipStatusRemote       = (WIPStatusRemote) context.lookup("ibase/WIPStatus/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
+			setUserInfo(userInfo) for DB connection on dated:14062016
 			wipStatusRemote.setUserInfo(userInfo);
-			JSONObject jsonObjData      = (JSONObject)wipStatusRemote.getWIPStatusLinkGrid(city,siteCode,month,category,dataSourceName);
+			JSONObject jsonObjData      = (JSONObject)wipStatusRemote.getWIPStatusLinkGrid(city,siteCode,month,category,dataSourceName);*/
+			WIPStatus wipStatus = new WIPStatus();
+			wipStatus.setUserInfo(userInfo);
+			JSONObject jsonObjData = (JSONObject)wipStatus.getWIPStatusLinkGrid(city,siteCode,month,category,dataSourceName);
+			wipStatus = null;
+			//---[End]---Modification by Jaffar S. for lookup changes on 30-07-18
+			
 			OutputStream outputStream   = response.getOutputStream();			
 			outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/mfg/servlet/WIPStatusGridServlet.java

 package ibase.dashboard.mfg.servlet;
+import ibase.dashboard.mfg.ejb.WIPStatus;
 import ibase.dashboard.mfg.ejb.WIPStatusRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.webitm.utility.ITMException;
@@ -27,7 +28,7 @@ public class WIPStatusGridServlet extends HttpServlet
 	@SuppressWarnings("unchecked")
     public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
-		WIPStatusRemote wipStatusRemote = null;
+		//WIPStatusRemote wipStatusRemote = null;
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		String dataSourceName = "";
@@ -45,11 +46,19 @@ public class WIPStatusGridServlet extends HttpServlet
 			siteCode			= request.getParameter("siteCode");
 			System.out.println("in WIPStatusGridServlet city :"+city+"====siteCode :"+siteCode);
 			dataSourceName    = request.getParameter("dataSourceName"); 
-			context = new InitialContext(appConnectParm.getProperty());
+			
+			//---[Start]---Modified by Jaffar S. for lookup changes on 30-07-18
+			/*context = new InitialContext(appConnectParm.getProperty());
 			wipStatusRemote       = (WIPStatusRemote) context.lookup("ibase/WIPStatus/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
+			setUserInfo(userInfo) for DB connection on dated:14062016
 			wipStatusRemote.setUserInfo(userInfo);
-			JSONObject jsonObjData      = (JSONObject)wipStatusRemote.getWIPStatusGrid(city, siteCode, dataSourceName);
+			JSONObject jsonObjData      = (JSONObject)wipStatusRemote.getWIPStatusGrid(city, siteCode, dataSourceName);*/
+			WIPStatus wipStatus = new WIPStatus();
+			wipStatus.setUserInfo(userInfo);
+			JSONObject jsonObjData      = (JSONObject)wipStatus.getWIPStatusGrid(city, siteCode, dataSourceName);
+			wipStatus = null;
+			//---[End]---Modification by Jaffar S. for lookup changes on 30-07-18
+			
 			OutputStream outputStream   = response.getOutputStream();			
 			outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/mfg/servlet/WIPStatusServlet.java

 package ibase.dashboard.mfg.servlet;
+import ibase.dashboard.mfg.ejb.WIPStatus;
 import ibase.dashboard.mfg.ejb.WIPStatusRemote;
 import ibase.system.config.AppConnectParm;
 import ibase.webitm.utility.ITMException;
@@ -24,7 +25,7 @@ public class WIPStatusServlet extends HttpServlet
 	@SuppressWarnings("unchecked")
     public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
 	{
-		WIPStatusRemote wipStatusRemote = null;
+		//WIPStatusRemote wipStatusRemote = null;
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		String dataSourceName = "";
@@ -43,11 +44,17 @@ public class WIPStatusServlet extends HttpServlet
 			session.setAttribute("city", city);
 			session.setAttribute("siteCode", siteCode);
 			
-			context = new InitialContext(appConnectParm.getProperty());
+			//---[Start]---Modified by Jaffar S. for lookup changes on 30-07-18
+			/*context = new InitialContext(appConnectParm.getProperty());
 			wipStatusRemote       = (WIPStatusRemote) context.lookup("ibase/WIPStatus/remote");
-			/*setUserInfo(userInfo) for DB connection on dated:14062016*/
+			setUserInfo(userInfo) for DB connection on dated:14062016
 			wipStatusRemote.setUserInfo(userInfo);
-			JSONObject jsonObjData      = (JSONObject)wipStatusRemote.getWIPStatus(city, siteCode, dataSourceName);
+			JSONObject jsonObjData = (JSONObject)wipStatusRemote.getWIPStatus(city, siteCode, dataSourceName);*/
+			WIPStatus wipStatus = new WIPStatus();
+			wipStatus.setUserInfo(userInfo);
+			JSONObject jsonObjData = (JSONObject)wipStatus.getWIPStatus(city, siteCode, dataSourceName);
+			wipStatus = null;
+			//---[End]---Modification by Jaffar S. for lookup changes on 30-07-18
 			OutputStream outputStream   = response.getOutputStream();			
 			outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();