updated aql for dashboard data as per given bye client

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

webitm-dashboard/ibase/dashboard/scm/ejb/CustomerInfoEJB.java

@@ -13,9 +13,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.Map;
 
 import javax.ejb.Stateless;
@@ -46,13 +44,13 @@ public class CustomerInfoEJB extends ValidatorEJB implements CustomerInfoRemote,
 		PreparedStatement pstmt = null;
 		Connection conn = null;
 		ConnDriver connDriver = new ConnDriver();
-		DashboardUtility dashbordUtil = null;
+		//DashboardUtility dashbordUtil = null;
 		Date frmDate = null;
 		Date toDate = null;
 		try
 		{			
 			System.out.println(" Inside CustomerInfoEJB for getCurrentReceivable Method Data Soruc Name ="+dataSourceName+" custCode:"+custCode+" lastMonth is =" + lastMonth);
-			dashbordUtil             = new DashboardUtility();
+			DashboardUtility dashbordUtil = new DashboardUtility();
 			conn                     = connDriver.getConnectDB(dataSourceName);
 			connDriver               = null;	
 			rawDataCurntRecvbleJson  = new JSONObject(); 

webitm-dashboard/ibase/dashboard/scm/ejb/SalesInventory.java

@@ -21,7 +21,7 @@ public class SalesInventory extends ValidatorEJB implements SalesInventoryRemote
 	GenericUtility genericUtility = GenericUtility.getInstance();
 	//1.This is the main method to show the parent graph 
 	@SuppressWarnings("unchecked")		
-	public JSONObject getSalesInventoryDivWise(String dataSourceName, String month, String from_mns, String  to_mns ) throws RemoteException, ITMException
+	public JSONObject getSalesInventoryDivWise(String dataSourceName, String month, String nomns) throws RemoteException, ITMException
 	{
 		
 		JSONObject rawDataJson = new JSONObject();
@@ -40,7 +40,7 @@ public class SalesInventory extends ValidatorEJB implements SalesInventoryRemote
 			int count=0;
 			if(month!=null && month.trim().length()>0)
 			{
-				System.out.println("month inside EJB SalesInventory.getSalesInventoryDivWise(String dataSourceName, String month) ==="+month);					
+				System.out.println("month inside EJB SalesInventory.getSalesInventoryDivWise(String dataSourceName, String month) ==="+month+"and Nomns==="+nomns);					
 				String selectedmonth  = month.substring(4, 6);				
 				if(selectedmonth.trim().equalsIgnoreCase("01") ||selectedmonth.trim().equalsIgnoreCase("02") ||selectedmonth.trim().equalsIgnoreCase("03"))
 				{
@@ -79,7 +79,8 @@ public class SalesInventory extends ValidatorEJB implements SalesInventoryRemote
 					" GROUP BY item_code UNION ALL SELECT item_code, SUM(cl_stk_qty) AS cl_stk FROM sun.inventory_spl WHERE inv_date= LAST_DAY(TO_DATE('"+month+"','yyyymm')) AND loc_code " +
 					" IN ( SELECT loc_code FROM LOC_SALABLE) GROUP BY item_code ) GROUP BY item_code ) CLSTK WHERE Sl.item_code= i.item_code AND ('"+month+"' = '"+month+"') AND i.item_sub_group NOT " +
 					" IN ('CU','BJ') AND sl.item_code=clstk.item_code(+) GROUP BY sl.item_ser, trim(i.item_sub_group_descr) HAVING SUM(sl.ytdsl)>0 ) GROUP BY item_ser,brand,ytdsl,ytdach,cl_stk,nomn HAVING " +
-					" ( ROUND(cl_stk/(ytdsl/nomn),1) >= '"+from_mns+"' and ROUND(cl_stk/(ytdsl/nomn),1) <= '"+to_mns+"' ) ) A , ITEMSER WHERE a.item_ser=ITEMSER.item_ser AND a.brand NOT LIKE 'DUMMY%'";
+					" ( ROUND(cl_stk/(ytdsl/nomn),1) "+nomns +") ) A , ITEMSER WHERE a.item_ser=ITEMSER.item_ser AND a.brand NOT LIKE 'DUMMY%'";
+				  //" ( ROUND(cl_stk/(ytdsl/nomn),1) >= '"+from_mns+"' and ROUND(cl_stk/(ytdsl/nomn),1) <= '"+to_mns+"' ) ) A , ITEMSER WHERE a.item_ser=ITEMSER.item_ser AND a.brand NOT LIKE 'DUMMY%'";
 					
 			pstmt = conn.prepareStatement(sql);
 			rs = pstmt.executeQuery();

webitm-dashboard/ibase/dashboard/scm/ejb/SalesInventoryLocal.java

@@ -8,7 +8,7 @@ import org.json.simple.JSONObject;
 @Local
 public interface SalesInventoryLocal extends ValidatorLocal 
 {
-	public JSONObject getSalesInventoryDivWise(String dataSourceName,String month,String from_mns, String to_mns) throws RemoteException, ITMException;
+	public JSONObject getSalesInventoryDivWise(String dataSourceName,String month,String nomns) throws RemoteException, ITMException;
 	public JSONObject getSalesInventoryBrandWise(String dataSourceName,String month,String brandName) throws RemoteException, ITMException;
 	
 }

webitm-dashboard/ibase/dashboard/scm/ejb/SalesInventoryRemote.java

@@ -10,7 +10,7 @@ import org.json.simple.JSONObject;
 @Remote
 public interface SalesInventoryRemote extends ValidatorRemote
 {
-	public JSONObject getSalesInventoryDivWise(String dataSourceName,String month,String from_mns, String to_mns) throws RemoteException, ITMException;
+	public JSONObject getSalesInventoryDivWise(String dataSourceName,String month,String nomns) throws RemoteException, ITMException;
 	public JSONObject getSalesInventoryBrandWise(String dataSourceName,String month,String brandName) throws RemoteException, ITMException;
 	
 }