Commit bece18df authored by smestry's avatar smestry

W15ESUN005, Changed by Sneha. Updated the Warehouse User Activity dashboard.


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@98451 ce508802-f39f-4f6c-b175-0d175dae99d5
parent dd3241cd
...@@ -51,10 +51,10 @@ public class ConsignmentDetails extends ValidatorEJB implements ConsignmentDetai ...@@ -51,10 +51,10 @@ public class ConsignmentDetails extends ValidatorEJB implements ConsignmentDetai
String shipment = "", cases = "", weight = "", tasks = "", order = "", week = "", distWeight = "", distCases = "", String shipment = "", cases = "", weight = "", tasks = "", order = "", week = "", distWeight = "", distCases = "",
consumeWeight = "", consumeCases = "", totalWeight = "", totalCases = "", inputDate = "", date = ""; consumeWeight = "", consumeCases = "", totalWeight = "", totalCases = "", inputDate = "", date = "";
//Changed by Sneha on 21-07-2015, Request ID: D15DKAT009 //Changed by Sneha on 21-07-2015, Request ID: W15ESUN005
Timestamp shipDate = null; Timestamp shipDate = null;
Date fromDateCurMonth = null, toDateCurMonth = null, firstDate = null, lastDate = null; Date fromDateCurMonth = null, toDateCurMonth = null, firstDate = null, lastDate = null;
//End by Sneha on 21-07-2015, Request ID: D15DKAT009 //End by Sneha on 21-07-2015, Request ID: W15ESUN005
try try
{ {
conn = connDriver.getConnectDB(dataSourceName); conn = connDriver.getConnectDB(dataSourceName);
...@@ -63,7 +63,7 @@ public class ConsignmentDetails extends ValidatorEJB implements ConsignmentDetai ...@@ -63,7 +63,7 @@ public class ConsignmentDetails extends ValidatorEJB implements ConsignmentDetai
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
Calendar cal1 = Calendar.getInstance(); Calendar cal1 = Calendar.getInstance();
//Changed by Sneha on 21-07-2015, Request ID: D15DKAT009 //Changed by Sneha on 21-07-2015, Request ID: W15ESUN005
SimpleDateFormat dbDateFormat = new SimpleDateFormat(genericUtility.getDBDateFormat()); SimpleDateFormat dbDateFormat = new SimpleDateFormat(genericUtility.getDBDateFormat());
SimpleDateFormat simpleDateFormat = new SimpleDateFormat(genericUtility.getApplDateFormat()); SimpleDateFormat simpleDateFormat = new SimpleDateFormat(genericUtility.getApplDateFormat());
Format formatter = new SimpleDateFormat("dd-MMM-yy"); Format formatter = new SimpleDateFormat("dd-MMM-yy");
...@@ -481,7 +481,7 @@ public class ConsignmentDetails extends ValidatorEJB implements ConsignmentDetai ...@@ -481,7 +481,7 @@ public class ConsignmentDetails extends ValidatorEJB implements ConsignmentDetai
System.out.println("Added 1day in current date :::::: " + firstDate); System.out.println("Added 1day in current date :::::: " + firstDate);
} }
} }
//End by Sneha on 21-07-2015, Request ID: D15DKAT009 //End by Sneha on 21-07-2015, Request ID: W15ESUN005
/* /*
Date dt1 = null, dt2 = null, dt3 = null, dt4 = null; Date dt1 = null, dt2 = null, dt3 = null, dt4 = null;
......
...@@ -17,7 +17,7 @@ public interface ConsignmentDetailsLocal extends ValidatorLocal ...@@ -17,7 +17,7 @@ public interface ConsignmentDetailsLocal extends ValidatorLocal
//public JSONObject getConsignmentDetails(String dataSourceName, String siteCode) throws RemoteException, ITMException; //public JSONObject getConsignmentDetails(String dataSourceName, String siteCode) throws RemoteException, ITMException;
//Changed by Sneha on 21-07-2015, for date parameter Request ID: D15DKAT009 //Changed by Sneha on 21-07-2015, for date parameter Request ID: W15ESUN005
public JSONObject getConsignmentDetails(String dataSourceName, String siteCode, String fromDate, String toDate) throws RemoteException, ITMException; public JSONObject getConsignmentDetails(String dataSourceName, String siteCode, String fromDate, String toDate) throws RemoteException, ITMException;
//End by Sneha on 21-07-2015, for date parameter Request ID: D15DKAT009 //End by Sneha on 21-07-2015, for date parameter Request ID: W15ESUN005
} }
...@@ -18,7 +18,7 @@ public interface ConsignmentDetailsRemote extends ValidatorRemote ...@@ -18,7 +18,7 @@ public interface ConsignmentDetailsRemote extends ValidatorRemote
{ {
//public JSONObject getConsignmentDetails(String dataSourceName, String siteCode) throws RemoteException, ITMException; //public JSONObject getConsignmentDetails(String dataSourceName, String siteCode) throws RemoteException, ITMException;
//Changed by Sneha on 21-07-2015, for date parameter Request ID: D15DKAT009 //Changed by Sneha on 21-07-2015, for date parameter Request ID: W15ESUN005
public JSONObject getConsignmentDetails(String dataSourceName, String siteCode, String fromDate, String toDate) throws RemoteException, ITMException; public JSONObject getConsignmentDetails(String dataSourceName, String siteCode, String fromDate, String toDate) throws RemoteException, ITMException;
//End by Sneha on 21-07-2015, for date parameter Request ID: D15DKAT009 //End by Sneha on 21-07-2015, for date parameter Request ID: W15ESUN005
} }
...@@ -44,17 +44,17 @@ public class ConsignmentDetailsServlet extends HttpServlet ...@@ -44,17 +44,17 @@ public class ConsignmentDetailsServlet extends HttpServlet
{ {
response.setContentType("application/xml"); response.setContentType("application/xml");
dataSourceName = request.getParameter("dataSourceName"); dataSourceName = request.getParameter("dataSourceName");
/*HttpSession session = request.getSession(true); HttpSession session = request.getSession(true);
ibase.utility.UserInfoBean userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO"); ibase.utility.UserInfoBean userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO");
siteCode = userInfo.getSiteCode();*/ siteCode = userInfo.getSiteCode();
System.out.println(" siteCode :::::::::: " + siteCode); System.out.println(" siteCode :::::::::: " + siteCode);
//Changed by Sneha, for date parameter Request ID: D15DKAT009 //Changed by Sneha, for date parameter Request ID: W15ESUN005
fromDate = request.getParameter("fromDate"); fromDate = request.getParameter("fromDate");
toDate = request.getParameter("toDate"); toDate = request.getParameter("toDate");
System.out.println(" fromDate :::::::::: " + fromDate); System.out.println(" fromDate :::::::::: " + fromDate);
System.out.println(" toDate :::::::::: " + toDate); System.out.println(" toDate :::::::::: " + toDate);
//End by Sneha, for date parameter Request ID: D15DKAT009 //End by Sneha, for date parameter Request ID: W15ESUN005
context = new InitialContext(appConnectParm.getProperty()); context = new InitialContext(appConnectParm.getProperty());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment