Commit 00de3703 authored by akhokar's avatar akhokar

Added payroll voucher components and changes done in srd and metadata.

AdmCommon.java
PayrVouchCanc.java
PayrVoucherHld.java
PayrVoucherRls.java
PayrollPostAccPrc.java
payr_voucher11.xml
payr_voucher12.xml
payr_voucher13.xml
payr_voucher21.xml
payroll_post_acc.sql
d_payr_voucher_brow.srd
PayrVouchConf.java
PayrVouchConfLocal.java
PayrVouchConfRemote.java
PayrVoucherIC.java
PayrVoucherICLocal.java
PayrVoucherICRemote.java
payr_voucher22.xml
payr_voucher23.xml
payr_voucher.sql
d_payr_vouchadv_edit.srd
d_payr_vouchdet_brow.srd
d_payr_vouchdet_edit.srd
d_payr_voucher_edit.srd


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@204203 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 5b28686c
......@@ -2223,6 +2223,11 @@ public class AdmCommon
UtilMethods utilMethod = new UtilMethods();
String isCurrentLine = "",currentProcess = "",xtraParams = "",processId = "",objName = "",userId = "",loginSite = "";
StringBuffer xmlFileData = new StringBuffer();
// Modified by Azhar K. on[27-July-2019][To resolve the issue of job_id][Start]
HashMap hrBackGrndJobId = null;
HashMap hrJobIdMap = null;
String errCode = "";
// Modified by Azhar K. on[27-July-2019][To resolve the issue of job_id][End]
//ConnDriver connDriver = null;
//String userInfoStr = "";
//UserInfoBean userInfoBean = null;
......@@ -2361,7 +2366,8 @@ public class AdmCommon
{
if("D".equalsIgnoreCase(logLocationType))
{
sql = "select max(job_id) as job_id from Background_Job where job_id like 'HR%'";
// Commented by Azhar K. on[27-July-2019][To resolve the issue of job_id][Start]
/*sql = "select max(job_id) as job_id from Background_Job where job_id like 'HR%'";
pstmt = logConn.prepareStatement(sql);
resultSet = pstmt.executeQuery();
while(resultSet.next())
......@@ -2391,8 +2397,30 @@ public class AdmCommon
System.out.println("maxJobId:::: " + maxJobId);
jobId = maxJobId;
System.out.println("jobId:::: " + jobId);
}*/
// Commented by Azhar K. on[27-July-2019][To resolve the issue of job_id][End]
// Modified by Azhar K. on[27-July-2019][To resolve the issue of job_id][Start]
hrBackGrndJobId = new HashMap();
hrJobIdMap = new HashMap();
hrJobIdMap = gfGetHrBackgroundJobid(hrBackGrndJobId,logConn);
if(hrJobIdMap.containsKey("jobId"))
{
jobId = (String) hrJobIdMap.get("jobId");
}
else if(hrJobIdMap.containsKey("ErrorCode"))
{
errCode = (String) hrJobIdMap.get("ErrorCode");
if(utilMethod.pos(errCode , "ERR$") > 0)
{
errCode = utilMethod.mid(errCode, 5);
logWriter.setReturnUpdError(errCode);
liRet = -1;
logWriter.setlogWriterFlag(liRet);
return logWriter;
}
}
logWriter.setJobID(jobId);
// Modified by Azhar K. on[27-July-2019][To resolve the issue of job_id][End]
logWriter.setJobIdCreated(true);
xtraParams = xtraParams + "~~~job_id=" + jobId;
System.out.println("xtraParams after adding jobId::: " + xtraParams);
......@@ -3504,4 +3532,88 @@ public class AdmCommon
}
//Added by Azhar K. on[08-07-2019][End]
//Modified by Azhar on [27-July-2019][To resolve the issue of job_id][Start]
public HashMap gfGetHrBackgroundJobid(HashMap hrBackGrndJobId,Connection logConn) throws ITMException
{
String lsRetVal = "";
long llJobId = 0;
String sql = "";
PreparedStatement pstmt = null;
ResultSet rs = null;
UtilMethods utilMethod = new UtilMethods();
try
{
System.out.println("************ Inside gfGetHrBackgroundJobid Method ******************");
sql = "select hrbackgroundjobseq.nextval as jobIdValue from dual ";
pstmt = logConn.prepareStatement(sql);
rs = pstmt.executeQuery();
if(rs.next())
{
llJobId = rs.getLong("jobIdValue");
}
else
{
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
lsRetVal = "ERR$DS000";
hrBackGrndJobId.put("ErrorCode", lsRetVal);
return hrBackGrndJobId;
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
//lsRetVal = "HMS" + right("000000000000000" + trim(string((llJobId))) , 12)
lsRetVal = "HMS" + utilMethod.right("000000000000000" + String.valueOf(llJobId).trim(), 12);
hrBackGrndJobId.put("jobId", lsRetVal);
}
catch (Exception e)
{
e.printStackTrace();
throw new ITMException(e);
}
finally
{
try
{
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null)
{
pstmt.close();
pstmt = null;
}
}
catch (Exception e1)
{
e1.printStackTrace();
throw new ITMException(e1);
}
}
return hrBackGrndJobId;
}
//Modified by Azhar on [27-July-2019][To resolve the issue of job_id][End]
}
This diff is collapsed.
package ibase.webitm.ejb.adm;
import java.rmi.RemoteException;
import javax.ejb.Local;
import ibase.webitm.ejb.ValidatorLocal;
import ibase.webitm.utility.ITMException;
@Local
public interface PayrVoucherICLocal extends ValidatorLocal
{
public String itemChanged(String xmlString, String xmlString1, String xmlString2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException, ITMException;
public String wfValData(String xmlString, String xmlString1, String xmlString2, String objContext, String editFlag, String xtraParams) throws RemoteException, ITMException;
}
package ibase.webitm.ejb.adm;
import java.rmi.RemoteException;
import javax.ejb.Remote;
import ibase.webitm.ejb.ValidatorRemote;
import ibase.webitm.utility.ITMException;
@Remote
public interface PayrVoucherICRemote extends ValidatorRemote
{
public String itemChanged(String xmlString, String xmlString1, String xmlString2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException, ITMException;
public String wfValData(String xmlString, String xmlString1, String xmlString2, String objContext, String editFlag, String xtraParams) throws RemoteException, ITMException;
}
......@@ -162,6 +162,14 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
gbflogWriterMap.put("xtraParams", xtraParams);
gbflogWriterMap.put("fileNameStartName", fileNameStartName);
logWriter = admCommon.initializeLogWriter(gbflogWriterMap,headerDom, logConn);
//Modified by Azhar K. on [27-July-2019][To show error msg coming from method][Start]
errorCode = logWriter.getReturnUpdError();
if(errorCode != null && errorCode.trim().length() > 0)
{
errString = itmDBAccessEJB.getErrorString("", errorCode, userId, "", conn);
return errString;
}
//Modified by Azhar K. on [27-July-2019][To show error msg coming from method][End]
liRet = logWriter.getlogWriterFlag();
if(liRet >= 0)
{
......@@ -575,7 +583,10 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
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,
pstmtUpdatePayroll = null,pstmtUpdateArrear = null;
//Modified by Azhar K. on [26-July-2019][To apply loc to avoid the conflict in arrears processing][Start]
PreparedStatement pstmtlocArr = null,pstmtlocPay = null;
String lsTempVar1 = "";
//Modified by Azhar K. on [26-July-2019][To apply loc to avoid the conflict in arrears processing][End]
ResultSet rs = null;
SimpleDateFormat sdf = null;
......@@ -804,6 +815,13 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
pstmt = null;
}
//Modified by Azhar K. on [26-July-2019][To apply loc to avoid the conflict in arrears processing][Start]
sql = "select emp_code from arrears where emp_code = ? and prd_code = ? and prd_code__acc = ? for update nowait ";
pstmtlocArr = conn.prepareStatement(sql);
sql = "select emp_code from payroll where emp_code = ? and prd_code = ? for update nowait ";
pstmtlocPay = conn.prepareStatement(sql);
//Modified by Azhar K. on [26-July-2019][To apply loc to avoid the conflict in arrears processing][End]
sql = "select ref_no from payr_voucher where tran_type in ('PAY','ARR')"
+ "and chg_date = (select max(chg_date) from payr_voucher where tran_type in ('PAY','ARR'))";
pstmtRefNo = conn.prepareStatement(sql);
......@@ -930,8 +948,64 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
{
prdCodeAcc = (String) rowMap.get("PRD_CODE__ACC");
System.out.println("prdCodeAcc:::: " + prdCodeAcc);
//Modified by Azhar K. on [26-July-2019][To apply loc to avoid the conflict in arrears processing][Start]
pstmtlocArr.setString(1, empCode);
pstmtlocArr.setString(2, prdCode);
pstmtlocArr.setString(3, prdCodeAcc);
rs = pstmtlocArr.executeQuery();
if(rs.next())
{
lsTempVar1 = checkNull(rs.getString("emp_code"));
}
else
{
if(rs != null)
{
rs.close();
rs = null;
}
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
break;
}
if(rs != null)
{
rs.close();
rs = null;
}
pstmtlocArr.clearParameters();
}
else
{
pstmtlocPay.setString(1, empCode);
pstmtlocPay.setString(2, prdCode);
rs = pstmtlocPay.executeQuery();
if(rs.next())
{
lsTempVar1 = checkNull(rs.getString("emp_code"));
}
else
{
if(rs != null)
{
rs.close();
rs = null;
}
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
logWriter = (admCommon.gbfErrWrite(prdCodeStr, empCode, mtype, "DS000", "E", 2,logWriter, logConn));
break;
}
if(rs != null)
{
rs.close();
rs = null;
}
pstmtlocPay.clearParameters();
}
//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
{
......@@ -2226,6 +2300,18 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
} // Ended headerMap forLoop -----------------
//Modified by Azhar K. on [26-July-2019][To apply loc to avoid the conflict in arrears processing][Start]
if(pstmtlocArr != null)
{
pstmtlocArr.close();
pstmtlocArr = null;
}
if(pstmtlocPay != null)
{
pstmtlocPay.close();
pstmtlocPay = null;
}
//Modified by Azhar K. on [26-July-2019][To apply loc to avoid the conflict in arrears processing][End]
if(pstmtRefNo != null)
{
pstmtRefNo.close();
......@@ -2367,7 +2453,18 @@ public class PayrollPostAccPrc extends ProcessEJB implements PayrollPostAccPrcLo
pstmt.close();
pstmt = null;
}
//Modified by Azhar K. on [26-July-2019][To apply loc to avoid the conflict in arrears processing][Start]
if(pstmtlocArr != null)
{
pstmtlocArr.close();
pstmtlocArr = null;
}
if(pstmtlocPay != null)
{
pstmtlocPay.close();
pstmtlocPay = null;
}
//Modified by Azhar K. on [26-July-2019][To apply loc to avoid the conflict in arrears processing][End]
if(pstmtRefNo != null)
{
pstmtRefNo.close();
......
......@@ -6,7 +6,6 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import javax.ejb.Stateless;
import javax.naming.InitialContext;
import ibase.system.config.AppConnectParm;
......@@ -18,8 +17,9 @@ import ibase.webitm.ejb.ITMDBAccessEJB;
//import ibase.webitm.ejb.ITMDBAccessLocal;
//Added and commented by sarita on 20 JULY 18 [END]
import ibase.webitm.utility.ITMException;
@Stateless
//Modified by Azhar K. on [25-July-2019][Changes as per new framework][Start]
//@Stateless
//Modified by Azhar K. on [25-July-2019][Changes as per new framework][End]
public class PayrVouchCanc extends ActionHandlerEJB implements PayrVouchCancRemote,PayrVouchCancLocal
{
public String confirm(String tranId, String xtraParams, String forcedFlag) throws RemoteException,ITMException
......
package ibase.webitm.ejb.adm.adv;
import java.rmi.RemoteException;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.ActionHandlerEJB;
import ibase.webitm.ejb.ITMDBAccessEJB;
import ibase.webitm.utility.ITMException;
public class PayrVouchConf extends ActionHandlerEJB implements PayrVouchConfLocal,PayrVouchConfRemote
{
E12GenericUtility genericUtility = new E12GenericUtility();
ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
PayrollVoucherConf PayrollVoucherConf = new PayrollVoucherConf();
String userId = "";
public String confirm(String tranId, String xtraParams, String forcedFlag) throws RemoteException,ITMException
{
String retString = null;
String retErrString = "";
Connection conn = null;
try
{
conn = getConnection();
System.out.println("Conn==>[" + conn + "]");
retErrString = gbfPostLogic(tranId, tranId,xtraParams,forcedFlag,conn);
System.out.println("returning String from PayrVouchConf :confirm():==>[" + retErrString + "]");
if(retErrString == null || retErrString.trim().length() == 0)
{
conn.commit();
retString = itmDBAccessEJB.getErrorString("", "CONFSUCCES", userId, "", conn);
}
else
{
conn.rollback();
retString = retErrString;
return retString;
}
}
catch(Exception e)
{
System.out.println("Exception :PayrVouchConf :confirm() :" + e.getMessage() + ":");
e.printStackTrace();
throw new ITMException(e);
}
finally
{
try
{
if(conn != null)
{
conn.close();
conn = null;
}
}
catch (Exception e)
{
e.printStackTrace();
}
}
return retString;
}
public String gbfPostLogic(String asTranidFr,String asTranidTo,String xtraParams,String forcedFlag,Connection conn) throws ITMException
{
String lsTranId = "", lsErrCode = "", lsConfirm = "", lsTranType = "", lsBatchNo = "", lsITflag = "",lsSiteCode = "";
String lsProfileId = "", lsApplication = "";
int liLevel1 = 0, liLevel2 = 0, liLevel3 = 0, liLevel4 = 0, liLevel5 = 0,mlevl = 0;
int liUserLevel = 0;
String isRights = "";
String errString = "";
String sql = "";
PreparedStatement pstmt = null;
ResultSet rs = null;
try
{
System.out.println("***********Inside PayrVouchConf Post Logic Method**************");
userId = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"));
if(asTranidFr.equalsIgnoreCase(asTranidTo))
{
lsTranId = asTranidFr;
sql = "select case when confirmed is null then 'N' else confirmed end as confirmed, tran_type, entry_batch_no," +
" case when it_flag is null then 'N' else it_flag end as it_flag ,site_code "+
"from payr_voucher where tran_id = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, lsTranId);
rs = pstmt.executeQuery();
if(rs.next())
{
lsConfirm = checkNull(rs.getString("confirmed"));
lsTranType = checkNull(rs.getString("tran_type"));
lsBatchNo = checkNull(rs.getString("entry_batch_no"));
lsITflag = checkNull(rs.getString("it_flag"));
lsSiteCode = checkNull(rs.getString("site_code"));
}
else
{
close(pstmt, rs);
errString = itmDBAccessEJB.getErrorString("", "VTMCONF20", userId, "", conn);
return errString;
}
close(pstmt, rs);
if("X".equalsIgnoreCase(lsConfirm))
{
errString = itmDBAccessEJB.getErrorString("", "VTCONFM2", userId, "", conn);
return errString;
}
else if("Y".equalsIgnoreCase(lsConfirm))
{
errString = itmDBAccessEJB.getErrorString("", "VTMCONF1", userId, "", conn);
return errString;
}
else if("N".equalsIgnoreCase(lsConfirm))
{
if("Y".equalsIgnoreCase(lsITflag))
{
errString = itmDBAccessEJB.getErrorString("", "VTREQIT", userId, "", conn);
return errString;
}
else
{
sql = "select usr_lev , profile_id from users where code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, userId);
rs = pstmt.executeQuery();
if(rs.next())
{
liUserLevel = rs.getInt("usr_lev");
lsProfileId = checkNull(rs.getString("profile_id"));
}
else
{
close(pstmt, rs);
isRights = "*";
}
close(pstmt, rs);
if(liUserLevel > 0)
{
mlevl = liUserLevel;
sql = "select application, level_1, level_2, level_3, level_4, level_5 "+
" from itm2menu where win_name = 'w_payr_voucher'";
pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery();
if(rs.next())
{
lsApplication = checkNull(rs.getString("application"));
liLevel1 = rs.getInt("level_1");
liLevel2 = rs.getInt("level_2");
liLevel3 = rs.getInt("level_3");
liLevel4 = rs.getInt("level_4");
liLevel5 = rs.getInt("level_5");
close(pstmt, rs);
sql = "select case when rights is null then '*' else rights end as rights from user_rights where profile_id = ? "+
" and application = ? and menu_row = ? and menu_col = ? "+
" and menu_subcol = ? and level_4 = ? and level_5 = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, lsProfileId);
pstmt.setString(2, lsApplication);
pstmt.setInt(3, liLevel1);
pstmt.setInt(4, liLevel2);
pstmt.setInt(5, liLevel3);
pstmt.setInt(6, liLevel4);
pstmt.setInt(7, liLevel5);
rs = pstmt.executeQuery();
if(rs.next())
{
isRights = checkNull(rs.getString("rights"));
}
else
{
close(pstmt, rs);
isRights = "*";
}
close(pstmt, rs);
}
else
{
close(pstmt, rs);
isRights = "*";
}
}
if(errString == null || errString.trim().length() == 0)
{
if(isRights == null || isRights.trim().length() == 0)
{
isRights = "";
}
//errString = gbf_retrieve_payr_vou(ls_tranid, ls_tranid,2, ls_trantype, ls_trantype, ls_batch_no,ls_site_code)
lsErrCode = checkNull(PayrollVoucherConf.confirm(lsTranId, xtraParams, conn));
if(lsErrCode != null && lsErrCode.trim().length() > 0)
{
errString = lsErrCode;
return errString;
}
}
}
}
}
}//End TRY
catch (Exception e)
{
e.printStackTrace();
throw new ITMException(e);
}
finally
{
try
{
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
}
catch(Exception e1)
{
e1.printStackTrace();
}
}
return errString;
}
private void close(PreparedStatement pstmt, ResultSet rs) throws SQLException
{
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
}
private String checkNull(String input)
{
if (input == null)
{
input = "";
}
else
{
input = input.trim();
}
return input;
}
}
package ibase.webitm.ejb.adm.adv;
import java.rmi.RemoteException;
import java.sql.Connection;
import javax.ejb.Local;
import ibase.webitm.ejb.ValidatorLocal;
import ibase.webitm.utility.ITMException;
@Local
public interface PayrVouchConfLocal
{
public String confirm(String tranId, String xtraParams, String forcedFlag)throws RemoteException,ITMException;
public String gbfPostLogic(String asTranidFr,String asTranidTo,String xtraParams,String forcedFlag,Connection conn) throws ITMException;
}
package ibase.webitm.ejb.adm.adv;
import java.rmi.RemoteException;
import java.sql.Connection;
import javax.ejb.Remote;
import ibase.webitm.ejb.ValidatorRemote;
import ibase.webitm.utility.ITMException;
@Remote
public interface PayrVouchConfRemote
{
public String confirm(String tranId, String xtraParams, String forcedFlag)throws RemoteException,ITMException;
public String gbfPostLogic(String asTranidFr,String asTranidTo,String xtraParams,String forcedFlag,Connection conn) throws ITMException;
}
package ibase.webitm.ejb.adm.adv;
import java.rmi.RemoteException;
import java.sql.*;
import javax.ejb.*;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import ibase.system.config.ConnDriver;
import ibase.webitm.ejb.ActionHandlerEJB;
import ibase.webitm.ejb.ITMDBAccessEJB;
import ibase.webitm.utility.ITMException;
import ibase.webitm.ejb.*;
import ibase.system.config.*;
import javax.ejb.Stateless; // added for ejb3
@Stateless // added for ejb3
//Modified by Azhar K. on [25-July-2019][Changes as per new framework][Start]
//@Stateless // added for ejb3
//Modified by Azhar K. on [25-July-2019][Changes as per new framework][End]
public class PayrVoucherHld extends ActionHandlerEJB implements PayrVoucherHldLocal,PayrVoucherHldRemote //SessionBean
{
/*public void ejbCreate() throws RemoteException, CreateException
......@@ -227,6 +230,13 @@ public class PayrVoucherHld extends ActionHandlerEJB implements PayrVoucherHldLo
conn.close();
conn = null;
}
//Modified by Azhar K. on[25-July-2019][To close resultset in finally][Start]
if(rs != null)
{
rs.close();
rs = null;
}
//Modified by Azhar K. on[25-July-2019][To close resultset in finally][End]
}catch(Exception e){}
}
return errString;
......
package ibase.webitm.ejb.adm.adv;
import java.rmi.RemoteException;
import java.sql.*;
import javax.ejb.*;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import ibase.system.config.ConnDriver;
import ibase.webitm.ejb.ActionHandlerEJB;
import ibase.webitm.ejb.ITMDBAccessEJB;
import ibase.webitm.utility.ITMException;
import ibase.webitm.ejb.*;
import ibase.system.config.*;
import javax.ejb.Stateless; // added for ejb3
@Stateless // added for ejb3
//Modified by Azhar K. on [25-July-2019][Changes as per new framework][Start]
//@Stateless // added for ejb3
//Modified by Azhar K. on [25-July-2019][Changes as per new framework][End]
public class PayrVoucherRls extends ActionHandlerEJB implements PayrVoucherRlsLocal,PayrVoucherRlsRemote // SessionBean
{
/*public void ejbCreate() throws RemoteException, CreateException
......@@ -80,9 +84,15 @@ public class PayrVoucherRls extends ActionHandlerEJB implements PayrVoucherRlsLo
hold = rs.getString(2);
System.out.println("hold ::"+hold);
}
//Modified by Azhar K. on[25-July-2019][To check null for resultset before closing][Start]
if(rs != null)
{
//Modified by Azhar K. on[25-July-2019][To check null for resultset before closing][End]
rs.close();
rs = null;
//Modified by Azhar K. on[25-July-2019][To check null for resultset before closing][Start]
}
//Modified by Azhar K. on[25-July-2019][To check null for resultset before closing][End]
//Modified by Anjali R.on[27/06/2018][Added condition for cancelled voucher,to not allow the release the voucher.][Start]
if("X".equalsIgnoreCase(confirm))
{
......@@ -112,8 +122,15 @@ public class PayrVoucherRls extends ActionHandlerEJB implements PayrVoucherRlsLo
holdAmt = rs.getDouble(3);
System.out.println("holdAmt ::"+holdAmt);
}
//Modified by Azhar K. on[25-July-2019][To check null for resultset before closing][Start]
if(rs != null)
{
//Modified by Azhar K. on[25-July-2019][To check null for resultset before closing][End]
rs.close();
rs = null;
//Modified by Azhar K. on[25-July-2019][To check null for resultset before closing][Start]
}
//Modified by Azhar K. on[25-July-2019][To check null for resultset before closing][End]
if ((totalAmt - adjAmt) == 0)
{
errCode = "VTBAL2"; // already paid off
......@@ -130,8 +147,15 @@ public class PayrVoucherRls extends ActionHandlerEJB implements PayrVoucherRlsLo
pstmt.setString(1,"P-VOUC");
pstmt.setString(2,tranId);
updateCnt = pstmt.executeUpdate();
//Modified by Azhar K. on[25-July-2019][To check null for preparedStmt before closing][Start]
if(pstmt != null)
{
//Modified by Azhar K. on[25-July-2019][To check null for preparedStmt before closing][End]
pstmt.close();
pstmt = null;
//Modified by Azhar K. on[25-July-2019][To check null for preparedStmt before closing][Start]
}
//Modified by Azhar K. on[25-July-2019][To check null for preparedStmt before closing][End]
System.out.println("updateCnt ::"+updateCnt);
updSql ="UPDATE PAYR_VOUCHER SET HOLD = 'N' WHERE TRAN_ID = ? ";
......@@ -139,8 +163,15 @@ public class PayrVoucherRls extends ActionHandlerEJB implements PayrVoucherRlsLo
pstmt = conn.prepareStatement(updSql);
pstmt.setString(1,tranId);
updateCnt = pstmt.executeUpdate();
//Modified by Azhar K. on[25-July-2019][To check null for preparedStmt before closing][Start]
if(pstmt != null)
{
//Modified by Azhar K. on[25-July-2019][To check null for preparedStmt before closing][End]
pstmt.close();
pstmt = null;
//Modified by Azhar K. on[25-July-2019][To check null for preparedStmt before closing][Start]
}
//Modified by Azhar K. on[25-July-2019][To check null for preparedStmt before closing][End]
System.out.println("updateCnt ::"+updateCnt);
if (updateCnt > 0)
{
......@@ -157,8 +188,15 @@ public class PayrVoucherRls extends ActionHandlerEJB implements PayrVoucherRlsLo
pstmt = conn.prepareStatement(updSql);
pstmt.setString(1,tranId);
updateCnt = pstmt.executeUpdate();
//Modified by Azhar K. on[25-July-2019][To check null for preparedStmt before closing][Start]
if(pstmt != null)
{
//Modified by Azhar K. on[25-July-2019][To check null for preparedStmt before closing][End]
pstmt.close();
pstmt = null;
//Modified by Azhar K. on[25-July-2019][To check null for preparedStmt before closing][Start]
}
//Modified by Azhar K. on[25-July-2019][To check null for preparedStmt before closing][End]
System.out.println("updateCnt ::"+updateCnt);
if (updateCnt > 0)
{
......@@ -210,6 +248,13 @@ public class PayrVoucherRls extends ActionHandlerEJB implements PayrVoucherRlsLo
conn.close();
conn = null;
}
//Modified by Azhar K. on[25-July-2019][To close resultset in finally][Start]
if(rs != null)
{
rs.close();
rs = null;
}
//Modified by Azhar K. on[25-July-2019][To close resultset in finally][End]
}catch(Exception e){}
}
return errString;
......
This diff is collapsed.
......@@ -197,6 +197,11 @@ STATUS_TYPE CHAR(1));
alter table background_status modify status_det varchar2(1024);
------------------------------------------------sequence--------------------------------------------------------------
CREATE SEQUENCE "APPVISDEV"."HRBACKGROUNDJOBSEQ" MINVALUE 1 MAXVALUE 9999999999999999999999999999 INCREMENT BY 1 START WITH 41 CACHE 20 NOORDER NOCYCLE ;
......
......@@ -535,7 +535,7 @@
<y>0</y>
<height>19</height>
<width>94</width>
<format>0.000</format>
<format>########0.000</format>
<html>
<valueishtml>0</valueishtml>
</html>
......@@ -687,7 +687,7 @@
<y>1</y>
<height>19</height>
<width>103</width>
<format>0.000000</format>
<format>##0.000000</format>
<html>
<valueishtml>0</valueishtml>
</html>
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
$PBExportHeader$d_payr_vouchdet_brow.srd
$PBExportComments$Payroll voucher detail browser
release 9;
datawindow(units=1 timer_interval=0 color=79741120 processing=1 HTMLDW=no print.printername="" print.documentname="" print.orientation = 0 print.margin.left = 24 print.margin.right = 24 print.margin.top = 24 print.margin.bottom = 24 print.paper.source = 0 print.paper.size = 0 print.canusedefaultprinter=yes print.prompt=no print.buttons=no print.preview.buttons=no print.cliptext=no print.overrideprintjob=no print.collate=yes hidegrayline=no grid.lines=0 )
header(height=20 color="536870912" )
summary(height=0 color="536870912" )
footer(height=0 color="536870912" )
detail(height=22 color="536870912" )
table(column=(type=char(10) update=yes updatewhereclause=yes key=yes name=tran_id dbname="payr_vouchdet.tran_id" )
column=(type=char(3) update=yes updatewhereclause=yes key=yes name=line_no dbname="payr_vouchdet.line_no" )
column=(type=char(10) update=yes updatewhereclause=yes name=acct_code dbname="payr_vouchdet.acct_code" )
column=(type=char(4) update=yes updatewhereclause=yes name=cctr_code dbname="payr_vouchdet.cctr_code" )
column=(type=decimal(3) update=yes updatewhereclause=yes name=amount dbname="payr_vouchdet.amount" )
column=(type=char(5) update=yes updatewhereclause=yes name=ad_code dbname="payr_vouchdet.ad_code" )
column=(type=char(5) update=yes updatewhereclause=yes name=anal_code dbname="payr_vouchdet.anal_code" )
column=(type=char(40) updatewhereclause=yes name=descr dbname="allwdedn.descr" )
retrieve="PBSELECT( VERSION(400) TABLE(NAME=~"payr_vouchdet~" ) TABLE(NAME=~"allwdedn~" ) COLUMN(NAME=~"payr_vouchdet.tran_id~") COLUMN(NAME=~"payr_vouchdet.line_no~") COLUMN(NAME=~"payr_vouchdet.acct_code~") COLUMN(NAME=~"payr_vouchdet.cctr_code~") COLUMN(NAME=~"payr_vouchdet.amount~") COLUMN(NAME=~"payr_vouchdet.ad_code~") COLUMN(NAME=~"payr_vouchdet.anal_code~") COLUMN(NAME=~"allwdedn.descr~") JOIN (LEFT=~"payr_vouchdet.ad_code~" OP =~"=~"RIGHT=~"allwdedn.ad_code~" OUTER1 =~"payr_vouchdet.ad_code~" )WHERE( EXP1 =~"payr_vouchdet.tran_id~" OP =~"=~" EXP2 =~":tran_id~" ) ) ARG(NAME = ~"tran_id~" TYPE = string) " update="PAYR_VOUCHDET" updatewhere=0 updatekeyinplace=no arguments=(("tran_id", string)) )
text(band=header alignment="0" text="Line No" border="6" color="0" x="2" y="3" height="16" width="43" html.valueishtml="0" name=line_no_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="79741120" )
text(band=header alignment="0" text="Cctr Code" border="6" color="0" x="120" y="3" height="16" width="58" html.valueishtml="0" name=cctr_code_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="79741120" )
text(band=header alignment="1" text="Amount" border="6" color="0" x="180" y="3" height="16" width="80" html.valueishtml="0" name=amount_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="79741120" )
text(band=header alignment="0" text="Allow/Deduct Code " border="6" color="0" x="262" y="3" height="16" width="112" html.valueishtml="0" name=ad_code_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="79741120" )
text(band=header alignment="0" text="Acct Code" border="6" color="0" x="47" y="3" height="16" width="71" html.valueishtml="0" name=acct_code_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="79741120" )
text(band=header alignment="0" text="Analysis" border="6" color="0" x="533" y="3" height="16" width="58" html.valueishtml="0" name=t_1 visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="79741120" )
text(band=header alignment="0" text="Description" border="6" color="0" x="376" y="3" height="16" width="155" html.valueishtml="0" name=descr_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="79741120" )
text(band=header alignment="2" text="Tran Id" border="6" color="0" x="593" y="3" height="16" width="74" html.valueishtml="0" name=tran_id_t visible="1~t0" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="79741120" )
column(band=detail id=2 alignment="1" tabsequence=32766 border="5" color="0" x="2" y="1" height="19" width="43" format="[general]" html.valueishtml="0" name=line_no tag="Line no." visible="1" edit.limit=3 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
column(band=detail id=4 alignment="0" tabsequence=32766 border="5" color="0" x="120" y="1" height="19" width="58" format="[general]" html.valueishtml="0" name=cctr_code tag="Cost centre" visible="1" edit.limit=4 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
column(band=detail id=5 alignment="1" tabsequence=32766 border="5" color="0" x="180" y="1" height="19" width="80" format="#######.##" html.valueishtml="0" name=amount tag="Amount" visible="1" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
column(band=detail id=3 alignment="0" tabsequence=32766 border="5" color="0" x="47" y="1" height="19" width="71" format="[general]" html.valueishtml="0" name=acct_code tag="Account code" visible="1" edit.limit=10 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
column(band=detail id=6 alignment="0" tabsequence=32766 border="5" color="0" x="262" y="1" height="19" width="112" format="[general]" html.valueishtml="0" name=ad_code tag="Allowance / deduction code" visible="1" edit.limit=5 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
column(band=detail id=8 alignment="0" tabsequence=32766 border="5" color="0" x="376" y="1" height="19" width="155" format="[general]" html.valueishtml="0" name=descr visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
column(band=detail id=7 alignment="0" tabsequence=32766 border="5" color="0" x="533" y="1" height="19" width="58" format="[general]" html.valueishtml="0" name=anal_code visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
column(band=detail id=1 alignment="0" tabsequence=32766 border="5" color="0" x="593" y="1" height="19" width="74" format="[general]" html.valueishtml="0" name=tran_id tag="Transaction id." visible="1~t0" edit.limit=10 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
htmltable(border="1" )
htmlgen(clientevents="1" clientvalidation="1" clientcomputedfields="1" clientformatting="0" clientscriptable="0" generatejavascript="1" encodeselflinkargs="1" netscapelayers="0" )
export.xml(headgroups="1" includewhitespace="0" metadatatype=0 savemetadata=0 )
import.xml()
export.pdf(method=0 distill.custompostscript="0" xslfop.print="0" )
\ No newline at end of file
$PBExportHeader$d_payr_vouchdet_edit.srd
release 9;
datawindow(units=1 timer_interval=0 color=79741120 processing=0 HTMLDW=no print.printername="" print.documentname="" print.orientation = 0 print.margin.left = 24 print.margin.right = 24 print.margin.top = 24 print.margin.bottom = 24 print.paper.source = 0 print.paper.size = 0 print.canusedefaultprinter=yes print.prompt=no print.buttons=no print.preview.buttons=no print.cliptext=no print.overrideprintjob=no print.collate=yes hidegrayline=no )
summary(height=1 color="536870912" )
footer(height=0 color="536870912" )
detail(height=82 color="536870912" )
table(column=(type=char(10) update=yes updatewhereclause=yes key=yes name=tran_id dbname="payr_vouchdet.tran_id" )
column=(type=char(3) update=yes updatewhereclause=yes key=yes name=line_no dbname="payr_vouchdet.line_no" )
column=(type=char(10) update=yes updatewhereclause=yes name=acct_code dbname="payr_vouchdet.acct_code" )
column=(type=char(4) update=yes updatewhereclause=yes name=cctr_code dbname="payr_vouchdet.cctr_code" )
column=(type=decimal(3) update=yes updatewhereclause=yes name=amount dbname="payr_vouchdet.amount" )
column=(type=char(5) update=yes updatewhereclause=yes name=ad_code dbname="payr_vouchdet.ad_code" )
column=(type=char(5) update=yes updatewhereclause=yes name=anal_code dbname="payr_vouchdet.anal_code" )
column=(type=char(40) updatewhereclause=yes name=descr dbname="allwdedn.descr" )
retrieve="PBSELECT( VERSION(400) TABLE(NAME=~"payr_vouchdet~" ) TABLE(NAME=~"allwdedn~" ) COLUMN(NAME=~"payr_vouchdet.tran_id~") COLUMN(NAME=~"payr_vouchdet.line_no~") COLUMN(NAME=~"payr_vouchdet.acct_code~") COLUMN(NAME=~"payr_vouchdet.cctr_code~") COLUMN(NAME=~"payr_vouchdet.amount~") COLUMN(NAME=~"payr_vouchdet.ad_code~") COLUMN(NAME=~"payr_vouchdet.anal_code~") COLUMN(NAME=~"allwdedn.descr~") JOIN (LEFT=~"allwdedn.ad_code~" OP =~"=~"RIGHT=~"payr_vouchdet.ad_code~" )WHERE( EXP1 =~"payr_vouchdet.tran_id~" OP =~"=~" EXP2 =~":mtranid~" LOGIC =~"and~" ) WHERE( EXP1 =~"payr_vouchdet.line_no~" OP =~"=~" EXP2 =~":mlineno~" ) ) ARG(NAME = ~"mtranid~" TYPE = string) ARG(NAME = ~"mlineno~" TYPE = string) " update="payr_vouchdet" updatewhere=0 updatekeyinplace=no arguments=(("mtranid", string),("mlineno", string)) )
column(band=detail id=2 alignment="1" tabsequence=32766 border="5" color="0" x="126" y="9" height="16" width="32" format="[general]" html.valueishtml="0" name=line_no tag="Line no." visible="1" edit.limit=3 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
text(band=detail alignment="1" text="Line No :" border="0" color="0" x="13" y="9" height="16" width="110" html.valueishtml="0" name=line_no_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="79741120" )
text(band=detail alignment="1" text="Allw/Dedn Code:" border="0" color="0" x="13" y="31" height="16" width="110" html.valueishtml="0" name=ad_code_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="79741120" )
column(band=detail id=6 alignment="0" tabsequence=10 border="5" color="0" x="126" y="31" height="16" width="60" format="[general]" html.valueishtml="0" name=ad_code tag="Allowance / deduction code" visible="1" edit.limit=5 edit.case=upper edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
column(band=detail id=8 alignment="0" tabsequence=32766 border="5" color="255" x="190" y="31" height="16" width="154" format="[general]" html.valueishtml="0" name=descr visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="79741120" )
text(band=detail alignment="1" text="Amount :" border="0" color="0" x="347" y="31" height="16" width="50" html.valueishtml="0" name=amount_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="79741120" )
column(band=detail id=5 alignment="1" tabsequence=20 border="5" color="0" x="403" y="31" height="16" width="61" format="[general]" html.valueishtml="0" name=amount tag="Amount" visible="1" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
column(band=detail id=3 alignment="0" tabsequence=32766 border="5" color="255" x="126" y="53" height="16" width="70" format="[general]" html.valueishtml="0" name=acct_code tag="Account code" visible="1" edit.limit=10 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="79741120" )
text(band=detail alignment="1" text="Account :" border="0" color="0" x="13" y="53" height="16" width="110" html.valueishtml="0" name=acct_code_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="79741120" )
text(band=detail alignment="1" text="Cost centre :" border="0" color="0" x="203" y="53" height="16" width="78" html.valueishtml="0" name=cctr_code_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="79741120" )
column(band=detail id=4 alignment="0" tabsequence=32766 border="5" color="255" x="285" y="53" height="16" width="46" format="[general]" html.valueishtml="0" name=cctr_code tag="Cost centre" visible="1" edit.limit=4 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="79741120" )
text(band=detail alignment="1" text="Analysis :" border="0" color="0" x="343" y="53" height="16" width="70" html.valueishtml="0" name=anal_code_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="79741120" )
column(band=detail id=7 alignment="0" tabsequence=30 border="5" color="0" x="418" y="53" height="16" width="46" format="[general]" html.valueishtml="0" name=anal_code visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
text(band=detail alignment="1" text="Voucher # :" border="0" color="0" x="314" y="9" height="16" width="80" html.valueishtml="0" name=tran_id_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="79741120" )
column(band=detail id=1 alignment="0" tabsequence=32766 border="5" color="0" x="398" y="9" height="16" width="67" format="[general]" html.valueishtml="0" name=tran_id tag="Transaction id." visible="1" edit.limit=10 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
htmltable(border="1" )
htmlgen(clientevents="1" clientvalidation="1" clientcomputedfields="1" clientformatting="0" clientscriptable="0" generatejavascript="1" encodeselflinkargs="1" netscapelayers="0" )
export.xml(headgroups="1" includewhitespace="0" metadatatype=0 savemetadata=0 )
import.xml()
export.pdf(method=0 distill.custompostscript="0" xslfop.print="0" )
\ No newline at end of file
This diff is collapsed.
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