Skip to content

B
business-java
Commit 38d86019 authored by akhokar's avatar akhokar
Browse files
Options

LogWriterDatabase.java 

AdmCommon.java
PayrollPostAccPrc.java

-Final changes of payroll posting after testing at sun uat database

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@198903 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 1ea893ff
Show whitespace changes
Inline Side-by-side
Showing with 415 additions and 355 deletions
webitm-adm/ibase/webitm/bean/adm/LogWriterDatabase.java
View file @ 38d86019
......@@ -10,8 +10,9 @@ public class LogWriterDatabase
{
private String jobID = "", objName = "", statusDetail = "", transactionCreatedBy = "", inetCreatedBy = "", logFileCreatedBy = "",userId ="",
currentProcess = "", activity = "", processId = "", errorCode = "", LogLocationType ="",LogServerAddress ="", statusType = "",
rowsRejected = "", rowsProcessed = "" , rowsIgnored = "" , totalRows = "" , jobTerminateRequested = "", returnUpdError = "",
logFileName = "",wsrLogFileName = "",fileNameStartWith = "";
jobTerminateRequested = "", returnUpdError = "",logFileName = "",wsrLogFileName = "",fileNameStartWith = "";
int rowsRejected = 0,rowsIgnored = 0,rowsProcessed = 0,totalRows = 0;
FileOutputStream fileWriterLog = null;
......@@ -28,8 +29,8 @@ public class LogWriterDatabase
public String getJobID() {
return jobID;
}
public String setJobID(String jobID) {
return this.jobID = jobID;
public void setJobID(String jobID) {
this.jobID = jobID;
}
public String getErrorCode() {
return errorCode;
......@@ -133,28 +134,28 @@ public class LogWriterDatabase
public void setUserId(String userId) {
this.userId = userId;
}
public String getRowsProcessed() {
public int getRowsProcessed() {
return rowsProcessed;
}
public void setRowsProcessed(String rowsProcessed) {
public void setRowsProcessed(int rowsProcessed) {
this.rowsProcessed = rowsProcessed;
}
public String getRowsRejected() {
public int getRowsRejected() {
return rowsRejected;
}
public void setRowsRejected(String rowsRejected) {
public void setRowsRejected(int rowsRejected) {
this.rowsRejected = rowsRejected;
}
public String getRowsIgnored() {
public int getRowsIgnored() {
return rowsIgnored;
}
public void setRowsIgnored(String rowsIgnored) {
public void setRowsIgnored(int rowsIgnored) {
this.rowsIgnored = rowsIgnored;
}
public String getTotalRows() {
public int getTotalRows() {
return totalRows;
}
public void setTotalRows(String totalRows) {
public void setTotalRows(int totalRows) {
this.totalRows = totalRows;
}
......
webitm-adm/ibase/webitm/ejb/adm/AdmCommon.java
View file @ 38d86019
package ibase.webitm.ejb.adm;
import ibase.system.config.ConnDriver;
import ibase.utility.BaseException;
import ibase.utility.CommonConstants;
import ibase.utility.E12GenericUtility;
import ibase.utility.UserInfoBean;
import java.sql.*;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLEncoder;
import java.rmi.RemoteException;
// Modified by Vishal Thakur on 04-07-2017 [Migration from PB to JAVA for Employee Leave][END]
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Calendar;
import java.text.SimpleDateFormat;
import ibase.webitm.utility.*;
// Modified By Hemlata on [11/11/2014] To update org_structure and org_struc_trace on postsave[Start]
import java.util.Date;
import java.text.SimpleDateFormat;
// Modified By Hemlata on [11/11/2014] To update org_structure and org_struc_trace on postsave[End]
// Modified by Vishal Thakur on 04-07-2017 [Migration from PB to JAVA for Employee Leave][Start]
import java.util.HashMap;
import org.w3c.dom.Document;
import ibase.system.config.ConnDriver;
import ibase.utility.CommonConstants;
import ibase.utility.E12GenericUtility;
import ibase.utility.UserInfoBean;
import ibase.webitm.bean.adm.LogWriterDatabase;
import ibase.webitm.ejb.ITMDBAccessEJB;
import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.ejb.sys.UtilMethods;
import ibase.webitm.utility.GenericUtility;
import ibase.webitm.utility.ITMException;
import ibase.webitm.utility.TransIDGenerator;
import java.io.*;
import java.net.HttpURLConnection;
......@@ -2203,48 +2214,10 @@ public class AdmCommon
// Added by Azhar LogWriter methods----------------------------------
public LogWriterDatabase initializeLogWriter(HashMap gbflogWriterMap,Document headerDom, Connection conn) throws ITMException
{
System.out.println("Inside admCommon initializeLogWriter method....");
Connection localConn = null;
LogWriterDatabase logWriter = new LogWriterDatabase();
try
{
System.out.println("localConn:::: " + localConn);
logWriter = initializeLogWriter(gbflogWriterMap,headerDom,conn,localConn);
}
catch (Exception e)
{
System.out.println("Exception :: " + e.getMessage());
e.printStackTrace();
throw new ITMException(e);
}
finally
{
try {
if(localConn != null)
{
localConn.close();
localConn = null;
}
}
catch (Exception e)
{
e.printStackTrace();
throw new ITMException(e);
}
}
return logWriter;
}
public LogWriterDatabase initializeLogWriter(HashMap gbflogWriterMap,Document headerDom, Connection conn,Connection localConn) throws ITMException
public LogWriterDatabase initializeLogWriter(HashMap gbflogWriterMap,Document headerDom, Connection logConn) throws ITMException
{
System.out.println("Inside admCommon initializeLogWriter localConn method....");
String isFileName = "c:\\appl\\itm26\\payarr_err.log";
String isFileName = "";
String jobId = "", sql = "", maxJobId = "",logLocationType= "",filePath="",logServerAddress="" , lsType="",lsLogMsg= "";
String isLogFileName = "",logFileName = "",wsrLogFileName = "",fileNameStartWith = "";
int cnt = 0, insertCnt = 0, liRet= 1,filePointer;
......@@ -2255,14 +2228,14 @@ public class AdmCommon
UtilMethods utilMethod = new UtilMethods();
String isCurrentLine = "",currentProcess = "",xtraParams = "",processId = "",objName = "",userId = "",loginSite = "";
StringBuffer xmlFileData = new StringBuffer();
ConnDriver connDriver = null;
String userInfoStr = "";
UserInfoBean userInfoBean = null;
String transDb = "";
boolean connFlag = false;
//ConnDriver connDriver = null;
//String userInfoStr = "";
//UserInfoBean userInfoBean = null;
//String transDb = "";
//boolean connFlag = false;
try
{
userInfoStr = getUserInfoStr((String) gbflogWriterMap.get("xtraParams"));
/*userInfoStr = getUserInfoStr((String) gbflogWriterMap.get("xtraParams"));
System.out.println("userInfoStr:::: " + userInfoStr);
userInfoBean = new UserInfoBean(userInfoStr);
System.out.println("userInfoBean:::: " + userInfoBean);
......@@ -2286,7 +2259,7 @@ public class AdmCommon
connFlag = true;
System.out.println("connFlag becomes false to ---["+ connFlag +"]");
}
}*/
System.out.println("gbflogWriterMap:::: " + gbflogWriterMap);
logWriter.setCurrentProcess((String) gbflogWriterMap.get("currentProcess"));
......@@ -2309,10 +2282,10 @@ public class AdmCommon
logWriter.setProcessId(logWriter.getCurrentProcess());
}
logWriter.setLogLineNo(0);
logWriter.setTotalRows("0");
logWriter.setRowsProcessed("0");
logWriter.setRowsIgnored("0");
logWriter.setRowsRejected("0");
logWriter.setTotalRows(0);
logWriter.setRowsProcessed(0);
logWriter.setRowsIgnored(0);
logWriter.setRowsRejected(0);
logWriter.setObjName(objName);
logWriter.setJobIdCreated(false);
......@@ -2350,7 +2323,7 @@ public class AdmCommon
if(logLocationType == null || logLocationType.trim().length() == 0)
{
logLocationType = checkNull(genericUtility.getColumnValue("Log_Location_Type", domInitData));
if(logLocationType == null || logLocationType.trim().length() == 0 )
if(logLocationType == null || logLocationType.trim().length() == 0)
{
logLocationType = "N";
}
......@@ -2378,15 +2351,23 @@ public class AdmCommon
System.out.println("jobId :::: " + jobId);
if(jobId == null || jobId.trim().length() == 0)
{
jobId = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "job_id");
System.out.println("xtraParams::: " + xtraParams);
System.out.println("jobId::: " + jobId);
logWriter.setJobID(genericUtility.getValueFromXTRA_PARAMS(xtraParams,"job_id"));
jobId = logWriter.getJobID();
System.out.println("jobId getting from xtraParams ::: " + jobId);
System.out.println("jobId==> " + jobId + " loginCode==> " + userId);
if(jobId.equalsIgnoreCase(userId))
{
logWriter.setJobID(null);
jobId = logWriter.getJobID();
System.out.println("jobId set to==> " + jobId);
}
if(jobId == null || jobId.trim().length() == 0)
{
if("D".equalsIgnoreCase(logLocationType))
{
sql = "select max(job_id) as job_id from Background_Job where job_id like 'HR%'";
pstmt = localConn.prepareStatement(sql);
pstmt = logConn.prepareStatement(sql);
resultSet = pstmt.executeQuery();
while(resultSet.next())
{
......@@ -2419,16 +2400,17 @@ public class AdmCommon
logWriter.setJobID(jobId);
logWriter.setJobIdCreated(true);
xtraParams = xtraParams + "~~~job_id=" + jobId;
System.out.println("xtraParams after adding jobId::: " + xtraParams);
}
}
}
System.out.println("Job Id for Background_Job ::: ["+jobId+"]");
logWriter.setJobID(jobId);
System.out.println("jobId :::: " + jobId);
System.out.println("Final jobId :::: " + jobId);
if(jobId != null && jobId.trim().length() > 0)
{
sql = "select count(1) as cnt from Background_Job where job_id = ?";
pstmt = localConn.prepareStatement(sql);
pstmt = logConn.prepareStatement(sql);
pstmt.setString(1, jobId);
resultSet = pstmt.executeQuery();
while(resultSet.next())
......@@ -2449,7 +2431,7 @@ public class AdmCommon
{
sql = "insert into Background_Job (job_id, created_date, obj_name, obj_type, job_stat, user_id, exec_date, login_site) " +
" values (?, ?, ?, 'P', 'P', ?, ?, ?)";
pstmt = localConn.prepareStatement(sql);
pstmt = logConn.prepareStatement(sql);
pstmt.setString(1, jobId);
pstmt.setTimestamp(2, new Timestamp(System.currentTimeMillis()));
pstmt.setString(3, logWriter.getObjName());
......@@ -2457,6 +2439,7 @@ public class AdmCommon
pstmt.setTimestamp(5, new Timestamp(System.currentTimeMillis()));
pstmt.setString(6, loginSite);
insertCnt = pstmt.executeUpdate();
logConn.commit();
if(pstmt != null)
{
......@@ -2546,12 +2529,12 @@ public class AdmCommon
{
try {
if(connFlag == true)
/* if(connFlag == true)
{
System.out.println("connFlag is [" + connFlag + "] and ready to commit localConn....!!!");
localConn.commit();
System.out.println("localConn committed successfully....!!!!!");
}
}*/
if(resultSet != null)
{
......@@ -2573,45 +2556,26 @@ public class AdmCommon
return logWriter;
}
public String releaseLogWriter(String mtype,String lsLogStr,LogWriterDatabase logWriter,Connection conn) throws ITMException
{
System.out.println("Inside admCommon releaseLogWriter method....");
String lsError= "";
try {
logWriter = gbfErrWrite("","",mtype,lsLogStr, "I",logWriter,conn);
lsError = logWriter.getReturnUpdError();
}
catch (Exception e)
{
System.out.println("Exception :: " + e.getMessage());
e.printStackTrace();
throw new ITMException(e);
}
return lsError;
}
public LogWriterDatabase gbfErrWrite(String asPrdCode, String asEmpCode, String asType, String asErrCode, String asSeverity,LogWriterDatabase logWriter,Connection Conn) throws ITMException
public LogWriterDatabase gbfErrWrite(String asPrdCode, String asEmpCode, String asType, String asErrCode, String asSeverity,LogWriterDatabase logWriter,Connection logConn) throws ITMException
{
System.out.println("Inside admCommon gbfErrWrite method with 5 parameters....");
E12GenericUtility genericUtility = new E12GenericUtility();
ConnDriver connDriver = null;
Connection localConn = null;
//Connection localConn = null;
String lsStr = "" , lsErr = "" , lsErrCode = "";
String userInfoStr = "",chgTerm = "",loginSite = "",xtraParams = "",userId = "";
UserInfoBean userInfoBean = null;
String transDb = "";
boolean connFlag = false;
//UserInfoBean userInfoBean = null;
//String transDb = "";
//boolean connFlag = false;
try
{
userId = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"));
chgTerm = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "chgTerm"));
chgTerm = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId"));
loginSite = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode"));
userInfoStr = getUserInfoStr(xtraParams);
/*userInfoStr = getUserInfoStr(xtraParams);
System.out.println("userInfoStr:::: " + userInfoStr);
userInfoBean = new UserInfoBean(userInfoStr);
System.out.println("userInfoBean:::: " + userInfoBean);
......@@ -2634,7 +2598,7 @@ public class AdmCommon
localConn.setAutoCommit(false);
connFlag = true;
System.out.println("connFlag becomes false to ---["+ connFlag +"]");
}
}*/
if(asPrdCode != null && asPrdCode.trim().length() > 0)
{
......@@ -2654,8 +2618,7 @@ public class AdmCommon
logWriter.setStatusDetail(lsErr + logWriter.getCurrentProcess().trim() + " " + lsStr);
logWriter.setErrorCode(asErrCode);
logWriter.setStatusType(asSeverity);
System.out.println("localConn in gbfErrWrite:::: " + localConn);
logWriter = gfLogWriter(logWriter,Conn,localConn);
logWriter = gfLogWriter(logWriter,logConn);
lsErrCode = logWriter.getReturnUpdError();
System.out.println("lsErrCode coming from gfLogWriter Method:::: " + lsErrCode);
if(lsErrCode != null && lsErrCode.trim().length() > 0)
......@@ -2677,7 +2640,7 @@ public class AdmCommon
{
try {
if(connFlag == true)
/*if(connFlag == true)
{
System.out.println("connFlag is [" + connFlag + "] and ready to commit localConn....!!!");
localConn.commit();
......@@ -2688,7 +2651,7 @@ public class AdmCommon
{
localConn.close();
localConn = null;
}
}*/
}
catch (Exception e)
......@@ -2700,7 +2663,7 @@ public class AdmCommon
return logWriter;
}
public LogWriterDatabase gbfErrWrite(String asPrdCode, String asEmpCode, String asType, String asErrCode, String asSeverity,int Num,LogWriterDatabase logWriter,Connection Conn) throws ITMException
public LogWriterDatabase gbfErrWrite(String asPrdCode, String asEmpCode, String asType, String asErrCode, String asSeverity,int Num,LogWriterDatabase logWriter,Connection logConn) throws ITMException
{
System.out.println("Inside admCommon gbfErrWrite method with 6 parameters....");
......@@ -2710,17 +2673,17 @@ public class AdmCommon
if(Num == 1)
{
logWriter.setRowsProcessed(logWriter.getRowsProcessed() + 1);
logWriter = gbfErrWrite(asPrdCode, asEmpCode, asType, asErrCode, asSeverity,logWriter,Conn);
logWriter = gbfErrWrite(asPrdCode, asEmpCode, asType, asErrCode, asSeverity,logWriter,logConn);
}
else if(Num == 2)
{
logWriter.setRowsRejected(logWriter.getRowsRejected() + 1);
logWriter = gbfErrWrite(asPrdCode, asEmpCode, asType, asErrCode, asSeverity,logWriter,Conn);
logWriter = gbfErrWrite(asPrdCode, asEmpCode, asType, asErrCode, asSeverity,logWriter,logConn);
}
else if(Num == 3)
{
logWriter.setRowsIgnored(logWriter.getRowsIgnored() + 1);
logWriter = gbfErrWrite(asPrdCode, asEmpCode, asType, asErrCode, asSeverity,logWriter,Conn);
logWriter = gbfErrWrite(asPrdCode, asEmpCode, asType, asErrCode, asSeverity,logWriter,logConn);
}
}
......@@ -2732,7 +2695,7 @@ public class AdmCommon
return logWriter;
}
public LogWriterDatabase gfLogWriter(LogWriterDatabase logWriter1,Connection Conn,Connection localConn) throws ITMException, IOException
public LogWriterDatabase gfLogWriter(LogWriterDatabase logWriter1,Connection logConn) throws ITMException, IOException
{
System.out.println("Inside admCommon gfLogWriter method....");
ResultSet rs = null;
......@@ -2768,7 +2731,7 @@ public class AdmCommon
sql = "select case when msg_str is null then ' ' else msg_str end as msg_str, case when msg_descr is null then ' '"+
" else msg_descr end as msg_descr, case when msg_type is null then 'E' else msg_type end as msg_type "+
"from messages where msg_no = ? ";
pstmt = localConn.prepareStatement(sql);
pstmt = logConn.prepareStatement(sql);
pstmt.setString(1, lsErrorCode1);
rs = pstmt.executeQuery();
if(rs.next())
......@@ -2842,7 +2805,7 @@ public class AdmCommon
logWriter1.setStatusType(lsSeverity);
logWriter1.setStatusDetail(lsStr);
logWriter1.setLineNo(logWriter1.getLineNo() + 1);
lsReturnErrcode = gfUpdBackgroundPrcStatus(logWriter1,Conn,localConn);
lsReturnErrcode = gfUpdBackgroundPrcStatus(logWriter1,logConn);
logWriter1.setReturnUpdError(lsReturnErrcode);
System.out.println("lsReturnErrcode coming from gfUpdBackgroundPrcStatus::::: " + lsReturnErrcode);
}
......@@ -2943,7 +2906,7 @@ public class AdmCommon
return logWriter1;
}
public String gfUpdBackgroundPrcStatus(LogWriterDatabase LogWriter2,Connection Conn,Connection localConn) throws ITMException, RemoteException
public String gfUpdBackgroundPrcStatus(LogWriterDatabase LogWriter2,Connection logConn) throws ITMException, RemoteException
{
System.out.println("Inside admCommon gfUpdBackgroundPrcStatus method....");
String userId = "", lsReturn = "" , lsStatusDet = "" , processID = "" , currentProcess = "" , statusDetail = "",todayDate = "";
......@@ -2986,7 +2949,7 @@ public class AdmCommon
sql = "insert into background_status(job_id , obj_name , line_no , status_det , status_time, status_type)" +
"values (? , ? , ? , ? , ?, ? )";
pstmt = localConn.prepareStatement(sql);
pstmt = logConn.prepareStatement(sql);
pstmt.setString(1, LogWriter2.getJobID());
pstmt.setString(2, LogWriter2.getObjName());
pstmt.setLong(3, LogWriter2.getLineNo());
......@@ -2994,7 +2957,7 @@ public class AdmCommon
pstmt.setTimestamp(5, ldtCurrent);
pstmt.setString(6, LogWriter2.getStatusType());
cnt = pstmt.executeUpdate();
logConn.commit();
if(pstmt != null)
{
pstmt.close();
......@@ -3006,7 +2969,7 @@ public class AdmCommon
}
catch(Exception e)
{
lsReturn = itmDBAccessEJB.getErrorString("", "DS0000", userId, "", Conn);
lsReturn = itmDBAccessEJB.getErrorString("", "DS0000", userId, "", logConn);
e.printStackTrace();
throw new ITMException(e);
}
......@@ -3170,7 +3133,7 @@ public class AdmCommon
{
System.out.println("Inside gfGetLogFileName Method....!!!!!");
userid = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"));
chgTerm = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, chgTerm));
chgTerm = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId"));
filePath = CommonConstants.JBOSSHOME + File.separator + "server" + File.separator + "default"
+ File.separator + "deploy" + File.separator + "ibase.ear" + File.separator + "ibase.war"
+ File.separator + "setting" + File.separator + "init.xml";
......@@ -3242,7 +3205,7 @@ public class AdmCommon
}
public boolean gfJobTerminateRequested(String jobID, Connection conn) throws ITMException
public boolean gfJobTerminateRequested(String jobID, Connection logConn) throws ITMException
{
int cnt = 0;
String sql = "";
......@@ -3259,7 +3222,7 @@ public class AdmCommon
}
sql = "select count(1) as count from background_job where job_id = ? and case when terminate_req is null then 'N' else terminate_req end = 'Y'";
pstmt = conn.prepareStatement(sql);
pstmt = logConn.prepareStatement(sql);
pstmt.setString(1, jobID);
rs = pstmt.executeQuery();
if (rs.next())
......
webitm-adm/ibase/webitm/ejb/adm/PayrollPostAccPrc.java
View file @ 38d86019
......@@ -51,9 +51,13 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
Document headerDom = null;
String retStr = "";
Connection conn = null;
try {
Connection logConn = null;
try
{
conn = getConnection();
logConn = getConnection();
System.out.println("Conn ["+conn+"]");
System.out.println("logConn ["+logConn+"]");
if (xmlString != null && xmlString.trim().length() > 0)
{
headerDom = genericUtility.parseString(xmlString);
......@@ -64,7 +68,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
detailDom = genericUtility.parseString(xmlString2);
System.out.println("detailDom ["+detailDom+"]");
}
retStr = process(headerDom, detailDom, windowName, xtraParams, conn);
retStr = process(headerDom, detailDom, windowName, xtraParams, conn,logConn);
System.out.println("Process forPayrollPostAccPrc :::: " + retStr);
}
catch (Exception e)
......@@ -84,6 +88,12 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
conn.close();
conn = null;
}
if(logConn != null)
{
logConn.close();
logConn = null;
}
}
catch (Exception e)
{
......@@ -94,7 +104,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
return retStr;
}// END OF PROCESS
public String process(Document headerDom, Document detailDom, String windowName, String xtraParams, Connection conn) throws RemoteException, ITMException
public String process(Document headerDom, Document detailDom, String windowName, String xtraParams, Connection conn, Connection logConn) throws RemoteException, ITMException
{
LogWriterDatabase logWriter = new LogWriterDatabase();
UserInfoBean userinfo = new UserInfoBean();
......@@ -124,10 +134,11 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
double advalb, rndto, allwamt, dednamt, mamount, lamount, mrndamt, retval, mtotdays;
boolean isError = false;
int liRet = 0;
try {
try
{
System.out.println("Inside process method.......");
userId = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"));
chgTerm = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, chgTerm));
chgTerm = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId"));
loginSite = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode"));
map = new HashMap();
headerRowMap = new HashMap();
......@@ -150,7 +161,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
gbflogWriterMap.put("loginSite", loginSite);
gbflogWriterMap.put("xtraParams", xtraParams);
gbflogWriterMap.put("fileNameStartName", fileNameStartName);
logWriter = admCommon.initializeLogWriter(gbflogWriterMap,headerDom, conn);
logWriter = admCommon.initializeLogWriter(gbflogWriterMap,headerDom, logConn);
liRet = logWriter.getlogWriterFlag();
if(liRet >= 0)
{
......@@ -176,7 +187,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
System.out.println("liFile:::: " + liFile);
if (liFile < 0)
{
gbfReleaseLogWriter(headerDom, logWriter, conn);
gbfReleaseLogWriter(headerDom, logWriter, logConn);
// return is_errxml
}
......@@ -230,7 +241,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
lslogStr = "Processing Started for Sites between: " + SiteCodeFrom + " To: " + SiteCodeTo;
}
logWriter = admCommon.gbfErrWrite("", "", mtype, lslogStr, "I",logWriter,conn);
logWriter = admCommon.gbfErrWrite("", "", mtype, lslogStr, "I",logWriter,logConn);
errorCode = logWriter.getReturnUpdError();
if(errorCode != null && errorCode.trim().length() > 0)
{
......@@ -241,7 +252,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
System.out.println("totPrds coming from gbfGetPeriods function is:::::: " + totPrds);
if (totPrds == 0)
{
gbfReleaseLogWriter(headerDom, logWriter, conn);
gbfReleaseLogWriter(headerDom, logWriter, logConn);
return ""; // periods not proper.
}
......@@ -362,7 +373,9 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
if (rowCount == 0)
{
errString = itmDBAccessEJB.getErrorString("", "NORECFND", userId, "", conn);
gbfReleaseLogWriter(headerDom, logWriter, logConn);
return errString;
}
}
......@@ -469,18 +482,24 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
if (rowCount == 0)
{
errString = itmDBAccessEJB.getErrorString("", "NORECFND", userId, "", conn);
gbfReleaseLogWriter(headerDom, logWriter, logConn);
return errString;
}
}
postPayrollStr = gbfPostPayroll(headerDom, headerRowMap, xtraParams,logWriter, conn,log);
postPayrollStr = gbfPostPayroll(headerDom, headerRowMap, xtraParams,logWriter, conn,logConn);
System.out.println("postPayrollStr :::: " + postPayrollStr);
if ("0".equalsIgnoreCase(postPayrollStr))
if(postPayrollStr == null || postPayrollStr.trim().length() == 0)
{
postPayrollStr = "0";
System.out.println("postPayrollStr :::: " + postPayrollStr);
if ("0".equalsIgnoreCase(postPayrollStr)) // [To flash message on completion without error. Changes done for RCP]
{
errString = itmDBAccessEJB.getErrorString("", "VPPAPOST01", userId, "", conn);
return errString;
}
}
gbfReleaseLogWriter(headerDom, logWriter, logConn);
} // try end
catch (Exception e)
{
......@@ -515,7 +534,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
return errString;
}// END OF PROCESS
public String gbfPostPayroll(Document headerDom, HashMap headerMap, String xtraParams,LogWriterDatabase logWriter, Connection conn,LogWriter log) throws RemoteException, ITMException
public String gbfPostPayroll(Document headerDom, HashMap headerMap, String xtraParams,LogWriterDatabase logWriter, Connection conn,Connection logConn) throws RemoteException, ITMException
{
String thiswin = "", keyString = "", bankCodeEnv = "", autoPay = "", payMode = "", autoPost = "";
String autoPostEnv = "", autoPostSenv = "", empCode = "", deptCode = "", prdCode = "";
......@@ -529,10 +548,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
String mAcctCodeSal = "", mCctrCodeSal = "", mpayMode = "", eBankCode = "", withHeld = "";
String lsHold = "",payVoucId = "", acctCode = "", cctrCode = "", lsPrdComp = "";
String mprdcode = "", lsFpfLimit = "", lsFpfBaseLimit = "",lsFpfEligAdcode = "";
String mtrantype = "", empcode = "", bankCode = "", msitecode = "", finEntity = "";
String mtrantype = "", bankCode = "", msitecode = "", finEntity = "";
String manalcode = "", madcode = "", sql = "", errCode = "", msgType = "", childNodeName = "";
String errorType = "", errString = "",mtotamtStr = "",jobId = "";
String paySite = "",workSite = "",empSite = "";
Timestamp ldToDate = null;
Timestamp ldFrDate = null;
Timestamp meffDate, payrollDate = null, mChgDate = null, mPayDate = null, mRelieveDate = null;
......@@ -544,15 +563,16 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
double lcBaseAmtFpfTot = 0.00, mamount = 0.00, lcPayrollTot = 0.00, lcArrearTot = 0.00, lcPayarrTot = 0.00;
double stdExrt = 0d;
int liNum = 0, liCC = 0, cntRows = 0, rowCount = 0,mTotRow,i;
int liNum = 0, liCC = 0, cntRows = 0,cntUpdateRows = 0,updatePayCnt = 0, rowCount = 0,mTotRow,i;
String liFile;
long cnt = 0;
PreparedStatement pstmt = null, pstmtFinEnt = null, pstmtBankCnt = null, pstmtExchRate = null, pstmtRefNo = null;
PreparedStatement pstmtDept = null, pstmtPrdCode = null;
PreparedStatement pstmtDept = null, pstmtPrdCode = null,pstmtTranId = null;
PreparedStatement pstmt1 = null, pstmt2 = null, pstmt3 = null, pstmt4 = null, pstmt5 = null, pstmt6 = null, pstmt7 = null,
pstmt8 = null, pstmt9 = null, pstmt10 = null, pstmt11 = null, pstmtUpdatePayVoucher = null,pstmtInsertPayVoucher = null;
pstmt8 = null, pstmt9 = null, pstmt10 = null, pstmt11 = null, pstmtUpdatePayVoucher = null,pstmtInsertPayVoucher = null,
pstmtUpdatePayroll = null,pstmtUpdateArrear = null;
ResultSet rs = null;
......@@ -580,13 +600,14 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
prdCodeMap = new HashMap();
utilMethods = new UtilMethods();
thiswin = "w_payr_voucher";
sql = "SELECT KEY_STRING FROM TRANSETUP WHERE TRAN_WINDOW = ? ";
sql = "SELECT KEY_STRING as key_string FROM TRANSETUP WHERE TRAN_WINDOW = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, thiswin);
rs = pstmt.executeQuery();
if (rs.next())
{
keyString = checkNull(rs.getString("key_string"));
System.out.println("keyString==> " + keyString);
}
else
{
......@@ -606,27 +627,27 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
pstmt = null;
}
mtrantype = "";
mtrantype = " ";
meffDate = null;
empcode = "";
bankCode = "";
msitecode = "";
empCode = " ";
bankCode = " ";
msitecode = " ";
finEntity = "";
mtotamt = 0.00;
manalcode = "";
mamount = 0.00;
madcode = "";
madcode = " ";
mTotRow = headerMap.size();
System.out.println("mTotRow::: " + mTotRow);
iiInterval = 100/mTotRow;
liFile = gbfOpenLogFile(headerDom,xtraParams,conn);
liFile = gbfOpenLogFile(headerDom,xtraParams);
System.out.println("liFile value is:::: " + liFile);
if (Integer.parseInt(liFile) < 0)
{
return "-1";
}
System.out.println("errString1--["+errString+"]");
bankCode = checkNull(admCommon.getEnv("999999", "BANKCODE", conn));
System.out.println("bankCode::: " + bankCode);
if ("NULLFOUND".equalsIgnoreCase(bankCode))
......@@ -695,7 +716,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
refnoLogic = checkNull(admCommon.getEnv("999999", "PAYVOUC_REFNO_LOGIC", conn));
System.out.println("refnoLogic:::: " + refnoLogic);
if(refnoLogic == null || refnoLogic.trim().length() == 0 || !("0".equalsIgnoreCase(refnoLogic.trim().toUpperCase()) || "NULLFOUND".equalsIgnoreCase(netAdCode)))
if(refnoLogic == null || refnoLogic.trim().length() == 0 || !("0".equalsIgnoreCase(refnoLogic.trim().toUpperCase())))
{
refnoLogic = "1";
}
......@@ -755,6 +776,9 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
sql = "select count(*) as count from bank where bank_code = ? ";
pstmtBankCnt = conn.prepareStatement(sql);
sql = "select pay_site, work_site,emp_site from employee where emp_code = ? ";
pstmtTranId = conn.prepareStatement(sql);
sql = "SELECT acct_code, cctr_code FROM department WHERE dept_code = ? ";
pstmtDept = conn.prepareStatement(sql);
......@@ -803,6 +827,12 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
+ "values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'O', ?, ?, ?, ? )";
pstmtInsertPayVoucher = conn.prepareStatement(sql);
sql = "update payroll set voucher_no = ? , voucher_date = ?, confirmed = ? where emp_code = ? and prd_code = ? ";
pstmtUpdatePayroll = conn.prepareStatement(sql);
sql = "update arrears set voucher_no = ? , voucher_date = ?, confirmed = ? where emp_code = ? and prd_code = ? ";
pstmtUpdateArrear = conn.prepareStatement(sql);
sql = "select count(*) as count from payroll where prd_code = ? and emp_code = ? ";
pstmt8 = conn.prepareStatement(sql);
......@@ -837,11 +867,11 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
System.out.println("jobId:::: " + jobId);
if(jobId != null && jobId.trim().length() > 0)
{
if(admCommon.gfJobTerminateRequested(jobId ,conn))
if(admCommon.gfJobTerminateRequested(jobId ,logConn))
{
logWriter.setJobTerminateRequested("Y");
logWriter = admCommon.gbfErrWrite(prdCodeStr , "" , mtype ," - Process Terminated on request" , "I",logWriter,conn) ;
logWriter = admCommon.gbfErrWrite(prdCodeStr , "" , mtype ," - Process Terminated on request" , "I",logWriter,logConn) ;
break;
}
}
......@@ -861,21 +891,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
prdCodeAcc = (String) rowMap.get("PRD_CODE__ACC");
System.out.println("prdCodeAcc:::: " + prdCodeAcc);
mtrantype = "ARR";
mRemarks = "Towards arrears for : " + prdCode;
prdCodeStr = prdCode + " : Adjusted Prd : " + prdCodeAcc;
}
else
{
mtrantype = "PAY";
mRemarks = "Towards payroll for : " + prdCode;
prdCodeStr = prdCode;
}
if ("0".equalsIgnoreCase(refnoLogic))
if ("0".equalsIgnoreCase(refnoLogic)) // For Sun Pharma
{
mrefno = "P-" + prdCode;
System.out.println("refNo is::::" + mrefno);
......@@ -940,6 +959,20 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
if("PP".equalsIgnoreCase(mtype))
{
mtrantype = "PAY";
mRemarks = "Towards payroll for : " + prdCode;
prdCodeStr = prdCode;
}
else
{
mtrantype = "ARR";
mRemarks = "Towards arrears for : " + prdCode;
prdCodeStr = prdCode + " : Adjusted Prd : " + prdCodeAcc;
}
payrollDate = (Timestamp) rowMap.get("PAYROLL_DATE");
msitecode = (String) rowMap.get("SITE_CODE__PAY");
......@@ -998,8 +1031,8 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, conn));
return errString;
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
}
......@@ -1030,8 +1063,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
withHeld = (String) rowMap.get("WITH_HELD");
System.out.println("mAcctCodeSal-- " + mAcctCodeSal + " mCctrCodeSal-- " + mCctrCodeSal + " mpayMode-- "
+ mpayMode + " eBankCode-- " + eBankCode + " mRelieveDate-- " + mRelieveDate + " withHeld-- "
+ withHeld);
+ mpayMode + " eBankCode-- " + eBankCode + " mRelieveDate-- " + mRelieveDate + " withHeld-- " + withHeld);
payrollpostMap.put("ls_acct_code__sal", mAcctCodeSal);
payrollpostMap.put("ls_cctr_code__sal", mCctrCodeSal);
......@@ -1086,14 +1118,34 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
errString = itmDBAccessEJB.getErrorString("", "VMBANK1", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VMBANK1", "E", 2,logWriter, conn));
return errString;
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VMBANK1", "E", 2,logWriter, logConn));
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VMBANK1", "E", 2, conn);
}
pstmtBankCnt.clearParameters();
}
pstmtTranId.setString(1, empCode);
rs = pstmtTranId.executeQuery();
if(rs.next())
{
paySite = checkNull(rs.getString("pay_site"));
workSite = checkNull(rs.getString("work_site"));
empSite = checkNull(rs.getString("emp_site"));
}
System.out.println("paySite::: " + paySite + "workSite::: " + workSite + "empSite:::" + empSite);
if(rs != null)
{
rs.close();
rs = null;
}
pstmtTranId.clearParameters();
payrollDateStr = checkNull(genericUtility.getValidDateTimeString(payrollDate, genericUtility.getApplDateFormat()));
String xmlValues = "";
xmlValues = "<?xml version=\"1.0\" encoding=\"utf-8\"?><Root>";
......@@ -1101,9 +1153,9 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
xmlValues = xmlValues + "<Detail1>";
xmlValues = xmlValues + "<tran_id></tran_id>";
xmlValues = xmlValues + "<site_code>" + siteCodeAcc + "</site_code>";
xmlValues = xmlValues + "<pay_site>" + msitecode + "</pay_site>";
xmlValues = xmlValues + "<emp_site>" + mSiteEmp + "</emp_site>";
xmlValues = xmlValues + "<woek_site>" + mSiteWork + "</woek_site>";
xmlValues = xmlValues + "<pay_site>" + paySite + "</pay_site>";
xmlValues = xmlValues + "<emp_site>" + empSite + "</emp_site>";
xmlValues = xmlValues + "<work_site>" + workSite + "</work_site>";
xmlValues = xmlValues + "<tran_date>" + payrollDateStr + "</tran_date>";
xmlValues = xmlValues + "</Detail1></Root>";
System.out.println("xmlValues :[" + xmlValues + "]");
......@@ -1116,10 +1168,12 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
if("ERROR".equalsIgnoreCase(payVoucId) || payVoucId == null || payVoucId.trim().length() == 0)
{
errString = itmDBAccessEJB.getErrorString("","VTTRANID", userId, "", conn);
return errString;
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, errString, "E", 2,logWriter, logConn));
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
break;
}
System.out.println("errString2--["+errString+"]");
int month = utilMethods.month(meffDate);
System.out.println("current month from meffDate is:::: " + month);
......@@ -1138,8 +1192,8 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
if (deptMap.containsKey(deptCode))
{
ArrayList alTemp2 = (ArrayList) deptMap.get(deptCode);
acctCode = checkNull((String) alTemp2.get(0));
cctrCode = checkNull((String) alTemp2.get(1));
acctCode = (String) alTemp2.get(0);
cctrCode = (String) alTemp2.get(1);
alTemp2 = null;
}
else
......@@ -1149,8 +1203,8 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
if (rs.next())
{
acctCode = checkNull(rs.getString("acct_code"));
cctrCode = checkNull(rs.getString("cctr_code"));
acctCode = rs.getString("acct_code");
cctrCode = rs.getString("cctr_code");
ArrayList alTemp3 = new ArrayList();
alTemp3.add(acctCode);
alTemp3.add(cctrCode);
......@@ -1167,8 +1221,8 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, conn));
return errString;
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
}
......@@ -1230,8 +1284,8 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, conn));
return errString;
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
}
......@@ -1278,8 +1332,8 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
|| "NULLFOUND".equalsIgnoreCase(lsFpfBaseLimit) || Long.parseLong(lsFpfBaseLimit) == 0)
{
errString = itmDBAccessEJB.getErrorString("", "VSENVAR1", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, conn));
return errString;
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn));
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2, conn);
}
......@@ -1287,6 +1341,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
lcFpfBaseLimit = Double.parseDouble(lsFpfBaseLimit);
System.out.println("lcFpfBaseLimit:::: " + lcFpfBaseLimit);
System.out.println("lcFpfBaseLimit::: " + lcFpfBaseLimit);
System.out.println("errString3--["+errString+"]");
if (lcFpfBaseLimit >= 0)
{
lsFpfEligAdcode = checkNull(admCommon.getAdmEnv(msitecode, mCadre, mGrade, "FPF_ELIG_ADCODE", mprdCodeToDate, conn).trim().toUpperCase());
......@@ -1299,7 +1354,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
if ("NULLFOUND".equalsIgnoreCase(lsFpfEligAdcode))
{
errString = itmDBAccessEJB.getErrorString("", "VSENVAR1", userId, "", conn);
return errString;
break;
}
else if (lsFpfEligAdcode == null || lsFpfEligAdcode.trim().length() == 0)
......@@ -1328,8 +1383,8 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, conn));
return errString;
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
}
......@@ -1366,8 +1421,8 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, conn));
return errString;
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
}
......@@ -1384,7 +1439,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
lcFpfEligPayroll = 0;
}
System.err.println("lcFpfEligArrear::: "+ lcFpfEligArrear + " lcFpfEligPayroll::: "+ lcFpfEligPayroll);
System.out.println("lcFpfEligArrear::: "+ lcFpfEligArrear + " lcFpfEligPayroll::: "+ lcFpfEligPayroll);
lcFpfElig = lcFpfEligArrear + lcFpfEligPayroll;
System.out.println("Total of lcFpfEligArrear + lcFpfEligPayroll is:::: " + lcFpfElig);
......@@ -1413,8 +1468,8 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, conn));
return errString;
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
}
......@@ -1452,8 +1507,8 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, conn));
return errString;
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
}
......@@ -1491,8 +1546,8 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, conn));
return errString;
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
}
......@@ -1530,8 +1585,8 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, conn));
return errString;
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
}
......@@ -1560,7 +1615,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
// need to check condition
}
else if (lcFpfElig == 0 || lcFpfAmt != 0)
else if (lcFpfElig == 0 && lcFpfAmt != 0)
{
conn.rollback();
if ("AP".equalsIgnoreCase(mtype))
......@@ -1600,8 +1655,8 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, conn));
return errString;
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
}
......@@ -1616,25 +1671,25 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
errString = checkNull(admCommon.payarrToProcUpdation(lsPrdComp, lsPrdComp, empCode, empCode, "AR","W_PAYROLL_POST_ACC", empCode + "|" + lsPrdComp, lsTemp, 0.00,String.valueOf(ldFrDate), String.valueOf(ldToDate), xtraParams, conn));
System.out.println("errString::: " + errString);
System.out.println("errString4--["+errString+"]");
if (errString.trim().length() > 0)
{
errString = itmDBAccessEJB.getErrorString("", "VTARRPOST2", userId, "", conn);
conn.rollback();
return errString;
break;
}
else
{
conn.commit();
}
logWriter = (admCommon.gbfErrWrite(lsPrdComp + " : Adjusted Prd : " + mprdcode, empCode, mtype,"VTEMPFPF01", "E", 2,logWriter, conn));
logWriter = (admCommon.gbfErrWrite(lsPrdComp + " : Adjusted Prd : " + mprdcode, empCode, mtype,"VTEMPFPF01", "E", 2,logWriter, logConn));
}
else
{
//gbf_err_write(ls_prd_str, mempcode, mtype, "VTEMPFPF01" , "E" , 2);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTEMPFPF01", "E", 2,logWriter, conn));
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTEMPFPF01", "E", 2,logWriter, logConn));
}
continue;
......@@ -1681,8 +1736,8 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, conn));
return errString;
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
}
......@@ -1703,7 +1758,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
errString = itmDBAccessEJB.getErrorString("", "VTARRPOST2", userId, "", conn);
conn.rollback();
return errString;
break;
}
else
{
......@@ -1711,13 +1766,13 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
// gbf_err_write(ls_prd_str, mempcode, mtype, "VTARRPOST2" , "E" , 2)
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTARRPOST2", "E", 2,logWriter, conn));
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTARRPOST2", "E", 2,logWriter, logConn));
}
else
{
//gbf_err_write(ls_prd_str, mempcode, mtype, "VTARRPOST2" , "E" , 2);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTARRPOST2", "E", 2,logWriter, conn));
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTARRPOST2", "E", 2,logWriter, logConn));
}
continue;
......@@ -1728,23 +1783,23 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
System.out.println("mbatch is::::::" + mbatch);
errString = checkNull(finCommon.nfCheckPeriod("ADM", payrollDate, msitecode, conn));
System.out.println("errString::: " + errString);
System.out.println("errString4--["+errString+"]");
if (errString == null || errString.trim().length() == 0)
{
errString = checkNull(finCommon.nfCheckPeriod("FIN", payrollDate, siteCodeAcc, conn));
System.out.println("errString::: " + errString);
System.out.println("errString5--["+errString+"]");
if (errString != null && errString.trim().length() > 0)
{
// gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, errString, "E", 2,logWriter, conn));
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, errString, "E", 2,logWriter, logConn));
break;
}
}
else
{
// gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, errString, "E", 2,logWriter, conn));
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, errString, "E", 2,logWriter, logConn));
break;
}
......@@ -1791,10 +1846,12 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
if ("PP".equalsIgnoreCase(mtype))
{
lsDataObject = "d_payrolldet_post";
System.out.println("lsDataObject==> " + lsDataObject);
}
else
{
lsDataObject = "d_arreardet_post_acc_nvo";
System.out.println("lsDataObject==> " + lsDataObject);
if ((mRelieveDate != null && mfrDate != null) && (mRelieveDate.before(mfrDate)))
{
......@@ -1823,8 +1880,8 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, conn));
return errString;
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
// admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
}
......@@ -1849,11 +1906,11 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
lcNetPaid = ((Double) retMap.get("lc_netpaid")).doubleValue();
System.out.println("errString::::: " + errString + " mtotamt:::: " + mtotamt + " lcNetPaid:::: " + lcNetPaid);
System.out.println("errString6--["+errString+"]");
if(errString != null && errString.trim().length() > 0)
{
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, errString, "E", 2,logWriter, conn));
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, errString, "E", 2,logWriter, logConn));
break;
}
......@@ -1888,6 +1945,38 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
end if
end if*/
if("PP".equalsIgnoreCase(mtype))
{
pstmtUpdatePayroll.setString(1, payVoucId);
pstmtUpdatePayroll.setTimestamp(2, payrollDate);
pstmtUpdatePayroll.setString(3, "Y");
pstmtUpdatePayroll.setString(4, empCode);
pstmtUpdatePayroll.setString(5, prdCode);
updatePayCnt = pstmtUpdatePayroll.executeUpdate();
pstmtUpdatePayroll.clearParameters();
}
else
{
pstmtUpdateArrear.setString(1, payVoucId);
pstmtUpdateArrear.setTimestamp(2, payrollDate);
pstmtUpdateArrear.setString(3, "Y");
pstmtUpdateArrear.setString(4, empCode);
pstmtUpdateArrear.setString(5, prdCode);
updatePayCnt = pstmtUpdateArrear.executeUpdate();
pstmtUpdateArrear.clearParameters();
}
if(updatePayCnt < 0)
{
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
break;
}
}
pstmtInsertPayVoucher.clearParameters();
......@@ -1895,85 +1984,30 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
System.out.println("mtotAmtbc is:::: " + mtotAmtbc);
/*if(Math.abs(lcNetPaid - mtotamt) > .01)
if(Math.abs(lcNetPaid - mtotamt) > .01) // accounts amount and payarr_det amount mismatch
{
errString = itmDBAccessEJB.getErrorString("", "VTPAYMIS", userId, "", conn);
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTPAYMIS", "E", 2,logWriter, conn));
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTPAYMIS", "E", 2,logWriter, logConn));
break;
}*/
}
pstmtUpdatePayVoucher.setDouble(1, mtotamt);
pstmtUpdatePayVoucher.setDouble(2, mtotAmtbc);
pstmtUpdatePayVoucher.setString(3, payVoucId);
cntRows = pstmtUpdatePayVoucher.executeUpdate();
cntUpdateRows = pstmtUpdatePayVoucher.executeUpdate();
if (cntRows != 1)
if (cntUpdateRows != 1)
{
errString = itmDBAccessEJB.getErrorString("", "DS000NR", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000NR", "E", 2,logWriter, conn));
return errString;
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000NR", "E", 2,logWriter, logConn));
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000NR", "E", 2, conn);
}
pstmtUpdatePayVoucher.clearParameters();
/*else
{
sql = "insert into payr_voucher(tran_id, tran_date, tran_type, eff_date,emp_code, ref_no, ref_date, bank_code, auto_pay, pay_mode,"
+ "chg_date, chg_user, chg_term, site_code, fin_entity, remarks,anal_code, confirmed, paid, acct_code__pay, cctr_code__pay,"
+ "tot_amt, entry_batch_no, vouch_type, curr_code, exch_rate, tot_amt__bc, hold ) "
+ "values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'O', ?, ?, ?, ? )";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, payVoucId);
pstmt.setTimestamp(2, payrollDate);
pstmt.setString(3, mtrantype);
pstmt.setTimestamp(4, meffDate);
pstmt.setString(5, empcode);
pstmt.setString(6, mrefno);
pstmt.setTimestamp(7, payrollDate);
pstmt.setString(8, bankCode);
pstmt.setString(9, autoPay);
pstmt.setString(10, mpayMode);
pstmt.setTimestamp(11, mChgDate);
pstmt.setString(12, userId);
pstmt.setString(13, chgTerm);
pstmt.setString(14, siteCodeAcc);
pstmt.setString(15, finEntity);
pstmt.setString(16, mRemarks);
pstmt.setString(17, manalcode);
pstmt.setString(18, mConfirmed);
pstmt.setString(19, mPaid);
pstmt.setString(20, acctCode);
pstmt.setString(21, cctrCode);
pstmt.setDouble(22, mtotamt);
pstmt.setString(23, mbatch);
pstmt.setString(24, currCode);
pstmt.setString(25, stdExrt);
pstmt.setDouble(26, mtotAmtbc);
pstmt.setString(27, lsHold);
cntRows = pstmt.executeUpdate();
if (pstmt != null) {
pstmt.close();
pstmt = null;
}
if (cntRows != 1)
{
errString = itmDBAccessEJB.getErrorString("", "DS000NR", userId, "", conn);
// return errString;
}
else {
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
// return errString;
break;
}
pstmtUpdatePayVoucher.clearParameters();
}*/
autoPost = autoPostEnv;
System.out.println("autoPost is::::: " + autoPost);
......@@ -1990,12 +2024,13 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
//ls_errcode = nvo_payr_voucher.gbf_retrieve_payr_vou(mtranid, mtranid, 1, mtrantype, mtrantype, mbatch,msiteac)
errString = checkNull(PayrollVoucherConf.confirm(payVoucId, xtraParams, conn));
System.out.println("errString---["+errString+"]");
System.out.println("errString7---["+errString+"]");
if (errString != null && errString.trim().length() > 0)
{
// gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, errString, "E", 2,logWriter, conn));
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, errString, "E", 2,logWriter, logConn));
break;
}
}
......@@ -2019,8 +2054,8 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, conn));
return errString;
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
// admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
......@@ -2053,7 +2088,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
return errString;
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
// admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
......@@ -2086,8 +2121,8 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, conn));
return errString;
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
// admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
......@@ -2105,16 +2140,16 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
if ((lcPayrollTot + lcArrearTot) != lcPayarrTot)
{
errString = itmDBAccessEJB.getErrorString("", "VTPAYMIS1", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTPAYMIS1", "E", 2,logWriter, conn));
return errString;
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTPAYMIS1", "E", 2,logWriter, logConn));
break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
// admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTPAYMIS1", "E", 2, conn);
}
System.out.println("errString::: " + errString);
System.out.println("Final errString---["+errString+"]");
if (errString == null || errString.trim().length() == 0)
{
// gbf_err_write(ls_prd_str , mempcode , mtype , " - Process Completed" , "I" ,1) need to change
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, " - Process Completed", "I", 1,logWriter, conn));
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, " - Process Completed", "I", 1,logWriter, logConn));
conn.commit();
}
else
......@@ -2139,6 +2174,11 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
pstmtBankCnt.close();
pstmtBankCnt = null;
}
if (pstmtTranId != null)
{
pstmtTranId.close();
pstmtTranId = null;
}
if (pstmtDept != null)
{
pstmtDept.close();
......@@ -2194,6 +2234,17 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
pstmtInsertPayVoucher.close();
pstmtInsertPayVoucher = null;
}
if(pstmtUpdatePayroll != null)
{
pstmtUpdatePayroll.close();
pstmtUpdatePayroll = null;
}
if(pstmtUpdateArrear != null)
{
pstmtUpdateArrear.close();
pstmtUpdateArrear = null;
}
if(pstmtUpdatePayVoucher != null)
{
pstmtUpdatePayVoucher.close();
......@@ -2231,7 +2282,8 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
finally
{
try {
try
{
if (rs != null)
{
......@@ -2260,6 +2312,11 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
pstmtBankCnt.close();
pstmtBankCnt = null;
}
if (pstmtTranId != null)
{
pstmtTranId.close();
pstmtTranId = null;
}
if (pstmtDept != null)
{
pstmtDept.close();
......@@ -2315,6 +2372,16 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
pstmtInsertPayVoucher.close();
pstmtInsertPayVoucher = null;
}
if(pstmtUpdatePayroll != null)
{
pstmtUpdatePayroll.close();
pstmtUpdatePayroll = null;
}
if(pstmtUpdateArrear != null)
{
pstmtUpdateArrear.close();
pstmtUpdateArrear = null;
}
if(pstmtUpdatePayVoucher != null)
{
pstmtUpdatePayVoucher.close();
......@@ -2704,7 +2771,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
sql = "update allowdedn_bal set amt_bal = (amt_bal - ?),amt_adj = amt_adj + ?,"
+ "chg_user = ?,chg_date = ?,chg_term = ? where emp_code = ? "
+ "and ad_code = ? and ? >= start_date and ref_type = :? "
+ "and ad_code = ? and ? >= start_date and ref_type = ? "
+ "and ref_no = ? and amt_bal <> 0 ";
pstmt18 = conn.prepareStatement(sql);
......@@ -2765,7 +2832,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
if ("PP".equalsIgnoreCase(mtype))
{
System.out.println("rowMap Payrolldet after minner:::: " + minner + " = " + rowMap);
lsNetAd = (String) rowMap.get("AD_CODE");
pstmt1.setString(1, lsprdComp);
pstmt1.setString(2, mempCode);
pstmt1.setString(3, lsNetAd);
......@@ -2786,7 +2853,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
errString = itmDBAccessEJB.getErrorString("", "VTPOSTDET1", userId, "", conn);
hashMapError.put("Error", errString);
return hashMapError;
break;
}
if (rs != null)
{
......@@ -2822,7 +2889,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
errString = itmDBAccessEJB.getErrorString("", "VTPOSTDET1", userId, "", conn);
hashMapError.put("Error", errString);
return hashMapError;
break;
}
if (rs != null)
{
......@@ -2863,7 +2930,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
hashMapError.put("Error", errString);
return hashMapError;
break;
}
if (rs != null)
{
......@@ -2902,7 +2969,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
hashMapError.put("Error", errString);
return hashMapError;
break;
}
if (rs != null)
{
......@@ -2939,7 +3006,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
errString = itmDBAccessEJB.getErrorString("", "DS000NR", userId, "", conn);
hashMapError.put("Error", errString);
return hashMapError;
break;
}
pstmt5.clearParameters();
}
......@@ -2970,7 +3037,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
hashMapError.put("Error", errString);
return hashMapError;
break;
}
if (rs != null)
{
......@@ -3018,7 +3085,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
errString = itmDBAccessEJB.getErrorString("", "DS000NR", userId, "", conn);
hashMapError.put("Error", errString);
return hashMapError;
break;
}
pstmt7.clearParameters();
......@@ -3040,7 +3107,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
errString = itmDBAccessEJB.getErrorString("", "DS000NR", userId, "", conn);
hashMapError.put("Error", errString);
return hashMapError;
break;
}
pstmt8.clearParameters();
......@@ -3068,7 +3135,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
errString = itmDBAccessEJB.getErrorString("", "DS000NR", userId, "", conn);
hashMapError.put("Error", errString);
return hashMapError;
break;
}
pstmt9.clearParameters();
......@@ -3091,7 +3158,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
errString = itmDBAccessEJB.getErrorString("", "DS000NR", userId, "", conn);
hashMapError.put("Error", errString);
return hashMapError;
break;
}
pstmt10.clearParameters();
......@@ -3135,7 +3202,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
hashMapError.put("Error", errString);
return hashMapError;
break;
}
if (rs != null)
{
......@@ -3168,7 +3235,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
hashMapError.put("Error", errString);
return hashMapError;
break;
}
if (rs != null)
{
......@@ -3223,7 +3290,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
errString = itmDBAccessEJB.getErrorString("", "DS000NR", userId, "", conn);
hashMapError.put("Error", errString);
return hashMapError;
break;
}
pstmt13.clearParameters();
......@@ -3233,7 +3300,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
errString = itmDBAccessEJB.getErrorString("", "VPNOBAL1", userId, "", conn);
hashMapError.put("Error", errString);
return hashMapError;
break;
}
}
......@@ -3260,7 +3327,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
errString = itmDBAccessEJB.getErrorString("", "DS000NR", userId, "", conn);
hashMapError.put("Error", errString);
return hashMapError;
break;
}
pstmt14.clearParameters();
......@@ -3283,7 +3350,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
errString = itmDBAccessEJB.getErrorString("", "DS000NR", userId, "", conn);
hashMapError.put("Error", errString);
return hashMapError;
break;
}
pstmt15.clearParameters();
......@@ -3315,7 +3382,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
errString = itmDBAccessEJB.getErrorString("", "VPNOBAL1", userId, "", conn);
hashMapError.put("Error", errString);
return hashMapError;
break;
}
if (rs != null)
{
......@@ -3347,7 +3414,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
errString = itmDBAccessEJB.getErrorString("", "VPNOBAL1", userId, "", conn);
hashMapError.put("Error", errString);
return hashMapError;
break;
}
if (rs != null)
{
......@@ -3377,7 +3444,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
errString = itmDBAccessEJB.getErrorString("", "DS000NR", userId, "", conn);
hashMapError.put("Error", errString);
return hashMapError;
break;
}
pstmt18.clearParameters();
......@@ -3399,7 +3466,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
errString = itmDBAccessEJB.getErrorString("", "DS000NR", userId, "", conn);
hashMapError.put("Error", errString);
return hashMapError;
break;
}
pstmt19.clearParameters();
......@@ -3428,7 +3495,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
hashMapError.put("Error", errString);
return hashMapError;
break;
}
pstmt20.clearParameters();
......@@ -3449,7 +3516,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
hashMapError.put("Error", errString);
return hashMapError;
break;
}
pstmt21.clearParameters();
......@@ -3473,7 +3540,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
hashMapError.put("Error", errString);
return hashMapError;
break;
}
if (rs != null)
{
......@@ -3490,7 +3557,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
errString = itmDBAccessEJB.getErrorString("", "VPNOBAL1", userId, "", conn);
hashMapError.put("Error", errString);
return hashMapError;
break;
}
if (lcAmtBal > 0)
......@@ -3506,7 +3573,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
hashMapError.put("Error", errString);
return hashMapError;
break;
}
pstmt23.clearParameters();
......@@ -3524,7 +3591,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
hashMapError.put("Error", errString);
return hashMapError;
break;
}
pstmt24.clearParameters();
......@@ -3550,7 +3617,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
hashMapError.put("Error", errString);
return hashMapError;
break;
}
if (rs != null)
{
......@@ -3570,7 +3637,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
errString = itmDBAccessEJB.getErrorString("", "DS000NR", userId, "", conn);
hashMapError.put("Error", errString);
return hashMapError;
break;
}
pstmt26.clearParameters();
......@@ -3585,7 +3652,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
errString = itmDBAccessEJB.getErrorString("", "DS000NR", userId, "", conn);
hashMapError.put("Error", errString);
return hashMapError;
break;
}
pstmt27.clearParameters();
......@@ -3608,7 +3675,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
hashMapError.put("Error", errString);
return hashMapError;
break;
}
if (rs != null)
{
......@@ -3629,7 +3696,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
errString = itmDBAccessEJB.getErrorString("", "DS000NR", userId, "", conn);
hashMapError.put("Error", errString);
return hashMapError;
break;
}
pstmt29.clearParameters();
......@@ -4032,11 +4099,12 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
return retdate;
}
public String gbfReleaseLogWriter(Document headerDom, LogWriterDatabase logWriter1, Connection conn) throws ITMException
public int gbfReleaseLogWriter(Document headerDom, LogWriterDatabase logWriter, Connection logConn) throws ITMException
{
int liRet = 1;
String lsLogStr = "", frEmp = "", toEmp = "", fromPrd = "", toPrd = "", frSite = "", toSite = "", mtype = "",
lsErrorRet = "", rowsRejected = "", rowsProcessed = "";
lsErrorRet = "";
int rowsRejected = 0, rowsProcessed = 0;
try
{
......@@ -4070,12 +4138,14 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
}
mtype = checkNull(genericUtility.getColumnValue("type", headerDom));
rowsProcessed = String.valueOf(logWriter1.getRowsProcessed()).trim();
rowsRejected = String.valueOf(logWriter1.getRowsRejected()).trim();
rowsProcessed = logWriter.getRowsProcessed();
rowsRejected = logWriter.getRowsRejected();
System.out.println("rowsProcessed==>" + rowsProcessed + " rowsRejected==>" + rowsRejected);
lsLogStr = "Total Employees: " + rowsProcessed + rowsRejected + " Processed: " + rowsProcessed
lsLogStr = "Total Employees: " + String.valueOf(rowsProcessed + rowsRejected) + " Processed: " + rowsProcessed
+ " Rejected: " + rowsRejected;
lsErrorRet = checkNull(admCommon.releaseLogWriter(mtype, lsLogStr,logWriter1, conn));
//gbf_err_write("","",mtype,ls_log_str , "I")
logWriter = admCommon.gbfErrWrite("", "", mtype, lsLogStr, "I",logWriter,logConn);
if (frSite.trim().toUpperCase().equalsIgnoreCase(toSite.trim().toUpperCase()))
{
......@@ -4085,17 +4155,43 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
lsLogStr = "Processing Over for Sites between: " + frSite + " To: " + toSite;
}
lsErrorRet = checkNull(admCommon.releaseLogWriter(mtype, lsLogStr,logWriter1, conn));
//gbf_err_write("","",mtype,ls_log_str , "I")
logWriter = admCommon.gbfErrWrite("", "", mtype, lsLogStr, "I",logWriter,logConn);
/*if istr_log_writer.transaction_created_by = "self" then
if not isnull(istr_log_writer.transaction) and isvalid(istr_log_writer.transaction) then
commit using istr_log_writer.transaction;
disconnect using istr_log_writer.transaction;
setnull(istr_log_writer.transaction)
end if
end if
if istr_log_writer.inet_created_by = "self" then
if not isnull(istr_log_writer.io_inet) and isvalid(istr_log_writer.io_inet) then
destroy istr_log_writer.inet_ret
destroy istr_log_writer.io_inet
setnull(istr_log_writer.inet_ret)
setnull(istr_log_writer.io_inet)
end if
end if
if istr_log_writer.logfile_created_by = "self" then
if not isnull(istr_log_writer.file_pointer) and istr_log_writer.file_pointer > 0 then
fileclose(istr_log_writer.file_pointer)
setnull(istr_log_writer.file_pointer)
end if
end if*/
}
catch (Exception e)
{
e.printStackTrace();
throw new ITMException(e);
}
return lsErrorRet;
return liRet;
}
public String gbfOpenLogFile(Document headerDom,String xtraParams,Connection conn) throws ITMException
public String gbfOpenLogFile(Document headerDom,String xtraParams) throws ITMException
{
String isFilename = "c:\\appl\\itm26\\payarr_err.log";
String lsFileName = "",errString = "",mtype= "";
......@@ -4105,7 +4201,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
System.out.println("Inside gbfOpenLogFile Method...!!!!");
userId = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"));
chgTerm = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, chgTerm));
chgTerm = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId"));
System.out.println("userId:::: " + userId + " chgTerm:::: " + chgTerm);
mtype = checkNull(genericUtility.getColumnValue("type", headerDom));
......
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