W15ESUN005, Changed by Sneha. Updated warehouse user activity dashboard.

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

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

@@ -44,11 +44,8 @@ public class UserActivity extends ValidatorEJB implements UserActivityRemote, Us
 		PreparedStatement pstmt = null;		
 		
 		// Changed by Sneha Mestry on 29-07-2015, Request ID: W15DSUN014
-		String  sql = "", empCode = "", empName = "", pickOrder = "", pickType = "", noArt = "", locCode = "",
-				inputDate = "";
+		String  sql = "", empCode = "", empName = "", pickOrder = "", pickType = "", noArt = "", locCode = "", inputDate = "";
 		Timestamp tranDateTo = null, tranDateFrom = null;
-		
-		
 		// End by Sneha Mestry on 29-07-2015, Request ID: W15DSUN014
 		
 		/*
@@ -64,7 +61,7 @@ public class UserActivity extends ValidatorEJB implements UserActivityRemote, Us
 			connDriver = null;
 			int count = 0;
 			// Changed by Sneha Mestry on 29-07-2015, Request ID: W15DSUN014
-			String dbDateFormat = genericUtility.getDBDateFormat(); 
+			/*String dbDateFormat = genericUtility.getDBDateFormat(); 
 			String simpleDateFormat = genericUtility.getApplDateFormat();
 			
 			inputDate = genericUtility.getValidDateString(fromDate, simpleDateFormat, dbDateFormat);
@@ -75,21 +72,25 @@ public class UserActivity extends ValidatorEJB implements UserActivityRemote, Us
 			inputDate = genericUtility.getValidDateString(toDate, simpleDateFormat, dbDateFormat);
 			System.out.println("inputDate fromDate :::::: " + inputDate);
 			tranDateTo =  Timestamp.valueOf(inputDate + " 00:00:00.0");
-			System.out.println("TimeStamp toDate :::::: " + tranDateTo);
+			System.out.println("TimeStamp toDate :::::: " + tranDateTo);*/
 
 			sql = "SELECT DDF_GET_EMP_NAME(PIH.EMP_CODE__APRV)  AS EMP_NAME, PIH.EMP_CODE__APRV AS EMP_CODE__APRV, " 
 				+ "COUNT(PID.PICK_ORDER) AS COUNT_PICK_ORDER, PIH.PICK_TYPE, " 
 				+ "(CASE WHEN PIH.PICK_TYPE = 'A' THEN SUM(PID.QUANTITY) ELSE SUM(PID.NO_ART) END) AS SUM_NO_ART, " 
 				+ "COUNT(PID.LOC_CODE) AS COUNT_LOC_CODE FROM PICK_ISS_HDR PIH, PICK_ISS_DET PID " 
-				+ "WHERE PIH.EMP_CODE__APRV >= ? AND PIH.EMP_CODE__APRV <= ? AND PIH.TRAN_DATE >= ? AND PIH.TRAN_DATE <= ? " 
+				+ "WHERE PIH.EMP_CODE__APRV >= ? AND PIH.EMP_CODE__APRV <= ? " 
+				+ "AND PIH.TRAN_DATE >= to_date(?,'dd/mm/yy')  " 
+				+ "AND PIH.TRAN_DATE <= to_date(?,'dd/mm/yy') " 
 				+ "AND PIH.PICK_ORDER = PID.PICK_ORDER AND PIH.TRAN_ID=PID.TRAN_ID AND PIH.CONFIRMED ='Y' AND  PIH.site_code = ? AND " 
 				+ "INSTR(CASE WHEN pick_type = 'C' THEN Q'(C','M)' WHEN pick_type = 'A' THEN 'A' WHEN pick_type = 'B' THEN Q'(C','M','A)' END, " 
 				+ "PIH.PICK_TYPE) > 0 GROUP BY PIH.EMP_CODE__APRV, PID.PICK_ORDER, PIH.PICK_TYPE ";
 			pstmt = conn.prepareStatement(sql);			
 			pstmt.setString(1, empCodeFrom); 
 			pstmt.setString(2, empCodeTo);
-			pstmt.setTimestamp(3, tranDateFrom); 
-			pstmt.setTimestamp(4, tranDateTo);
+			pstmt.setString(3, fromDate); 
+			pstmt.setString(4, toDate);
+			/*pstmt.setTimestamp(3, tranDateFrom); 
+			pstmt.setTimestamp(4, tranDateTo);*/
 			pstmt.setString(5, siteCode);
 			rs = pstmt.executeQuery();
 			while (rs.next())