Skip to content

B
business-java
Commit 092cf391 authored by manohar's avatar manohar
Browse files
Options

MF90SUP002 bug fixing 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91282 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d7b3119d
Show whitespace changes
Inline Side-by-side
Showing with 58 additions and 43 deletions
webitm-mfg/ibase/webitm/ejb/mfg/WorkCalendarPrc.java
View file @ 092cf391
......@@ -159,16 +159,16 @@ public class WorkCalendarPrc extends ProcessEJB implements WorkCalendarPrcLocal,
try
{
System.out.println("xtraParams :::::::::::::::::::::::::::::::::: "+xtraParams);
//System.out.println("xtraParams :::::::::::::::::::::::::::::::::: "+xtraParams);
loginSiteCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginSiteCode");
empCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginEmpCode");
chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"userId");
chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"termId");
loginCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode");
System.out.println("empCode..............."+empCode);
System.out.println("Login Site Code............."+loginSiteCode);
System.out.println("userId............."+chgUser);
System.out.println("termId............."+chgTerm);
//System.out.println("empCode..............."+empCode);
//System.out.println("Login Site Code............."+loginSiteCode);
//System.out.println("userId............."+chgUser);
//System.out.println("termId............."+chgTerm);
oraConn = connDriver.getConnectDB("DriverITM");
oraConn.setAutoCommit(false);
connDriver = null;
......@@ -177,7 +177,7 @@ public class WorkCalendarPrc extends ProcessEJB implements WorkCalendarPrcLocal,
//wokCntr = wokCntr == null ? "" :wokCntr;
datefrom = genericUtility.getColumnValue("date_from",headerDom);
dateto = genericUtility.getColumnValue("date_to",headerDom);
System.out.println("Values from dom \n sitecode " + siteCode + "\n wokCntr " + wokCntr + "\n datefrom " + datefrom + "\n dateto " + dateto );
//System.out.println("Values from dom \n sitecode " + siteCode + "\n wokCntr " + wokCntr + "\n datefrom " + datefrom + "\n dateto " + dateto );
//sql = "Select Count(*) from site where site_code = '"+siteCode+"' ";
/* sqlw = "Select Count(*) from workcntr where work_ctr = '"+wokCntr+"' "; */
//System.out.println("select qry from site_code.." + sql);
......@@ -195,8 +195,9 @@ public class WorkCalendarPrc extends ProcessEJB implements WorkCalendarPrcLocal,
}
else
{
sql = "Select count(*) from site where site_code = '"+siteCode+"' ";
sql = "Select count(1) from site where site_code = ?";//'"+siteCode+"' ";
pstmt= oraConn.prepareStatement(sql);
pstmt.setString(1,siteCode);
rs = pstmt.executeQuery();
if(rs.next())
{
......@@ -213,8 +214,9 @@ public class WorkCalendarPrc extends ProcessEJB implements WorkCalendarPrcLocal,
}
if(wokCntr != null)
{
sqlw = "Select count(*) from workcntr where work_ctr = '"+wokCntr+"' ";
sqlw = "Select count(1) from workcntr where work_ctr = ? ";//'"+wokCntr+"' ";
pstmt= oraConn.prepareStatement(sqlw);
pstmt.setString(1,wokCntr);
rs = pstmt.executeQuery();
if(rs.next())
{
......@@ -251,20 +253,20 @@ public class WorkCalendarPrc extends ProcessEJB implements WorkCalendarPrcLocal,
}
if(wokCntr == null || wokCntr.trim().length() == 0)
{
sql = "select count(*) "
sql = "select count(1) "
+ " from work_calendar "
+ " where site_code = '" + siteCode + "'"
+ " and work_date between ? and ? ";
}
else
{
sql = "select count(*) "
sql = "select count(1) "
+ " from work_calendar "
+ " where site_code = '" + siteCode + "'"
+ " and work_ctr = '" + wokCntr + "'"
+ " and work_date between ? and ? ";
}
System.out.println("sql for count ....... " + sql);
//System.out.println("sql for count ....... " + sql);
pstmt = oraConn.prepareStatement(sql);
pstmt.setTimestamp(1,FromDate);
pstmt.setTimestamp(2,ToDate);
......@@ -295,7 +297,7 @@ public class WorkCalendarPrc extends ProcessEJB implements WorkCalendarPrcLocal,
+ " and work_ctr = '" + wokCntr + "'"
+ " and work_date between ? and ? ";
}
System.out.println("sql for delete " + sql);
//System.out.println("sql for delete " + sql);
pstmt = oraConn.prepareStatement(sql);
pstmt.setTimestamp(1,FromDate);
pstmt.setTimestamp(2,ToDate);
......@@ -367,19 +369,23 @@ public class WorkCalendarPrc extends ProcessEJB implements WorkCalendarPrcLocal,
double exch_rate=0,netAmt=0;
Timestamp tranDate =null;
HashMap insUpdHMap = null;
String datefrom = "",dateto = "",holTblno = "",insertQry = "";
String datefrom = "",dateto = "",holTblno = "",insertQry = "", sDayNo = "";
int calDayNo = 0;
Map shift = null;
shift = new HashMap();
int upd[] = new int[10];
Calendar cal = null;
TreeMap dayMap = null;
TreeMap shiftMap = null;
//java.sql.Timestamp ToDate =null,FromDate = null;
System.out.println("Inserting records..........");
try
{
sql = "select hol_tblno from site where site_code = '" + siteCode + "'";
System.out.println("Sql for hol_tblno ::::: " + sql);
sql = "select hol_tblno from site where site_code = ? ";//'" + siteCode + "'";
//System.out.println("Sql for hol_tblno ::::: " + sql);
pstmt = oraConn.prepareStatement(sql);
pstmt.setString(1,siteCode);
rs = pstmt.executeQuery();
while( rs.next() )
{
......@@ -401,6 +407,8 @@ public class WorkCalendarPrc extends ProcessEJB implements WorkCalendarPrcLocal,
//cal.set(year,month,date);
System.out.println("cal :- " + cal.getTime());
cal.add(Calendar.DAY_OF_MONTH,1);
calDayNo = cal.get(Calendar.DAY_OF_WEEK);
sDayNo = (" "+ calDayNo).trim();
System.out.println("cal incr :- " + cal.getTime());
FromDate = new java.sql.Timestamp(cal.getTime().getTime() );
System.out.println("FromDate :- " + FromDate);
......@@ -410,12 +418,13 @@ public class WorkCalendarPrc extends ProcessEJB implements WorkCalendarPrcLocal,
FromDate = Timestamp.valueOf(chan);
System.out.println("FromDate changed :- " + FromDate);
}
sql = " select count(*) "
sql = " select count(1) "
+ " from holiday "
+ " where hol_tblno = '" + holTblno + "'"
+ " where hol_tblno = ? " //'" + holTblno + "'"
+ " and hol_date = ?";
pstmt = oraConn.prepareStatement(sql);
pstmt.setTimestamp(1,FromDate);
pstmt.setString(1,holTblno);
pstmt.setTimestamp(2,FromDate);
rs = pstmt.executeQuery();
while( rs.next())
{
......@@ -445,7 +454,7 @@ public class WorkCalendarPrc extends ProcessEJB implements WorkCalendarPrcLocal,
+ " ?,?,?,"
+ " ?,?,?,"
+ " ?)";
System.out.println("Insert query " + insertQry);
//System.out.println("Insert query " + insertQry);
InsertPstmt = oraConn.prepareStatement(insertQry);
java.sql.Timestamp currDate = null;
String currAppdate = "";
......@@ -457,9 +466,11 @@ public class WorkCalendarPrc extends ProcessEJB implements WorkCalendarPrcLocal,
System.out.println("\n today currDate in DB----" + currAppdate);
currDate = Timestamp.valueOf(currAppdate + " 00:00:00.00");
System.out.println("\n today currDate in timestamp----" + currDate);
TreeMap dayMap = new TreeMap();
TreeMap shiftMap = new TreeMap();
String day[] = new String[100],shiftAr[] = new String[100];
dayMap = null;
shiftMap = null;
dayMap = new TreeMap();
shiftMap = new TreeMap();
//String day[] = new String[100],shiftAr[] = new String[100];
Object name = null,dayOb = null,shiftOb = null;
Object shftName = null,dayNum = null;
int i = 0;
......@@ -468,16 +479,20 @@ public class WorkCalendarPrc extends ProcessEJB implements WorkCalendarPrcLocal,
sql = " SELECT "
+ " DAY_NO ,SHIFT "
+ " FROM WORKSHFT "
+ " WHERE site_code = '" + siteCode + "'";
+ " WHERE site_code = ? " //'" + siteCode + "'";
+ " AND DAY_NO = ? ";
}
else
{
sql = " SELECT DAY_NO ,SHIFT FROM WORKCNTRSHFT"
+ " WHERE site_code = '" + siteCode + "'"
+ " WHERE site_code = ? " //'" + siteCode + "'"
+ " AND DAY_NO = ? "
+ " and work_ctr = '" + wokCntr + "'";
}
System.out.println("select day,shift query :::: " + sql);
//System.out.println("select day,shift query :::: " + sql);
pstmt = oraConn.prepareStatement(sql);
pstmt.setString(1,siteCode);
pstmt.setString(2,sDayNo);
rs = pstmt.executeQuery();
while( rs.next() )
{
......
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