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
Hide 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, ...@@ -159,16 +159,16 @@ public class WorkCalendarPrc extends ProcessEJB implements WorkCalendarPrcLocal,
try try
{ {
System.out.println("xtraParams :::::::::::::::::::::::::::::::::: "+xtraParams); //System.out.println("xtraParams :::::::::::::::::::::::::::::::::: "+xtraParams);
loginSiteCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginSiteCode"); loginSiteCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginSiteCode");
empCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginEmpCode"); empCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginEmpCode");
chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"userId"); chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"userId");
chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"termId"); chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"termId");
loginCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode"); loginCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode");
System.out.println("empCode..............."+empCode); //System.out.println("empCode..............."+empCode);
System.out.println("Login Site Code............."+loginSiteCode); //System.out.println("Login Site Code............."+loginSiteCode);
System.out.println("userId............."+chgUser); //System.out.println("userId............."+chgUser);
System.out.println("termId............."+chgTerm); //System.out.println("termId............."+chgTerm);
oraConn = connDriver.getConnectDB("DriverITM"); oraConn = connDriver.getConnectDB("DriverITM");
oraConn.setAutoCommit(false); oraConn.setAutoCommit(false);
connDriver = null; connDriver = null;
...@@ -177,7 +177,7 @@ public class WorkCalendarPrc extends ProcessEJB implements WorkCalendarPrcLocal, ...@@ -177,7 +177,7 @@ public class WorkCalendarPrc extends ProcessEJB implements WorkCalendarPrcLocal,
//wokCntr = wokCntr == null ? "" :wokCntr; //wokCntr = wokCntr == null ? "" :wokCntr;
datefrom = genericUtility.getColumnValue("date_from",headerDom); datefrom = genericUtility.getColumnValue("date_from",headerDom);
dateto = genericUtility.getColumnValue("date_to",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+"' "; //sql = "Select Count(*) from site where site_code = '"+siteCode+"' ";
/* sqlw = "Select Count(*) from workcntr where work_ctr = '"+wokCntr+"' "; */ /* sqlw = "Select Count(*) from workcntr where work_ctr = '"+wokCntr+"' "; */
//System.out.println("select qry from site_code.." + sql); //System.out.println("select qry from site_code.." + sql);
...@@ -195,8 +195,9 @@ public class WorkCalendarPrc extends ProcessEJB implements WorkCalendarPrcLocal, ...@@ -195,8 +195,9 @@ public class WorkCalendarPrc extends ProcessEJB implements WorkCalendarPrcLocal,
} }
else 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= oraConn.prepareStatement(sql);
pstmt.setString(1,siteCode);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
...@@ -213,8 +214,9 @@ public class WorkCalendarPrc extends ProcessEJB implements WorkCalendarPrcLocal, ...@@ -213,8 +214,9 @@ public class WorkCalendarPrc extends ProcessEJB implements WorkCalendarPrcLocal,
} }
if(wokCntr != null) 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= oraConn.prepareStatement(sqlw);
pstmt.setString(1,wokCntr);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
...@@ -251,20 +253,20 @@ public class WorkCalendarPrc extends ProcessEJB implements WorkCalendarPrcLocal, ...@@ -251,20 +253,20 @@ public class WorkCalendarPrc extends ProcessEJB implements WorkCalendarPrcLocal,
} }
if(wokCntr == null || wokCntr.trim().length() == 0) if(wokCntr == null || wokCntr.trim().length() == 0)
{ {
sql = "select count(*) " sql = "select count(1) "
+ " from work_calendar " + " from work_calendar "
+ " where site_code = '" + siteCode + "'" + " where site_code = '" + siteCode + "'"
+ " and work_date between ? and ? "; + " and work_date between ? and ? ";
} }
else else
{ {
sql = "select count(*) " sql = "select count(1) "
+ " from work_calendar " + " from work_calendar "
+ " where site_code = '" + siteCode + "'" + " where site_code = '" + siteCode + "'"
+ " and work_ctr = '" + wokCntr + "'" + " and work_ctr = '" + wokCntr + "'"
+ " and work_date between ? and ? "; + " and work_date between ? and ? ";
} }
System.out.println("sql for count ....... " + sql); //System.out.println("sql for count ....... " + sql);
pstmt = oraConn.prepareStatement(sql); pstmt = oraConn.prepareStatement(sql);
pstmt.setTimestamp(1,FromDate); pstmt.setTimestamp(1,FromDate);
pstmt.setTimestamp(2,ToDate); pstmt.setTimestamp(2,ToDate);
...@@ -295,7 +297,7 @@ public class WorkCalendarPrc extends ProcessEJB implements WorkCalendarPrcLocal, ...@@ -295,7 +297,7 @@ public class WorkCalendarPrc extends ProcessEJB implements WorkCalendarPrcLocal,
+ " and work_ctr = '" + wokCntr + "'" + " and work_ctr = '" + wokCntr + "'"
+ " and work_date between ? and ? "; + " and work_date between ? and ? ";
} }
System.out.println("sql for delete " + sql); //System.out.println("sql for delete " + sql);
pstmt = oraConn.prepareStatement(sql); pstmt = oraConn.prepareStatement(sql);
pstmt.setTimestamp(1,FromDate); pstmt.setTimestamp(1,FromDate);
pstmt.setTimestamp(2,ToDate); pstmt.setTimestamp(2,ToDate);
...@@ -307,23 +309,23 @@ public class WorkCalendarPrc extends ProcessEJB implements WorkCalendarPrcLocal, ...@@ -307,23 +309,23 @@ public class WorkCalendarPrc extends ProcessEJB implements WorkCalendarPrcLocal,
//errString = insertSchedule(siteCode,wokCntr,FromDate,ToDate,chgUser,chgTerm); //errString = insertSchedule(siteCode,wokCntr,FromDate,ToDate,chgUser,chgTerm);
} }
errString = insertSchedule(siteCode,wokCntr,FromDate,ToDate,chgUser,chgTerm,oraConn); errString = insertSchedule(siteCode,wokCntr,FromDate,ToDate,chgUser,chgTerm,oraConn);
if(errString != null && errString.trim().length() == 0) if(errString != null && errString.trim().length() == 0)
{ {
oraConn.commit(); oraConn.commit();
System.out.println("Connection commited................. "); System.out.println("Connection commited................. ");
errString = itmDBAccessEJB.getErrorString("","WRKCALSUCC",chgUser); errString = itmDBAccessEJB.getErrorString("","WRKCALSUCC",chgUser);
} }
else if(errString.equals("VTNORECFND")) else if(errString.equals("VTNORECFND"))
{ {
System.out.println("Connection rollbacked"); System.out.println("Connection rollbacked");
oraConn.rollback(); oraConn.rollback();
errString = itmDBAccessEJB.getErrorString("","VTNORECFND",chgUser); errString = itmDBAccessEJB.getErrorString("","VTNORECFND",chgUser);
} }
else else
{ {
System.out.println("Connection rollbacked"); System.out.println("Connection rollbacked");
oraConn.rollback(); oraConn.rollback();
} }
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -367,19 +369,23 @@ public class WorkCalendarPrc extends ProcessEJB implements WorkCalendarPrcLocal, ...@@ -367,19 +369,23 @@ public class WorkCalendarPrc extends ProcessEJB implements WorkCalendarPrcLocal,
double exch_rate=0,netAmt=0; double exch_rate=0,netAmt=0;
Timestamp tranDate =null; Timestamp tranDate =null;
HashMap insUpdHMap = null; HashMap insUpdHMap = null;
String datefrom = "",dateto = "",holTblno = "",insertQry = ""; String datefrom = "",dateto = "",holTblno = "",insertQry = "", sDayNo = "";
int calDayNo = 0;
Map shift = null; Map shift = null;
shift = new HashMap(); shift = new HashMap();
int upd[] = new int[10]; int upd[] = new int[10];
Calendar cal = null; Calendar cal = null;
TreeMap dayMap = null;
TreeMap shiftMap = null;
//java.sql.Timestamp ToDate =null,FromDate = null; //java.sql.Timestamp ToDate =null,FromDate = null;
System.out.println("Inserting records.........."); System.out.println("Inserting records..........");
try try
{ {
sql = "select hol_tblno from site where site_code = '" + siteCode + "'"; sql = "select hol_tblno from site where site_code = ? ";//'" + siteCode + "'";
System.out.println("Sql for hol_tblno ::::: " + sql); //System.out.println("Sql for hol_tblno ::::: " + sql);
pstmt = oraConn.prepareStatement(sql); pstmt = oraConn.prepareStatement(sql);
pstmt.setString(1,siteCode);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while( rs.next() ) while( rs.next() )
{ {
...@@ -401,6 +407,8 @@ public class WorkCalendarPrc extends ProcessEJB implements WorkCalendarPrcLocal, ...@@ -401,6 +407,8 @@ public class WorkCalendarPrc extends ProcessEJB implements WorkCalendarPrcLocal,
//cal.set(year,month,date); //cal.set(year,month,date);
System.out.println("cal :- " + cal.getTime()); System.out.println("cal :- " + cal.getTime());
cal.add(Calendar.DAY_OF_MONTH,1); cal.add(Calendar.DAY_OF_MONTH,1);
calDayNo = cal.get(Calendar.DAY_OF_WEEK);
sDayNo = (" "+ calDayNo).trim();
System.out.println("cal incr :- " + cal.getTime()); System.out.println("cal incr :- " + cal.getTime());
FromDate = new java.sql.Timestamp(cal.getTime().getTime() ); FromDate = new java.sql.Timestamp(cal.getTime().getTime() );
System.out.println("FromDate :- " + FromDate); System.out.println("FromDate :- " + FromDate);
...@@ -410,12 +418,13 @@ public class WorkCalendarPrc extends ProcessEJB implements WorkCalendarPrcLocal, ...@@ -410,12 +418,13 @@ public class WorkCalendarPrc extends ProcessEJB implements WorkCalendarPrcLocal,
FromDate = Timestamp.valueOf(chan); FromDate = Timestamp.valueOf(chan);
System.out.println("FromDate changed :- " + FromDate); System.out.println("FromDate changed :- " + FromDate);
} }
sql = " select count(*) " sql = " select count(1) "
+ " from holiday " + " from holiday "
+ " where hol_tblno = '" + holTblno + "'" + " where hol_tblno = ? " //'" + holTblno + "'"
+ " and hol_date = ?"; + " and hol_date = ?";
pstmt = oraConn.prepareStatement(sql); pstmt = oraConn.prepareStatement(sql);
pstmt.setTimestamp(1,FromDate); pstmt.setString(1,holTblno);
pstmt.setTimestamp(2,FromDate);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while( rs.next()) while( rs.next())
{ {
...@@ -445,7 +454,7 @@ public class WorkCalendarPrc extends ProcessEJB implements WorkCalendarPrcLocal, ...@@ -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); InsertPstmt = oraConn.prepareStatement(insertQry);
java.sql.Timestamp currDate = null; java.sql.Timestamp currDate = null;
String currAppdate = ""; String currAppdate = "";
...@@ -457,9 +466,11 @@ public class WorkCalendarPrc extends ProcessEJB implements WorkCalendarPrcLocal, ...@@ -457,9 +466,11 @@ public class WorkCalendarPrc extends ProcessEJB implements WorkCalendarPrcLocal,
System.out.println("\n today currDate in DB----" + currAppdate); System.out.println("\n today currDate in DB----" + currAppdate);
currDate = Timestamp.valueOf(currAppdate + " 00:00:00.00"); currDate = Timestamp.valueOf(currAppdate + " 00:00:00.00");
System.out.println("\n today currDate in timestamp----" + currDate); System.out.println("\n today currDate in timestamp----" + currDate);
TreeMap dayMap = new TreeMap(); dayMap = null;
TreeMap shiftMap = new TreeMap(); shiftMap = null;
String day[] = new String[100],shiftAr[] = new String[100]; dayMap = new TreeMap();
shiftMap = new TreeMap();
//String day[] = new String[100],shiftAr[] = new String[100];
Object name = null,dayOb = null,shiftOb = null; Object name = null,dayOb = null,shiftOb = null;
Object shftName = null,dayNum = null; Object shftName = null,dayNum = null;
int i = 0; int i = 0;
...@@ -468,16 +479,20 @@ public class WorkCalendarPrc extends ProcessEJB implements WorkCalendarPrcLocal, ...@@ -468,16 +479,20 @@ public class WorkCalendarPrc extends ProcessEJB implements WorkCalendarPrcLocal,
sql = " SELECT " sql = " SELECT "
+ " DAY_NO ,SHIFT " + " DAY_NO ,SHIFT "
+ " FROM WORKSHFT " + " FROM WORKSHFT "
+ " WHERE site_code = '" + siteCode + "'"; + " WHERE site_code = ? " //'" + siteCode + "'";
+ " AND DAY_NO = ? ";
} }
else else
{ {
sql = " SELECT DAY_NO ,SHIFT FROM WORKCNTRSHFT" sql = " SELECT DAY_NO ,SHIFT FROM WORKCNTRSHFT"
+ " WHERE site_code = '" + siteCode + "'" + " WHERE site_code = ? " //'" + siteCode + "'"
+ " AND DAY_NO = ? "
+ " and work_ctr = '" + wokCntr + "'"; + " 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 = oraConn.prepareStatement(sql);
pstmt.setString(1,siteCode);
pstmt.setString(2,sDayNo);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while( rs.next() ) 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