Skip to content

B
business-java
Commit 0fc537f5 authored by arawankar's avatar arawankar
Browse files
Options

EmpLeaveCancel.java 

-Rollback and commit related change done in this component
LveEncArrCanc.java
-Rollback and commit related change done in this component,as well as return string related changes done.(now component will return errstring rather errcode)

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@190948 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 234579d4
Expand all Show whitespace changes
Inline Side-by-side
Showing with 395 additions and 58 deletions
webitm-adm/ibase/webitm/ejb/adm/adv/LveEncArrCanc.java
View file @ 0fc537f5
......@@ -7,6 +7,7 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
import java.util.Date;
import javax.ejb.Stateless;
......@@ -43,7 +44,7 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
{
conn.rollback();
System.out.println("retString---["+retString+"]");
retString = itmdbAccessEJB.getErrorString("", retString, "","",conn);
//retString = itmdbAccessEJB.getErrorString("", retString, "","",conn);
}
else
{
......@@ -51,7 +52,7 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
retString = itmdbAccessEJB.getErrorString("", "VTADMLVE02", "","",conn);//Voucher cancelled successfully message
}
}
catch (SQLException e)
catch (Exception e)
{
System.out.println("Exception in actionHandler---["+e.getMessage()+"]");
e.printStackTrace();
......@@ -59,10 +60,12 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
{
conn.rollback();
}
catch (SQLException e1)
catch (Exception e1)
{
e1.printStackTrace();
throw new ITMException(e1);
}
throw new ITMException(e);
}
finally
{
......@@ -73,6 +76,10 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
conn.close();
conn = null;
}
if(itmdbAccessEJB != null)
{
itmdbAccessEJB = null;
}
}
catch(Exception e )
{
......@@ -99,7 +106,7 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
ITMDBAccessEJB itmDBAccessEJB = null;
String errString = "";
String payMode = "";
String retString = "";
//String retString = "";
String lveCode = "";
String prdCodePayroll = "";
Timestamp frDate = null;
......@@ -160,8 +167,8 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
if("X".equalsIgnoreCase(status))
{
//errString = itmDBAccessEJB.getErrorString("", "VTADMLVE05", chgUser,"",conn);
errString = "VTADMLVE05";
errString = itmDBAccessEJB.getErrorString("", "VTADMLVE05", chgUser,"",conn);
//errString = "VTADMLVE05";
return errString;
}
sql = "select aprv_date from empleave_ench_arr where tran_id__lve = ? AND status = 'A' order by aprv_date desc";
......@@ -173,8 +180,8 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
confDateRem = rs.getTimestamp("aprv_date");
if(ConfDateCurrent.before(confDateRem))
{
//errString = itmDBAccessEJB.getErrorString("", "VTADMLVE06", chgUser,"",conn);
errString = "VTADMLVE06";
errString = itmDBAccessEJB.getErrorString("", "VTADMLVE06", chgUser,"",conn);
//errString = "VTADMLVE06";
return errString;
}
}
......@@ -194,12 +201,56 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
tranDateStr = genericUtility.getValidDateString(tranDate, genericUtility.getDBDateTimeFormat());
System.out.println("tranDateStr---["+tranDateStr+"]");
}
if(status != null && status.trim().length() > 0 || !status.equalsIgnoreCase("N"))
//Modified by Anjali R. on [19/09/2018][Start]
/*if(status != null && status.trim().length() > 0 || !status.equalsIgnoreCase("N"))
{
String allowEnvLveCancel = admCommon.getEnv("999999", "ALLOW_CANCEL_LVEENC", conn);
if("Y".equalsIgnoreCase(allowEnvLveCancel ))
{*/
if(status != null && status.trim().length() > 0 && status.equalsIgnoreCase("A"))
{
String siteCode = "" , cadreCode = "" , gradeCode = "";
sql = "SELECT PAY_SITE, CADRE, GRADE FROM EMPLOYEE WHERE EMP_CODE = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,empCode);
rs = pstmt.executeQuery();
while(rs.next())
{
siteCode = checkNull(rs.getString("PAY_SITE"));
cadreCode = checkNull(rs.getString("CADRE"));
gradeCode = checkNull(rs.getString("GRADE"));
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
String currDateStr = sdf.format(new Date());
Timestamp currDateTime = java.sql.Timestamp.valueOf(genericUtility.getValidDateTimeString(currDateStr,genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()));
String allowEnvLveCancel = checkNull(admCommon.getAdmEnv(siteCode, cadreCode,gradeCode , "ALLOW_CANCEL_LVEENC", currDateTime, conn));
if("NULLFOUND".equalsIgnoreCase(allowEnvLveCancel))
{
allowEnvLveCancel = checkNull(admCommon.getEnv("999999", "ALLOW_CANCEL_LVEENC", conn));
}
if(!("Y".equalsIgnoreCase(allowEnvLveCancel )))
{
//NOT DEFINED / VALUE "N" - ALLOW_CANCEL_LVEENC
errString = itmDBAccessEJB.getErrorString("", "VTADMLVE07", "", "",conn);
return errString;
}
else
{
//Modified by Anjali R. on [19/09/2018][End]
if("V".equalsIgnoreCase(payMode))
{
......@@ -229,14 +280,14 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
if(accountingYearerror != null && accountingYearerror.trim().length() > 0)
{
//errString = itmDBAccessEJB.getErrorString("", accountingYearerror, chgUser,"",conn);
errString = accountingYearerror;
errString = itmDBAccessEJB.getErrorString("", accountingYearerror, chgUser,"",conn);
//errString = accountingYearerror;
return errString;
}
//Cal HRVoucherReversal component to generate reversal voucher
retString = hrVoucherReversal.actionHandler(tranIdVoucher, xtraParams, forcedFlag, conn);
System.out.println("retString---["+retString+"]");
errString = hrVoucherReversal.actionHandler(tranIdVoucher, xtraParams, forcedFlag, conn);
System.out.println("errString---["+errString+"]");
/*if(retString == null || retString.trim().length() == 0)
{
......@@ -250,6 +301,10 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
pstmt = null;
}
}*/
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
}
}
else if("P".equalsIgnoreCase(payMode))
......@@ -265,9 +320,9 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
}
else
{
//retString = itmDBAccessEJB.getErrorString("prd_code", "VTADMLVE03", "", "",conn);
retString = "VTADMLVE03";
return retString;
errString = itmDBAccessEJB.getErrorString("prd_code", "VTADMLVE03", "", "",conn);
//retString = "VTADMLVE03";
return errString;
}
System.out.println("frDate--["+frDate+"]toDate--["+toDate+"]");
if(rs != null)
......@@ -398,18 +453,20 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
System.out.println("count--["+count+"]");
if(count > 0)
{
retString = admCommon.payarrToProcUpdation(prdCodePayroll, prdCodePayroll, empCode, empCode, "PY", "w_empleave_ench_arr", "", adCode,enchAmt*-1 , frDateStr, toDateStr, xtraParams, conn);
System.out.println("retString--["+retString+"]");
errString = admCommon.payarrToProcUpdation(prdCodePayroll, prdCodePayroll, empCode, empCode, "PY", "w_empleave_ench_arr", "", adCode,enchAmt*-1 , frDateStr, toDateStr, xtraParams, conn);
System.out.println("errString--["+errString+"]");
if(retString != null && retString.trim().length()>0)
if(errString != null && errString.trim().length()>0)
{
return retString;
//payarrToProcUpdation method returns only error code
errString = itmDBAccessEJB.getErrorString("", errString, "", "",conn);
return errString;
}
}
}
}
}
if(retString == null || retString.trim().length() == 0)
if(errString == null || errString.trim().length() == 0)
{
sql = "update empleave_ench_arr set status = 'X' where tran_id = ?";
pstmt = conn.prepareStatement(sql);
......@@ -428,6 +485,16 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
conn.rollback();
System.out.println("Exception in actionHandler [LveEncArrCanc]----["+e.getMessage()+"]");
e.printStackTrace();
try
{
conn.rollback();
}
catch(Exception e1)
{
System.out.println();
e1.printStackTrace();
throw new ITMException(e1);
}
throw new ITMException(e);
}
finally
......@@ -443,8 +510,7 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
pstmt = null;
}
}
return retString;
return errString;
}
private String checkNull(String input)
{
......
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