Added new Fields in sales trends and added new method in shortage inventory

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

webitm-dashboard/ibase/dashboard/scm/servlet/AngShortageInventoryServlet.java

@@ -14,6 +14,7 @@ import javax.servlet.http.HttpSession;
 import org.json.simple.JSONArray;
 import ibase.dashboard.scm.ejb.ShortageInventory;
 import ibase.system.config.AppConnectParm;
+import ibase.utility.BaseLogger;
 import ibase.webitm.utility.ITMException;
 
 //created for shortage inventory to call ang module
@@ -36,13 +37,10 @@ public class AngShortageInventoryServlet extends HttpServlet
 		String dataSourceName = "";
 		String loginSiteCode  = "";
 		String finYear        = "";
-		String inventoryData = "";
-		String siteCode = "";
-		String fromDate = "";
-		String toDate   = "";
-		String from_Date = "";
-		String to_Date   = "";
-		
+		//String inventoryData = "";
+		String siteCode = "" , siteCodefr = "" , siteCodeto = "";
+		String fromDate = "" , toDate   = "";
+		String locCodefr  = "" , locCodeto  = "" ,available = "";
 		
 		try
 		{
@@ -61,7 +59,15 @@ public class AngShortageInventoryServlet extends HttpServlet
 			 String userTranDB = "Driver"; // OracleDS<TRANS_DB> - <USER>VIS
 			//dataSourceName = request.getParameter("dataSourceName");
 			finYear        = request.getParameter("finYear");
-			siteCode       = request.getParameter("SITE_CODE");
+			siteCodefr       = request.getParameter("SITE_CODE_FR");
+			siteCodeto       = request.getParameter("SITE_CODE_TO");
+			locCodefr        = request.getParameter("LOC_CODE_FR");
+			locCodeto        = request.getParameter("LOC_CODE_TO");
+			available      = request.getParameter("AVAILABLE");
+			
+			BaseLogger.log("3",null,null,"available IN SERVLET ::::::::::::::::: " + available);
+			BaseLogger.log("3",null,null,"siteCodefr AND siteCodeto IN SERVLET ::::::::::::::::: " + " FROM = " + siteCodefr + " To = " + siteCodeto);
+			BaseLogger.log("3",null,null,"locCodefr AND locCodeto IN SERVLET ::::::::::::::::: " + " FROM = " + locCodefr + " To = " + locCodeto);
 			
 			fromDate       = request.getParameter("fromDate"); // date comes from here
 			BaseLogger.log("3",null,null,"fromDate ::::: " + fromDate ) ;
@@ -86,8 +92,8 @@ public class AngShortageInventoryServlet extends HttpServlet
 			
 			//json array object 
 			
-			inventoryData =  shortageInventory.getAngShortageInventory(dataSourceName,siteCode,finYear,fromDate,toDate);
-			
+			//inventoryData =  shortageInventory.getAngShortageInventory(dataSourceName,siteCode,finYear,fromDate,toDate);
+			JSONArray inventoryData = (JSONArray) shortageInventory.getInventoryShortage(dataSourceName,siteCodefr,siteCodeto,locCodefr,locCodeto,available);
 			//---End by Jaffar S.
 			
 			OutputStream outputStream  = response.getOutputStream();