Skip to content

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

Changes done to shift initialize hrlogWriter in main method. 

PayrollPostAccPrc.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@208287 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 1ccad279
Hide whitespace changes
Inline Side-by-side
Showing with 422 additions and 169 deletions
webitm-adm/src/ibase/webitm/ejb/adm/PayrollPostAccPrc.java
View file @ cfcb43e7
...@@ -17,7 +17,6 @@ import org.w3c.dom.NodeList; ...@@ -17,7 +17,6 @@ import org.w3c.dom.NodeList;
import ibase.utility.CommonConstants; import ibase.utility.CommonConstants;
import ibase.utility.E12GenericUtility; import ibase.utility.E12GenericUtility;
import ibase.utility.UserInfoBean; import ibase.utility.UserInfoBean;
import ibase.webitm.bean.adm.LogWriterDatabase;
import ibase.webitm.ejb.ITMDBAccessEJB; import ibase.webitm.ejb.ITMDBAccessEJB;
import ibase.webitm.ejb.ProcessEJB; import ibase.webitm.ejb.ProcessEJB;
import ibase.webitm.ejb.adm.adv.LogWriter; import ibase.webitm.ejb.adm.adv.LogWriter;
...@@ -38,6 +37,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -38,6 +37,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
AdmCommon admCommon = new AdmCommon(); AdmCommon admCommon = new AdmCommon();
UtilMethods utilMethod = new UtilMethods(); UtilMethods utilMethod = new UtilMethods();
FinCommon finCommon = new FinCommon(); FinCommon finCommon = new FinCommon();
HRLogWriter hrLogWriter = new HRLogWriter();
PayrollVoucherConf PayrollVoucherConf = new PayrollVoucherConf(); PayrollVoucherConf PayrollVoucherConf = new PayrollVoucherConf();
LogWriter log = new LogWriter(); LogWriter log = new LogWriter();
int rowCount = 0, rowcnt = 0; int rowCount = 0, rowcnt = 0;
...@@ -52,6 +52,11 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -52,6 +52,11 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
String retStr = ""; String retStr = "";
Connection conn = null; Connection conn = null;
Connection logConn = null; Connection logConn = null;
//Modified by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][Start]
String objName = "";
String jobId = "";
String activity = "",processId = "",fileNameStartName = "";
//Modified by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][End]
try try
{ {
conn = getConnection(); conn = getConnection();
...@@ -68,7 +73,29 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -68,7 +73,29 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
detailDom = genericUtility.parseString(xmlString2); detailDom = genericUtility.parseString(xmlString2);
System.out.println("detailDom ["+detailDom+"]"); System.out.println("detailDom ["+detailDom+"]");
} }
retStr = process(headerDom, detailDom, windowName, xtraParams, conn,logConn); //Modified by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][Start]
userId = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"));
chgTerm = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId"));
loginSite = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode"));
jobId = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "job_id"));
objName = getObjNameFromDom(headerDom, "objName");
System.out.println("objName coming from getObjNameFromDom method:::: " + objName);
hrLogWriter.setLogLineNo(0);
hrLogWriter.setTotalRows(0);
hrLogWriter.setRowsProcessed(0);
hrLogWriter.setRowsIgnored(0);
hrLogWriter.setRowsRejected(0);
hrLogWriter.setObjName(objName);
hrLogWriter.setJobIdCreated(false);
hrLogWriter.setActivity("PayrollPosting");
hrLogWriter.setProcessId("PayrollPosting");
hrLogWriter.setFileNameStartWith("PAYPROC");
activity = hrLogWriter.getActivity();
processId = hrLogWriter.getProcessId();
fileNameStartName = hrLogWriter.getFileNameStartWith();
hrLogWriter.initializeHRLogWriter(objName, jobId, userId, chgTerm, activity, fileNameStartName, loginSite, logConn);
retStr = process(headerDom, detailDom, windowName, xtraParams,hrLogWriter, conn,logConn);
//Modified by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][End]
System.out.println("Process for PayrollPostAccPrc :::: " + retStr); System.out.println("Process for PayrollPostAccPrc :::: " + retStr);
} }
catch (Exception e) catch (Exception e)
...@@ -104,9 +131,16 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -104,9 +131,16 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
return retStr; return retStr;
}// END OF PROCESS }// END OF PROCESS
public String process(Document headerDom, Document detailDom, String windowName, String xtraParams, Connection conn, Connection logConn) throws RemoteException, ITMException //Modified by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][Start]
{ //public String process(Document headerDom, Document detailDom, String windowName, String xtraParams, Connection conn, Connection logConn) throws RemoteException, ITMException
LogWriterDatabase logWriter = new LogWriterDatabase(); public String process(Document headerDom, Document detailDom, String windowName, String xtraParams,HRLogWriter hrLogWriter, Connection conn, Connection logConn) throws RemoteException, ITMException
//Modified by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][End]
{ //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//LogWriterDatabase logWriter = new LogWriterDatabase();
//Commented by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][Start]
//HRLogWriter hrLogWriter = new HRLogWriter();
//Commented by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][End]
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
UserInfoBean userinfo = new UserInfoBean(); UserInfoBean userinfo = new UserInfoBean();
ResultSet rs = null, rs1 = null; ResultSet rs = null, rs1 = null;
PreparedStatement pstmt = null, pstmt1 = null; PreparedStatement pstmt = null, pstmt1 = null;
...@@ -134,18 +168,31 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -134,18 +168,31 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
double advalb, rndto, allwamt, dednamt, mamount, lamount, mrndamt, retval, mtotdays; double advalb, rndto, allwamt, dednamt, mamount, lamount, mrndamt, retval, mtotdays;
boolean isError = false; boolean isError = false;
int liRet = 0; int liRet = 0;
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//Commented by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][Start]
//String jobId = "";
//Commented by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][End]
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
try try
{ {
System.out.println("Inside process method......."); System.out.println("Inside process method.......");
userId = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode")); userId = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"));
chgTerm = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId")); chgTerm = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId"));
loginSite = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode")); loginSite = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode"));
//Commented by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][Start]
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//jobId = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "job_id"));
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
//Commented by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][End]
map = new HashMap(); map = new HashMap();
headerRowMap = new HashMap(); headerRowMap = new HashMap();
gbflogWriterMap = new HashMap(); gbflogWriterMap = new HashMap();
objName = getObjNameFromDom(headerDom, "objName"); //Commented by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][Start]
System.out.println("objName coming from getObjNameFromDom method:::: " + objName); /*objName = getObjNameFromDom(headerDom, "objName");
logWriter.setCurrentProcess("PayrollPosting"); System.out.println("objName coming from getObjNameFromDom method:::: " + objName);*/
//Commented by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][End]
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
/*logWriter.setCurrentProcess("PayrollPosting");
logWriter.setActivity("PayrollPosting"); logWriter.setActivity("PayrollPosting");
logWriter.setProcessId("PayrollPosting"); logWriter.setProcessId("PayrollPosting");
logWriter.setFileNameStartWith("PAYPROC"); logWriter.setFileNameStartWith("PAYPROC");
...@@ -153,7 +200,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -153,7 +200,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
activity = logWriter.getActivity(); activity = logWriter.getActivity();
processId = logWriter.getProcessId(); processId = logWriter.getProcessId();
fileNameStartName = logWriter.getFileNameStartWith(); fileNameStartName = logWriter.getFileNameStartWith();
gbflogWriterMap.put("objName", objName); gbflogWriterMap.put("objName", objName);
gbflogWriterMap.put("currentProcess", currentProcess); gbflogWriterMap.put("currentProcess", currentProcess);
gbflogWriterMap.put("activity", activity); gbflogWriterMap.put("activity", activity);
gbflogWriterMap.put("processId", processId); gbflogWriterMap.put("processId", processId);
...@@ -161,41 +208,87 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -161,41 +208,87 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
gbflogWriterMap.put("loginSite", loginSite); gbflogWriterMap.put("loginSite", loginSite);
gbflogWriterMap.put("xtraParams", xtraParams); gbflogWriterMap.put("xtraParams", xtraParams);
gbflogWriterMap.put("fileNameStartName", fileNameStartName); gbflogWriterMap.put("fileNameStartName", fileNameStartName);
logWriter = admCommon.initializeLogWriter(gbflogWriterMap,headerDom, logConn); logWriter = admCommon.initializeLogWriter(gbflogWriterMap,headerDom, logConn);*/
//Commented by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][Start]
/*hrLogWriter.setLogLineNo(0);
hrLogWriter.setTotalRows(0);
hrLogWriter.setRowsProcessed(0);
hrLogWriter.setRowsIgnored(0);
hrLogWriter.setRowsRejected(0);
hrLogWriter.setObjName(objName);
hrLogWriter.setJobIdCreated(false);
hrLogWriter.setJobTerminateRequested("N");*/
//Commented by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][End]
hrLogWriter.setCurrentProcess("PayrollPosting");
//Commented by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][Start]
/*hrLogWriter.setActivity("PayrollPosting");
hrLogWriter.setProcessId("PayrollPosting");
hrLogWriter.setFileNameStartWith("PAYPROC");*/
//Commented by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][End]
currentProcess = hrLogWriter.getCurrentProcess();
//Commented by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][Start]
/*activity = hrLogWriter.getActivity();
processId = hrLogWriter.getProcessId();
fileNameStartName = hrLogWriter.getFileNameStartWith();
hrLogWriter.initializeHRLogWriter(objName, jobId, userId, chgTerm, activity, fileNameStartName, loginSite, logConn);*/
//Commented by Azhar K. on[24-Aug-2019][Shifted initializeLogWriter in main method][End]
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
//Modified by Azhar K. on [27-July-2019][To show error msg coming from method][Start] //Modified by Azhar K. on [27-July-2019][To show error msg coming from method][Start]
errorCode = logWriter.getReturnUpdError(); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//errorCode = logWriter.getReturnUpdError();
errorCode = hrLogWriter.getReturnUpdError();
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
if(errorCode != null && errorCode.trim().length() > 0) if(errorCode != null && errorCode.trim().length() > 0)
{ {
errString = itmDBAccessEJB.getErrorString("", errorCode, userId, "", conn); errString = itmDBAccessEJB.getErrorString("", errorCode, userId, "", conn);
return errString; return errString;
} }
//Modified by Azhar K. on [27-July-2019][To show error msg coming from method][End] //Modified by Azhar K. on [27-July-2019][To show error msg coming from method][End]
liRet = logWriter.getlogWriterFlag(); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//liRet = logWriter.getlogWriterFlag();
liRet = hrLogWriter.getLogWriterFlag();
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
if(liRet >= 0) if(liRet >= 0)
{ {
lsType = checkNull(genericUtility.getColumnValue("type", headerDom)); lsType = checkNull(genericUtility.getColumnValue("type", headerDom));
logWriter.setStatusType("I"); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter.setStatusType("I");
hrLogWriter.setStatusType("I");
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
if("PP".equalsIgnoreCase(lsType)) if("PP".equalsIgnoreCase(lsType))
{ { //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
logWriter.setCurrentProcess("Payroll Posting"); /*logWriter.setCurrentProcess("Payroll Posting");
logWriter.setActivity("PayrollPosting"); logWriter.setActivity("PayrollPosting");*/
hrLogWriter.setCurrentProcess("Payroll Posting");
hrLogWriter.setActivity("PayrollPosting");
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
lsLogMsg = "Payroll Posting Process Started"; lsLogMsg = "Payroll Posting Process Started";
} }
else else
{ { //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
logWriter.setCurrentProcess("Arrears Posting"); /*logWriter.setCurrentProcess("Arrears Posting");
logWriter.setActivity("ArrearsPosting"); logWriter.setActivity("ArrearsPosting");*/
hrLogWriter.setCurrentProcess("Arrears Posting");
hrLogWriter.setActivity("ArrearsPosting");
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
lsLogMsg = "Arrears Posting Process Started"; lsLogMsg = "Arrears Posting Process Started";
} }
logWriter.setlogWriterFlag(liRet); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter.setlogWriterFlag(liRet);
hrLogWriter.setLogWriterFlag(liRet);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
} }
System.out.println("logWriter value coming from initializeLogWriter:::: " + logWriter); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
liFile = logWriter.getlogWriterFlag(); /*System.out.println("logWriter value coming from initializeLogWriter:::: " + logWriter);
liFile = logWriter.getlogWriterFlag();*/
liFile = hrLogWriter.getLogWriterFlag();
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
System.out.println("liFile:::: " + liFile); System.out.println("liFile:::: " + liFile);
if (liFile < 0) if (liFile < 0)
{ { //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
gbfReleaseLogWriter(headerDom, logWriter, logConn); //gbfReleaseLogWriter(headerDom, logWriter, logConn);
gbfReleaseLogWriter(headerDom, hrLogWriter, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
// return is_errxml // return is_errxml
} }
...@@ -249,8 +342,12 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -249,8 +342,12 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
lslogStr = "Processing Started for Sites between: " + SiteCodeFrom + " To: " + SiteCodeTo; lslogStr = "Processing Started for Sites between: " + SiteCodeFrom + " To: " + SiteCodeTo;
} }
logWriter = admCommon.gbfErrWrite("", "", mtype, lslogStr, "I",logWriter,logConn); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
errorCode = logWriter.getReturnUpdError(); /*logWriter = admCommon.gbfErrWrite("", "", mtype, lslogStr, "I",logWriter,logConn);
errorCode = logWriter.getReturnUpdError();*/
hrLogWriter.gbfErrWrite("", "", mtype, lslogStr, "I", logConn);
errorCode = hrLogWriter.getReturnUpdError();
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
if(errorCode != null && errorCode.trim().length() > 0) if(errorCode != null && errorCode.trim().length() > 0)
{ {
errString = itmDBAccessEJB.getErrorString("", errorCode, userId, "", conn); errString = itmDBAccessEJB.getErrorString("", errorCode, userId, "", conn);
...@@ -259,8 +356,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -259,8 +356,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
totPrds = gbfGetPeriods(PrdCodeFrom, PrdCodeTo, conn); totPrds = gbfGetPeriods(PrdCodeFrom, PrdCodeTo, conn);
System.out.println("totPrds coming from gbfGetPeriods function is:::::: " + totPrds); System.out.println("totPrds coming from gbfGetPeriods function is:::::: " + totPrds);
if (totPrds == 0) if (totPrds == 0)
{ { //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
gbfReleaseLogWriter(headerDom, logWriter, logConn); //gbfReleaseLogWriter(headerDom, logWriter, logConn);
gbfReleaseLogWriter(headerDom, hrLogWriter, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
return ""; // periods not proper. return ""; // periods not proper.
} }
...@@ -381,7 +480,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -381,7 +480,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
if (rowCount == 0) if (rowCount == 0)
{ {
errString = itmDBAccessEJB.getErrorString("", "NORECFND", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "NORECFND", userId, "", conn);
gbfReleaseLogWriter(headerDom, logWriter, logConn); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//gbfReleaseLogWriter(headerDom, logWriter, logConn);
gbfReleaseLogWriter(headerDom, hrLogWriter, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
return errString; return errString;
} }
...@@ -490,13 +592,18 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -490,13 +592,18 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
if (rowCount == 0) if (rowCount == 0)
{ {
errString = itmDBAccessEJB.getErrorString("", "NORECFND", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "NORECFND", userId, "", conn);
gbfReleaseLogWriter(headerDom, logWriter, logConn); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//gbfReleaseLogWriter(headerDom, logWriter, logConn);
gbfReleaseLogWriter(headerDom, hrLogWriter, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
return errString; return errString;
} }
} }
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
postPayrollStr = gbfPostPayroll(headerDom, headerRowMap, xtraParams,logWriter, conn,logConn); //postPayrollStr = gbfPostPayroll(headerDom, headerRowMap, xtraParams,logWriter, conn,logConn);
postPayrollStr = gbfPostPayroll(headerDom, headerRowMap, xtraParams,hrLogWriter, conn,logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
System.out.println("postPayrollStr :::: " + postPayrollStr); System.out.println("postPayrollStr :::: " + postPayrollStr);
//Modified by Azhar K. on[09-05-2019][To display error messages on browser][Start] //Modified by Azhar K. on[09-05-2019][To display error messages on browser][Start]
errString = postPayrollStr; errString = postPayrollStr;
...@@ -510,7 +617,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -510,7 +617,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
errString = itmDBAccessEJB.getErrorString("", "VPPAPOST01", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "VPPAPOST01", userId, "", conn);
} }
} }
gbfReleaseLogWriter(headerDom, logWriter, logConn); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//gbfReleaseLogWriter(headerDom, logWriter, logConn);
gbfReleaseLogWriter(headerDom, hrLogWriter, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
} // try end } // try end
catch (Exception e) catch (Exception e)
{ {
...@@ -545,7 +655,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -545,7 +655,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
return errString; return errString;
}// END OF PROCESS }// END OF PROCESS
public String gbfPostPayroll(Document headerDom, HashMap headerMap, String xtraParams,LogWriterDatabase logWriter, Connection conn,Connection logConn) throws RemoteException, ITMException //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//public String gbfPostPayroll(Document headerDom, HashMap headerMap, String xtraParams,LogWriterDatabase logWriter, Connection conn,Connection logConn) throws RemoteException, ITMException
public String gbfPostPayroll(Document headerDom, HashMap headerMap, String xtraParams,HRLogWriter hrLogWriter, Connection conn,Connection logConn) throws RemoteException, ITMException
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
{ {
String thiswin = "", keyString = "", bankCodeEnv = "", autoPay = "", payMode = "", autoPost = ""; String thiswin = "", keyString = "", bankCodeEnv = "", autoPay = "", payMode = "", autoPost = "";
String autoPostEnv = "", autoPostSenv = "", empCode = "", deptCode = "", prdCode = ""; String autoPostEnv = "", autoPostSenv = "", empCode = "", deptCode = "", prdCode = "";
...@@ -631,7 +744,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -631,7 +744,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{ {
errString = itmDBAccessEJB.getErrorString("", "VTSEQ", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "VTSEQ", userId, "", conn);
//Modified by Azhar K on [17-July-2019][As per PB source code][Start] //Modified by Azhar K on [17-July-2019][As per PB source code][Start]
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTSEQ", "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTSEQ", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "VTSEQ", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
//Modified by Azhar K on [17-July-2019][As per PB source code][End] //Modified by Azhar K on [17-July-2019][As per PB source code][End]
return errString; return errString;
...@@ -677,7 +793,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -677,7 +793,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{ {
errString = itmDBAccessEJB.getErrorString("", "VSENVAR1", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "VSENVAR1", userId, "", conn);
//Modified by Azhar K on [17-July-2019][As per PB source code][Start] //Modified by Azhar K on [17-July-2019][As per PB source code][Start]
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
//Modified by Azhar K on [17-July-2019][As per PB source code][End] //Modified by Azhar K on [17-July-2019][As per PB source code][End]
return errString; return errString;
} }
...@@ -690,7 +809,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -690,7 +809,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{ {
errString = itmDBAccessEJB.getErrorString("", "VSENVAR1", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "VSENVAR1", userId, "", conn);
//Modified by Azhar K on [17-July-2019][As per PB source code][Start] //Modified by Azhar K on [17-July-2019][As per PB source code][Start]
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
//Modified by Azhar K on [17-July-2019][As per PB source code][End] //Modified by Azhar K on [17-July-2019][As per PB source code][End]
return errString; return errString;
} }
...@@ -701,7 +823,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -701,7 +823,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{ {
errString = itmDBAccessEJB.getErrorString("", "VSENVAR1", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "VSENVAR1", userId, "", conn);
//Modified by Azhar K on [17-July-2019][As per PB source code][Start] //Modified by Azhar K on [17-July-2019][As per PB source code][Start]
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
//Modified by Azhar K on [17-July-2019][As per PB source code][End] //Modified by Azhar K on [17-July-2019][As per PB source code][End]
return errString; return errString;
} }
...@@ -712,7 +837,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -712,7 +837,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{ {
errString = itmDBAccessEJB.getErrorString("", "VSENVAR1", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "VSENVAR1", userId, "", conn);
//Modified by Azhar K on [17-July-2019][As per PB source code][Start] //Modified by Azhar K on [17-July-2019][As per PB source code][Start]
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
//Modified by Azhar K on [17-July-2019][As per PB source code][End] //Modified by Azhar K on [17-July-2019][As per PB source code][End]
return errString; return errString;
} }
...@@ -726,7 +854,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -726,7 +854,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{ {
errString = itmDBAccessEJB.getErrorString("", "VSENVAR1", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "VSENVAR1", userId, "", conn);
//Modified by Azhar K on [17-July-2019][As per PB source code][Start] //Modified by Azhar K on [17-July-2019][As per PB source code][Start]
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
//Modified by Azhar K on [17-July-2019][As per PB source code][End] //Modified by Azhar K on [17-July-2019][As per PB source code][End]
return errString; return errString;
} }
...@@ -737,7 +868,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -737,7 +868,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{ {
errString = itmDBAccessEJB.getErrorString("", "VSENVAR1", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "VSENVAR1", userId, "", conn);
//Modified by Azhar K on [17-July-2019][As per PB source code][Start] //Modified by Azhar K on [17-July-2019][As per PB source code][Start]
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
//Modified by Azhar K on [17-July-2019][As per PB source code][End] //Modified by Azhar K on [17-July-2019][As per PB source code][End]
return errString; return errString;
} }
...@@ -752,7 +886,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -752,7 +886,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{ {
errString = itmDBAccessEJB.getErrorString("", "VSENVAR1", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "VSENVAR1", userId, "", conn);
//Modified by Azhar K on [17-July-2019][As per PB source code][Start] //Modified by Azhar K on [17-July-2019][As per PB source code][Start]
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
//Modified by Azhar K on [17-July-2019][As per PB source code][End] //Modified by Azhar K on [17-July-2019][As per PB source code][End]
return errString; return errString;
} }
...@@ -919,21 +1056,27 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -919,21 +1056,27 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{ {
rowMap = (HashMap) headerMap.get(i); rowMap = (HashMap) headerMap.get(i);
System.out.println("rowMap:::: " + i + " = " + rowMap); System.out.println("rowMap:::: " + i + " = " + rowMap);
jobId = logWriter.getJobID(); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//jobId = logWriter.getJobID();
jobId = hrLogWriter.getJobID();
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
System.out.println("jobId:::: " + jobId); System.out.println("jobId:::: " + jobId);
if(jobId != null && jobId.trim().length() > 0) if(jobId != null && jobId.trim().length() > 0)
{ {
if(admCommon.gfJobTerminateRequested(jobId ,logConn)) if(admCommon.gfJobTerminateRequested(jobId ,logConn))
{ { //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
logWriter.setJobTerminateRequested("Y"); //logWriter.setJobTerminateRequested("Y");
hrLogWriter.setJobTerminateRequested("Y");
logWriter = admCommon.gbfErrWrite(prdCodeStr , "" , mtype ," - Process Terminated on request" , "I",logWriter,logConn) ;
break; //logWriter = admCommon.gbfErrWrite(prdCodeStr , "" , mtype ," - Process Terminated on request" , "I",logWriter,logConn) ;
} hrLogWriter.gbfErrWrite(prdCodeStr, "", mtype, " - Process Terminated on request", "I", logConn);
} //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break;
mChgDate = Timestamp.valueOf(genericUtility.getValidDateString(todayDate, }
}
mChgDate = Timestamp.valueOf(genericUtility.getValidDateString(todayDate,
genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0"); genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
errCode = ""; errCode = "";
empCode = (String) rowMap.get("EMP_CODE"); empCode = (String) rowMap.get("EMP_CODE");
...@@ -967,7 +1110,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -967,7 +1110,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
rs = null; rs = null;
} }
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break; break;
} }
if(rs != null) if(rs != null)
...@@ -995,7 +1141,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -995,7 +1141,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
rs = null; rs = null;
} }
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break; break;
} }
if(rs != null) if(rs != null)
...@@ -1006,8 +1155,8 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -1006,8 +1155,8 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
pstmtlocPay.clearParameters(); pstmtlocPay.clearParameters();
} }
//Modified by Azhar K. on [26-July-2019][To apply loc to avoid the conflict in arrears processing][End] //Modified by Azhar K. on [26-July-2019][To apply loc to avoid the conflict in arrears processing][End]
if ("0".equalsIgnoreCase(refnoLogic)) // For Sun Pharma if ("0".equalsIgnoreCase(refnoLogic)) // For Sun Pharma
{ {
mrefno = "P-" + prdCode; mrefno = "P-" + prdCode;
System.out.println("refNo is::::" + mrefno); System.out.println("refNo is::::" + mrefno);
...@@ -1027,14 +1176,14 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -1027,14 +1176,14 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
rs.close(); rs.close();
rs = null; rs = null;
} }
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
//Modified by Azhar K. on [17-July-2019][To break loop when error occurs][Start] //Modified by Azhar K. on [17-July-2019][To break loop when error occurs][Start]
//return errString; //return errString;
break; break;
//Modified by Azhar K. on [17-July-2019][To break loop when error occurs][End] //Modified by Azhar K. on [17-July-2019][To break loop when error occurs][End]
} }
if(rs != null) if(rs != null)
{ {
rs.close(); rs.close();
...@@ -1072,22 +1221,22 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -1072,22 +1221,22 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
mrefno = "P-" + prdCode + refNo; mrefno = "P-" + prdCode + refNo;
System.out.println("mrefNo is::::" + mrefno); System.out.println("mrefNo is::::" + mrefno);
} }
}
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;
} }
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"); //payrollDate = (Timestamp) rowMap.get("PAYROLL_DATE");
...@@ -1099,7 +1248,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -1099,7 +1248,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
mSiteEmp = (String) rowMap.get("SITE_CODE__EMP"); mSiteEmp = (String) rowMap.get("SITE_CODE__EMP");
mSiteWork = (String) rowMap.get("SITE_CODE__WORK"); mSiteWork = (String) rowMap.get("SITE_CODE__WORK");
mDesign = (String) rowMap.get("DESIGNATION"); mDesign = (String) rowMap.get("DESIGNATION");
System.out.println("payrollDate-- " + payrollDate + " msitecode-- " + msitecode + " mtotamt-- " + mtotamt System.out.println("payrollDate-- " + payrollDate + " msitecode-- " + msitecode + " mtotamt-- " + mtotamt
+ " mGrade-- " + mGrade + " mCadre-- " + mCadre + " mPayTable-- " + mPayTable + " mSiteEmp-- " + " mGrade-- " + mGrade + " mCadre-- " + mCadre + " mPayTable-- " + mPayTable + " mSiteEmp-- "
+ mSiteEmp + " mSiteWork-- " + mSiteWork + " mDesign-- " + mDesign); + mSiteEmp + " mSiteWork-- " + mSiteWork + " mDesign-- " + mDesign);
...@@ -1113,7 +1262,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -1113,7 +1262,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
if (siteMap.containsKey(msitecode)) if (siteMap.containsKey(msitecode))
{ {
ArrayList alTemp = ((ArrayList) siteMap.get(msitecode)); ArrayList alTemp = ((ArrayList) siteMap.get(msitecode));
finEntity = checkNull((String) alTemp.get(0)); finEntity = checkNull((String) alTemp.get(0));
siteCodeAcc = checkNull((String) alTemp.get(1)); siteCodeAcc = checkNull((String) alTemp.get(1));
currCode = checkNull((String) alTemp.get(2)); currCode = checkNull((String) alTemp.get(2));
...@@ -1147,10 +1296,13 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -1147,10 +1296,13 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
} }
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break; break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2) //gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
} }
if(rs !=null) if(rs !=null)
...@@ -1188,7 +1340,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -1188,7 +1340,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
payrollpostMap.put("ld_relieve_date", mRelieveDate); payrollpostMap.put("ld_relieve_date", mRelieveDate);
payrollpostMap.put("ls_with_held", withHeld); payrollpostMap.put("ls_with_held", withHeld);
payrollpostMap.put("ls_net_ad_code", netAdCode); payrollpostMap.put("ls_net_ad_code", netAdCode);
System.out.println("payrollpostMap:::::: " + payrollpostMap); System.out.println("payrollpostMap:::::: " + payrollpostMap);
if (((mRelieveDate != null) || "Y".equalsIgnoreCase(withHeld)) && ("Y".equalsIgnoreCase(holdFlag))) if (((mRelieveDate != null) || "Y".equalsIgnoreCase(withHeld)) && ("Y".equalsIgnoreCase(holdFlag)))
...@@ -1223,8 +1375,8 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -1223,8 +1375,8 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
rs.close(); rs.close();
rs = null; rs = null;
} }
if (cnt == 0) if (cnt == 0)
{ {
if (rs != null) if (rs != null)
...@@ -1232,34 +1384,37 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -1232,34 +1384,37 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
rs.close(); rs.close();
rs = null; rs = null;
} }
errString = itmDBAccessEJB.getErrorString("", "VMBANK1", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "VMBANK1", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VMBANK1", "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VMBANK1", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "VMBANK1", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break; break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2) //gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VMBANK1", "E", 2, conn); //admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VMBANK1", "E", 2, conn);
} }
pstmtBankCnt.clearParameters(); pstmtBankCnt.clearParameters();
} }
pstmtTranId.setString(1, empCode); pstmtTranId.setString(1, empCode);
rs = pstmtTranId.executeQuery(); rs = pstmtTranId.executeQuery();
if(rs.next()) if(rs.next())
{ {
paySite = checkNull(rs.getString("pay_site")); paySite = checkNull(rs.getString("pay_site"));
workSite = checkNull(rs.getString("work_site")); workSite = checkNull(rs.getString("work_site"));
empSite = checkNull(rs.getString("emp_site")); empSite = checkNull(rs.getString("emp_site"));
} }
System.out.println("paySite::: " + paySite + "workSite::: " + workSite + "empSite:::" + empSite); System.out.println("paySite::: " + paySite + "workSite::: " + workSite + "empSite:::" + empSite);
if(rs != null) if(rs != null)
{ {
rs.close(); rs.close();
rs = null; rs = null;
} }
pstmtTranId.clearParameters(); pstmtTranId.clearParameters();
/*Modified by Azhar K. on[17-July-2019][To avoid null exception for payroll date][Start] /*Modified by Azhar K. on[17-July-2019][To avoid null exception for payroll date][Start]
if(payrollDate != null) if(payrollDate != null)
...@@ -1286,15 +1441,18 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -1286,15 +1441,18 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
tg = null; tg = null;
System.out.println("Generated Tran ID for PAYR_VOUCHER::[" + payVoucId + "]"); System.out.println("Generated Tran ID for PAYR_VOUCHER::[" + payVoucId + "]");
if("ERROR".equalsIgnoreCase(payVoucId) || payVoucId == null || payVoucId.trim().length() == 0) if("ERROR".equalsIgnoreCase(payVoucId) || payVoucId == null || payVoucId.trim().length() == 0)
{ {
errString = itmDBAccessEJB.getErrorString("","VTTRANID", userId, "", conn); errString = itmDBAccessEJB.getErrorString("","VTTRANID", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTTRANID", "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTTRANID", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "VTTRANID", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2) //gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
break; break;
} }
System.out.println("errString2--["+errString+"]"); System.out.println("errString2--["+errString+"]");
int month = utilMethods.month(meffDate); int month = utilMethods.month(meffDate);
System.out.println("current month from meffDate is:::: " + month); System.out.println("current month from meffDate is:::: " + month);
...@@ -1309,7 +1467,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -1309,7 +1467,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
mon = "" + month; mon = "" + month;
System.out.println("current month from meffDate greater then 10 is:::: " + mon); System.out.println("current month from meffDate greater then 10 is:::: " + mon);
} }
if (deptMap.containsKey(deptCode)) if (deptMap.containsKey(deptCode))
{ {
...@@ -1343,7 +1501,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -1343,7 +1501,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
} }
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break; break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2) //gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn); //admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
...@@ -1356,7 +1517,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -1356,7 +1517,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
} }
pstmtDept.clearParameters(); pstmtDept.clearParameters();
} }
lsPrdComp = prdCode; lsPrdComp = prdCode;
System.out.println("lsPrdComp is::::: " + lsPrdComp); System.out.println("lsPrdComp is::::: " + lsPrdComp);
...@@ -1373,7 +1534,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -1373,7 +1534,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
} }
} }
if (prdCodeMap.containsKey(mprdcode)) if (prdCodeMap.containsKey(mprdcode))
{ {
ArrayList alTemp4 = (ArrayList) prdCodeMap.get(mprdcode); ArrayList alTemp4 = (ArrayList) prdCodeMap.get(mprdcode);
...@@ -1404,9 +1565,12 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -1404,9 +1565,12 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
rs.close(); rs.close();
rs = null; rs = null;
} }
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break; break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2) //gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn); //admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
...@@ -1419,7 +1583,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -1419,7 +1583,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
} }
pstmtPrdCode.clearParameters(); pstmtPrdCode.clearParameters();
} }
mprdCodeToDate = mtoDate; mprdCodeToDate = mtoDate;
System.out.println("mprdCodeToDate ::::: "+ mprdCodeToDate); System.out.println("mprdCodeToDate ::::: "+ mprdCodeToDate);
payrollpostMap.put("ld_procprd_todate", mtoDate); payrollpostMap.put("ld_procprd_todate", mtoDate);
...@@ -1452,7 +1616,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -1452,7 +1616,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
|| "NULLFOUND".equalsIgnoreCase(lsFpfBaseLimit) || Long.parseLong(lsFpfBaseLimit) == 0) || "NULLFOUND".equalsIgnoreCase(lsFpfBaseLimit) || Long.parseLong(lsFpfBaseLimit) == 0)
{ {
errString = itmDBAccessEJB.getErrorString("", "VSENVAR1", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "VSENVAR1", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break; break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2) //gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2, conn); //admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2, conn);
...@@ -1473,7 +1640,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -1473,7 +1640,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
if ("NULLFOUND".equalsIgnoreCase(lsFpfEligAdcode)) if ("NULLFOUND".equalsIgnoreCase(lsFpfEligAdcode))
{ {
errString = itmDBAccessEJB.getErrorString("", "VSENVAR1", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "VSENVAR1", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "VSENVAR1", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break; break;
} }
...@@ -1503,7 +1673,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -1503,7 +1673,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
} }
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break; break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2) //gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn); //admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
...@@ -1541,7 +1714,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -1541,7 +1714,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
} }
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break; break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2) //gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn); //admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
...@@ -1588,7 +1764,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -1588,7 +1764,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
} }
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break; break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2) //gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn); //admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
...@@ -1627,7 +1806,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -1627,7 +1806,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
} }
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break; break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2) //gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn); //admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
...@@ -1666,7 +1848,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -1666,7 +1848,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
} }
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break; break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2) //gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn); //admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
...@@ -1705,7 +1890,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -1705,7 +1890,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
} }
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break; break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2) //gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn); //admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
...@@ -1775,7 +1963,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -1775,7 +1963,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
} }
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break; break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2) //gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn); //admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
...@@ -1803,14 +1994,19 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -1803,14 +1994,19 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
conn.commit(); conn.commit();
} }
logWriter = (admCommon.gbfErrWrite(lsPrdComp + " : Adjusted Prd : " + mprdcode, empCode, mtype,"VTEMPFPF01", "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(lsPrdComp + " : Adjusted Prd : " + mprdcode, empCode, mtype,"VTEMPFPF01", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(lsPrdComp + " : Adjusted Prd : " + mprdcode, empCode, mtype, "VTEMPFPF01", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
} }
else else
{ {
//gbf_err_write(ls_prd_str, mempcode, mtype, "VTEMPFPF01" , "E" , 2); //gbf_err_write(ls_prd_str, mempcode, mtype, "VTEMPFPF01" , "E" , 2);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTEMPFPF01", "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTEMPFPF01", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "VTEMPFPF01", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
} }
continue; continue;
} }
...@@ -1856,7 +2052,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -1856,7 +2052,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
} }
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break; break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2) //gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
//admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn); //admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
...@@ -1886,14 +2085,19 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -1886,14 +2085,19 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
} }
// gbf_err_write(ls_prd_str, mempcode, mtype, "VTARRPOST2" , "E" , 2) // gbf_err_write(ls_prd_str, mempcode, mtype, "VTARRPOST2" , "E" , 2)
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTARRPOST2", "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTARRPOST2", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "VTARRPOST2", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
} }
else else
{ {
//gbf_err_write(ls_prd_str, mempcode, mtype, "VTARRPOST2" , "E" , 2); //gbf_err_write(ls_prd_str, mempcode, mtype, "VTARRPOST2" , "E" , 2);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTARRPOST2", "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTARRPOST2", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "VTARRPOST2", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
} }
continue; continue;
} }
...@@ -1913,7 +2117,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -1913,7 +2117,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{ {
errString = itmDBAccessEJB.getErrorString("", errCode, userId, "", conn); errString = itmDBAccessEJB.getErrorString("", errCode, userId, "", conn);
// gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2); // gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, errCode, "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, errCode, "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, errCode, "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break; break;
} }
} }
...@@ -1921,12 +2128,15 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -1921,12 +2128,15 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{ {
errString = itmDBAccessEJB.getErrorString("", errCode, userId, "", conn); errString = itmDBAccessEJB.getErrorString("", errCode, userId, "", conn);
// gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2); // gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, errCode, "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, errCode, "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, errCode, "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break; break;
} }
//Modified by Azhar K. on[18-July-2019][Changed variable errString to errCode to flash message when period status is not defined][End] //Modified by Azhar K. on[18-July-2019][Changed variable errString to errCode to flash message when period status is not defined][End]
pstmtInsertPayVoucher.setString(1, payVoucId); pstmtInsertPayVoucher.setString(1, payVoucId);
pstmtInsertPayVoucher.setTimestamp(2, payrollDate); pstmtInsertPayVoucher.setTimestamp(2, payrollDate);
pstmtInsertPayVoucher.setString(3, mtrantype); pstmtInsertPayVoucher.setString(3, mtrantype);
...@@ -1977,7 +2187,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -1977,7 +2187,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
if ((mRelieveDate != null && mfrDate != null) && (mRelieveDate.before(mfrDate))) if ((mRelieveDate != null && mfrDate != null) && (mRelieveDate.before(mfrDate)))
{ {
pstmt8.setString(1, mprdcode); pstmt8.setString(1, mprdcode);
pstmt8.setString(2, empCode); pstmt8.setString(2, empCode);
rs = pstmt8.executeQuery(); rs = pstmt8.executeQuery();
...@@ -2000,9 +2210,12 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -2000,9 +2210,12 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
rs.close(); rs.close();
rs = null; rs = null;
} }
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break; break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2) //gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
// admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn); // admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
...@@ -2013,7 +2226,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -2013,7 +2226,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
rs.close(); rs.close();
rs = null; rs = null;
} }
pstmt8.clearParameters(); pstmt8.clearParameters();
} }
} }
...@@ -2038,16 +2251,19 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -2038,16 +2251,19 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ //Modified by Azhar K. on [19-July-2019][To fetch error code from xml errString][Start] { //Modified by Azhar K. on [19-July-2019][To fetch error code from xml errString][Start]
headerDom = genericUtility.parseString(errString); headerDom = genericUtility.parseString(errString);
detailList = headerDom.getElementsByTagName("error"); detailList = headerDom.getElementsByTagName("error");
currDetail = detailList.item(0); currDetail = detailList.item(0);
currErrorId = currDetail.getAttributes().getNamedItem("id").getNodeValue(); currErrorId = currDetail.getAttributes().getNamedItem("id").getNodeValue();
System.out.println("currErrorId getting from errString:::: " + currErrorId); System.out.println("currErrorId getting from errString:::: " + currErrorId);
//Modified by Azhar K. on [19-July-2019][To fetch error code from xml errString][End] //Modified by Azhar K. on [19-July-2019][To fetch error code from xml errString][End]
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2); //gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, currErrorId, "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, currErrorId, "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, currErrorId, "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break; break;
} }
/*ii_pct_complete = ii_pct_complete + ii_interval /*ii_pct_complete = ii_pct_complete + ii_interval
if ii_pct_complete >= 100 then if ii_pct_complete >= 100 then
ii_pct_complete = 0 ii_pct_complete = 0
...@@ -2078,7 +2294,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -2078,7 +2294,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
exit exit
end if end if
end if*/ end if*/
if("PP".equalsIgnoreCase(mtype)) if("PP".equalsIgnoreCase(mtype))
{ {
pstmtUpdatePayroll.setString(1, payVoucId); pstmtUpdatePayroll.setString(1, payVoucId);
...@@ -2087,7 +2303,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -2087,7 +2303,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
pstmtUpdatePayroll.setString(4, empCode); pstmtUpdatePayroll.setString(4, empCode);
pstmtUpdatePayroll.setString(5, prdCode); pstmtUpdatePayroll.setString(5, prdCode);
updatePayCnt = pstmtUpdatePayroll.executeUpdate(); updatePayCnt = pstmtUpdatePayroll.executeUpdate();
pstmtUpdatePayroll.clearParameters(); pstmtUpdatePayroll.clearParameters();
} }
else else
...@@ -2098,51 +2314,60 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -2098,51 +2314,60 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
pstmtUpdateArrear.setString(4, empCode); pstmtUpdateArrear.setString(4, empCode);
pstmtUpdateArrear.setString(5, prdCode); pstmtUpdateArrear.setString(5, prdCode);
updatePayCnt = pstmtUpdateArrear.executeUpdate(); updatePayCnt = pstmtUpdateArrear.executeUpdate();
pstmtUpdateArrear.clearParameters(); pstmtUpdateArrear.clearParameters();
} }
if(updatePayCnt < 0) if(updatePayCnt < 0)
{ {
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break; break;
} }
} }
pstmtInsertPayVoucher.clearParameters(); pstmtInsertPayVoucher.clearParameters();
mtotAmtbc = mtotamt * Double.valueOf(stdExrt); mtotAmtbc = mtotamt * Double.valueOf(stdExrt);
System.out.println("mtotAmtbc is:::: " + mtotAmtbc); System.out.println("mtotAmtbc is:::: " + mtotAmtbc);
if(Math.abs(lcNetPaid - mtotamt) > .01) // accounts amount and payarr_det amount mismatch if(Math.abs(lcNetPaid - mtotamt) > .01) // accounts amount and payarr_det amount mismatch
{ {
errString = itmDBAccessEJB.getErrorString("", "VTPAYMIS", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "VTPAYMIS", userId, "", conn);
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2) //gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTPAYMIS", "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTPAYMIS", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "VTPAYMIS", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break; break;
} }
pstmtUpdatePayVoucher.setDouble(1, mtotamt); pstmtUpdatePayVoucher.setDouble(1, mtotamt);
pstmtUpdatePayVoucher.setDouble(2, mtotAmtbc); pstmtUpdatePayVoucher.setDouble(2, mtotAmtbc);
pstmtUpdatePayVoucher.setString(3, payVoucId); pstmtUpdatePayVoucher.setString(3, payVoucId);
cntUpdateRows = pstmtUpdatePayVoucher.executeUpdate(); cntUpdateRows = pstmtUpdatePayVoucher.executeUpdate();
if (cntUpdateRows != 1) if (cntUpdateRows != 1)
{ {
errString = itmDBAccessEJB.getErrorString("", "DS000NR", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "DS000NR", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000NR", "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000NR", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000NR", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break; break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2) //gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
} }
pstmtUpdatePayVoucher.clearParameters(); pstmtUpdatePayVoucher.clearParameters();
autoPost = autoPostEnv; autoPost = autoPostEnv;
System.out.println("autoPost is::::: " + autoPost); System.out.println("autoPost is::::: " + autoPost);
autoPostSenv = checkNull(admCommon.getAdmEnv(msitecode, mCadre, mGrade, "AUTO_POST", payrollDate, conn).trim().toUpperCase()); autoPostSenv = checkNull(admCommon.getAdmEnv(msitecode, mCadre, mGrade, "AUTO_POST", payrollDate, conn).trim().toUpperCase());
...@@ -2158,24 +2383,27 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -2158,24 +2383,27 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{ {
//ls_errcode = nvo_payr_voucher.gbf_retrieve_payr_vou(mtranid, mtranid, 1, mtrantype, mtrantype, mbatch,msiteac) //ls_errcode = nvo_payr_voucher.gbf_retrieve_payr_vou(mtranid, mtranid, 1, mtrantype, mtrantype, mbatch,msiteac)
errString = checkNull(PayrollVoucherConf.confirm(payVoucId, xtraParams, conn)); errString = checkNull(PayrollVoucherConf.confirm(payVoucId, xtraParams, conn));
// System.out.println("errString7---["+errString+"]"); // System.out.println("errString7---["+errString+"]");
if (errString != null && errString.trim().length() > 0) if (errString != null && errString.trim().length() > 0)
{ {
//Modified by Azhar K. on [19-July-2019][To fetch error code from xml errString][Start] //Modified by Azhar K. on [19-July-2019][To fetch error code from xml errString][Start]
headerDom = genericUtility.parseString(errString); headerDom = genericUtility.parseString(errString);
detailList = headerDom.getElementsByTagName("error"); detailList = headerDom.getElementsByTagName("error");
currDetail = detailList.item(0); currDetail = detailList.item(0);
currErrorId = currDetail.getAttributes().getNamedItem("id").getNodeValue(); currErrorId = currDetail.getAttributes().getNamedItem("id").getNodeValue();
System.out.println("currErrorId getting from errString:::: " + currErrorId); System.out.println("currErrorId getting from errString:::: " + currErrorId);
//Modified by Azhar K. on [19-July-2019][To fetch error code from xml errString][End] //Modified by Azhar K. on [19-July-2019][To fetch error code from xml errString][End]
// gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2) // gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, currErrorId, "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, currErrorId, "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, currErrorId, "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break; break;
} }
} }
pstmt9.setString(1, mprdcode); pstmt9.setString(1, mprdcode);
pstmt9.setString(2, empCode); pstmt9.setString(2, empCode);
pstmt9.setString(3, lsNetAd); pstmt9.setString(3, lsNetAd);
...@@ -2193,9 +2421,12 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -2193,9 +2421,12 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
rs.close(); rs.close();
rs = null; rs = null;
} }
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break; break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2) //gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
// admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn); // admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
...@@ -2206,10 +2437,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -2206,10 +2437,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
rs.close(); rs.close();
rs = null; rs = null;
} }
pstmt9.clearParameters(); pstmt9.clearParameters();
pstmt10.setString(1, empCode); pstmt10.setString(1, empCode);
pstmt10.setString(2, mprdcode); pstmt10.setString(2, mprdcode);
pstmt10.setString(3, lsNetAd); pstmt10.setString(3, lsNetAd);
...@@ -2227,7 +2458,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -2227,7 +2458,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
rs.close(); rs.close();
rs = null; rs = null;
} }
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
break; break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2) //gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
...@@ -2239,10 +2470,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -2239,10 +2470,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
rs.close(); rs.close();
rs = null; rs = null;
} }
pstmt10.clearParameters(); pstmt10.clearParameters();
pstmt11.setString(1, mprdcode); pstmt11.setString(1, mprdcode);
pstmt11.setString(2, empCode); pstmt11.setString(2, empCode);
pstmt11.setString(3, lsNetAd); pstmt11.setString(3, lsNetAd);
...@@ -2260,9 +2491,12 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -2260,9 +2491,12 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
rs.close(); rs.close();
rs = null; rs = null;
} }
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break; break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2) //gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
// admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn); // admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2, conn);
...@@ -2273,7 +2507,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -2273,7 +2507,7 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
rs.close(); rs.close();
rs = null; rs = null;
} }
pstmt11.clearParameters(); pstmt11.clearParameters();
System.out.println("Addition of lcPayrollTot + lcArrearTot is::: " + (lcPayrollTot + lcArrearTot)); System.out.println("Addition of lcPayrollTot + lcArrearTot is::: " + (lcPayrollTot + lcArrearTot));
...@@ -2281,7 +2515,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -2281,7 +2515,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
if ((lcPayrollTot + lcArrearTot) != lcPayarrTot) if ((lcPayrollTot + lcArrearTot) != lcPayarrTot)
{ {
errString = itmDBAccessEJB.getErrorString("", "VTPAYMIS1", userId, "", conn); errString = itmDBAccessEJB.getErrorString("", "VTPAYMIS1", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTPAYMIS1", "E", 2,logWriter, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTPAYMIS1", "E", 2,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, "VTPAYMIS1", "E", 2, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
break; break;
//gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2) //gbf_err_write(ls_prd_str , mempcode , mtype , ls_errcode , "E" , 2)
// admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTPAYMIS1", "E", 2, conn); // admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "VTPAYMIS1", "E", 2, conn);
...@@ -2290,14 +2527,17 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -2290,14 +2527,17 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
if (errString == null || errString.trim().length() == 0) if (errString == null || errString.trim().length() == 0)
{ {
// gbf_err_write(ls_prd_str , mempcode , mtype , " - Process Completed" , "I" ,1) need to change // 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, logConn)); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, " - Process Completed", "I", 1,logWriter, logConn));
hrLogWriter.gbfErrWrite(prdCodeStr, empCode, mtype, " - Process Completed", "I", 1, logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
conn.commit(); conn.commit();
} }
else else
{ {
break; break;
} }
} // Ended headerMap forLoop ----------------- } // Ended headerMap forLoop -----------------
//Modified by Azhar K. on [26-July-2019][To apply loc to avoid the conflict in arrears processing][Start] //Modified by Azhar K. on [26-July-2019][To apply loc to avoid the conflict in arrears processing][Start]
...@@ -4266,8 +4506,11 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -4266,8 +4506,11 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
} }
return retdate; return retdate;
} }
public int gbfReleaseLogWriter(Document headerDom, LogWriterDatabase logWriter, Connection logConn) throws ITMException //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//public int gbfReleaseLogWriter(Document headerDom, LogWriterDatabase logWriter, Connection logConn) throws ITMException
public int gbfReleaseLogWriter(Document headerDom, HRLogWriter hrLogWriter, Connection logConn) throws ITMException
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
{ {
int liRet = 1; int liRet = 1;
String lsLogStr = "", frEmp = "", toEmp = "", fromPrd = "", toPrd = "", frSite = "", toSite = "", mtype = "", String lsLogStr = "", frEmp = "", toEmp = "", fromPrd = "", toPrd = "", frSite = "", toSite = "", mtype = "",
...@@ -4306,15 +4549,22 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -4306,15 +4549,22 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
} }
mtype = checkNull(genericUtility.getColumnValue("type", headerDom)); mtype = checkNull(genericUtility.getColumnValue("type", headerDom));
rowsProcessed = logWriter.getRowsProcessed(); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
rowsRejected = logWriter.getRowsRejected(); /*rowsProcessed = logWriter.getRowsProcessed();
rowsRejected = logWriter.getRowsRejected();*/
rowsProcessed = hrLogWriter.getRowsProcessed();
rowsRejected = hrLogWriter.getRowsRejected();
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
System.out.println("rowsProcessed==>" + rowsProcessed + " rowsRejected==>" + rowsRejected); System.out.println("rowsProcessed==>" + rowsProcessed + " rowsRejected==>" + rowsRejected);
lsLogStr = "Total Employees: " + String.valueOf(rowsProcessed + rowsRejected) + " Processed: " + rowsProcessed lsLogStr = "Total Employees: " + String.valueOf(rowsProcessed + rowsRejected) + " Processed: " + rowsProcessed
+ " Rejected: " + rowsRejected; + " Rejected: " + rowsRejected;
//gbf_err_write("","",mtype,ls_log_str , "I") //gbf_err_write("","",mtype,ls_log_str , "I")
logWriter = admCommon.gbfErrWrite("", "", mtype, lsLogStr, "I",logWriter,logConn); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = admCommon.gbfErrWrite("", "", mtype, lsLogStr, "I",logWriter,logConn);
hrLogWriter.gbfErrWrite("", "", mtype, lsLogStr, "I", logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
if (frSite.trim().toUpperCase().equalsIgnoreCase(toSite.trim().toUpperCase())) if (frSite.trim().toUpperCase().equalsIgnoreCase(toSite.trim().toUpperCase()))
{ {
lsLogStr = "Processing Over for Site: " + frSite; lsLogStr = "Processing Over for Site: " + frSite;
...@@ -4324,7 +4574,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo ...@@ -4324,7 +4574,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
lsLogStr = "Processing Over for Sites between: " + frSite + " To: " + toSite; lsLogStr = "Processing Over for Sites between: " + frSite + " To: " + toSite;
} }
//gbf_err_write("","",mtype,ls_log_str , "I") //gbf_err_write("","",mtype,ls_log_str , "I")
logWriter = admCommon.gbfErrWrite("", "", mtype, lsLogStr, "I",logWriter,logConn); //Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][Start]
//logWriter = admCommon.gbfErrWrite("", "", mtype, lsLogStr, "I",logWriter,logConn);
hrLogWriter.gbfErrWrite("", "", mtype, lsLogStr, "I", logConn);
//Modified by Azhar on [23-Aug-2019][To generate log from HrLogWriter][End]
/*if istr_log_writer.transaction_created_by = "self" then /*if istr_log_writer.transaction_created_by = "self" then
if not isnull(istr_log_writer.transaction) and isvalid(istr_log_writer.transaction) then if not isnull(istr_log_writer.transaction) and isvalid(istr_log_writer.transaction) then
......
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