Skip to content

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

EmpEncLeaveCanc.java 

EmpEncLeaveCancLocal.java
EmpEncLeaveCancRemote.java
EmpLeaveCancel.java
LveEncArrCanc.java
-Updated source given by ahmed sir

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@197470 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 93233f47
Hide whitespace changes
Inline Side-by-side
Showing with 109 additions and 11 deletions
webitm-adm/ibase/webitm/ejb/adm/adv/EmpEncLeaveCanc.java
View file @ ae9e2acd
......@@ -1385,6 +1385,9 @@ public class EmpEncLeaveCanc extends ActionHandlerEJB implements EmpEncLeaveCan
E12GenericUtility genericUtility = null;
HRVoucherReversal hrVoucherReversal = null;
AdmCommon admCommon = null;
//added by Rupesh Pawar 21/02/19
Timestamp lveDateStrTimestamp=null;
try
{
itmdbAccessEJB = new ITMDBAccessEJB();
......@@ -1427,6 +1430,11 @@ public class EmpEncLeaveCanc extends ActionHandlerEJB implements EmpEncLeaveCan
{
lveDateFrStr = genericUtility.getValidDateString(lveDateFr, genericUtility.getDBDateTimeFormat());
System.out.println("tranDateStr---["+lveDateFrStr+"]");
//added by Rupesh Pawar 21/02/19
lveDateStrTimestamp = Timestamp.valueOf(genericUtility.getValidDateTimeString(lveDateFrStr, genericUtility.getApplDateFormat()
,genericUtility.getDBDateFormat()));
//added by Rupesh Pawar 21/02/19
}
//Modified by Anjali R. on [18/09/2018][Start]
//String allowEnvLveCancel = admCommon.getEnv("999999", "ALLOW_CANCEL_LVEENC", conn);
......@@ -1441,7 +1449,10 @@ public class EmpEncLeaveCanc extends ActionHandlerEJB implements EmpEncLeaveCan
pstmt.setString(1, empCode);
pstmt.setString(2, tranId);
pstmt.setString(3, chgUser);
pstmt.setString(4, lveDateFrStr);
//Modified by Rupesh Pawar 21/02/19
//pstmt.setString(4, lveDateFrStr);
pstmt.setTimestamp(4, lveDateStrTimestamp);
//Modified by Rupesh Pawar 21/02/19
pstmt.setString(5, "CANC_LVE_ENC");
rs = pstmt.executeQuery();
if(rs.next())
......
webitm-adm/ibase/webitm/ejb/adm/adv/EmpEncLeaveCancLocal.java
View file @ ae9e2acd
......@@ -3,9 +3,12 @@ package ibase.webitm.ejb.adm.adv;
import java.rmi.RemoteException;
import java.sql.Connection;
import javax.ejb.Local;
import ibase.webitm.ejb.ActionHandlerLocal;
import ibase.webitm.utility.ITMException;
@Local
public interface EmpEncLeaveCancLocal extends ActionHandlerLocal
{
@Override
......
webitm-adm/ibase/webitm/ejb/adm/adv/EmpEncLeaveCancRemote.java
View file @ ae9e2acd
......@@ -3,10 +3,13 @@ package ibase.webitm.ejb.adm.adv;
import java.rmi.RemoteException;
import java.sql.Connection;
import javax.ejb.Remote;
import ibase.utility.UserInfoBean;
import ibase.webitm.ejb.ActionHandlerRemote;
import ibase.webitm.utility.ITMException;
@Remote
public interface EmpEncLeaveCancRemote extends ActionHandlerRemote
{
......
webitm-adm/ibase/webitm/ejb/adm/adv/EmpLeaveCancel.java
View file @ ae9e2acd
......@@ -1333,6 +1333,9 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
String frDateStr = "";
String toDateStr = "";
String lveDateFrStr = "";
//ADDED BY AMIT SHRIVASTAVA ON 29/11/18[START]
Timestamp lveDateFrStrTimestamp = null;
String arrearVoucherStatus = "";
String siteCode = "";
String finYearErr = "";
......@@ -1387,6 +1390,13 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
{
lveDateFrStr = genericUtility.getValidDateString(lveDateFr, genericUtility.getDBDateTimeFormat());
System.out.println("tranDateStr---["+lveDateFrStr+"]");
//ADDED BY AMMIT SHRIVASTAVA ON 1/14/2019[START]
lveDateFrStrTimestamp = Timestamp.valueOf(genericUtility.getValidDateTimeString(lveDateFrStr, genericUtility.getApplDateFormat()
,genericUtility.getDBDateFormat()));
System.out.println("@Amit @ tranDateTimestamp::::"+lveDateFrStrTimestamp);
//ADDED BY AMMIT SHRIVASTAVA ON 1/14/2019[END.]
}
//Modified by Anjali R. on [18/09/2018][Start]
//String allowEnvLveCancel = admCommon.getEnv("999999", "ALLOW_CANCEL_LVEENC", conn);
......@@ -1401,7 +1411,10 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
pstmt.setString(1, empCode);
pstmt.setString(2, tranId);
pstmt.setString(3, chgUser);
pstmt.setString(4, lveDateFrStr);
//ADDED BY AMIT SHRIVASTAVA ON 1/14/2019 [START]
//pstmt.setString(4, lveDateFrStr);
pstmt.setTimestamp(4, lveDateFrStrTimestamp);
//ADDED BY AMIT SHRIVASTAVA ON 1/14/2019 [END.]
pstmt.setString(5, "CANC_LVE_ENC");
rs = pstmt.executeQuery();
if(rs.next())
......
webitm-adm/ibase/webitm/ejb/adm/adv/LveEncArrCanc.java
View file @ ae9e2acd
......@@ -102,6 +102,9 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
String chgUser = "";
String empCode = "";
String tranDateStr = "";
//ADDED BY AMIT SHRIVASTAVA ON [ A15ISUN003 ]30/11/18[START]
Timestamp lveDateStrTimestamp=null;
//ADDED BY AMIT SHRIVASTAVA ON [ A15ISUN003 ]30/11/18[END].
String accountingYearerror = "";
ITMDBAccessEJB itmDBAccessEJB = null;
String errString = "";
......@@ -175,10 +178,13 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
//errString = "VTADMLVE05";
return errString;
}
//Modified by Anjali R. on [03/01/2019][Start]
//Modified by Anjali R. on [25/09/2018][Approved/Unconfirmed arrears selection should be based on primary key][Start]
//sql = "select aprv_date from empleave_ench_arr where tran_id__lve = ? AND status not in 'X' order by aprv_date desc";
sql = "select tran_id from empleave_ench_arr where tran_id__lve = ? AND status not in 'X' order by aprv_date desc";
//sql = "select tran_id from empleave_ench_arr where tran_id__lve = ? AND status not in 'X' order by aprv_date desc";
sql = "select tran_id from empleave_ench_arr where tran_id__lve = ? AND status not in ('X') order by aprv_date desc";
//Modified by Anjali R. on [25/09/2018][Approved/Unconfirmed arrears selection should be based on primary key][End]
//Modified by Anjali R. on [03/01/2019][End]
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranIdLve);
rs = pstmt.executeQuery();
......@@ -218,6 +224,12 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
{
tranDateStr = genericUtility.getValidDateString(tranDate, genericUtility.getDBDateTimeFormat());
System.out.println("tranDateStr---["+tranDateStr+"]");
//ADDED BY AMMIT SHRIVASTAVA ON 1/14/2019[START]
lveDateStrTimestamp = Timestamp.valueOf(genericUtility.getValidDateTimeString(tranDateStr, genericUtility.getApplDateFormat()
,genericUtility.getDBDateFormat()));
System.out.println("@Amit @ tranDateTimestamp::::"+lveDateStrTimestamp);
//ADDED BY AMMIT SHRIVASTAVA ON 1/14/2019[END.]
}
//Modified by Anjali R. on [19/09/2018][Start]
/*if(status != null && status.trim().length() > 0 || !status.equalsIgnoreCase("N"))
......@@ -269,12 +281,49 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
else
{
//Modified by Anjali R. on [19/09/2018][End]
//Modified by Anjali R. [03/01/2019][Start]
sql = "select FN_CHECK_ACCOUNTING_YEAR(?,?,?,?,?) as err_code from dual";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, empCode);
pstmt.setString(2, tranIdLve);
pstmt.setString(3, chgUser);
//ADDED BY AMIT SHRIVASTAVA ON 1/14/2019 [START]
//pstmt.setString(4, tranDateStr);
pstmt.setTimestamp(4, lveDateStrTimestamp);
//ADDED BY AMIT SHRIVASTAVA ON 1/14/2019 [END.]
pstmt.setString(5, "CANC_LVE_ENC_ARR");
rs = pstmt.executeQuery();
if(rs.next())
{
accountingYearerror = checkNull(rs.getString("err_code"));
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(accountingYearerror != null && accountingYearerror.trim().length() > 0)
{
errString = itmDBAccessEJB.getErrorString("", accountingYearerror, chgUser,"",conn);
//errString = accountingYearerror;
return errString;
}
//Modified by Anjali R. [03/01/2019][End]
if("V".equalsIgnoreCase(payMode))
{
//Modified by Anjali R. [03/01/2019][Start]
if(tranIdVoucher!=null && tranIdVoucher.trim().length()>0)
{
sql = "select FN_CHECK_ACCOUNTING_YEAR(?,?,?,?) as err_code from dual";
/*sql = "select FN_CHECK_ACCOUNTING_YEAR(?,?,?,?) as err_code from dual";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, empCode);
pstmt.setString(2, tranIdVoucher);
......@@ -301,7 +350,8 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
errString = itmDBAccessEJB.getErrorString("", accountingYearerror, chgUser,"",conn);
//errString = accountingYearerror;
return errString;
}
}*/
//Modified by Anjali R. [03/01/2019][End]
//Cal HRVoucherReversal component to generate reversal voucher
errString = hrVoucherReversal.actionHandler(tranIdVoucher, xtraParams, forcedFlag, conn);
......@@ -362,7 +412,12 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
toDateStr = simpleDateFormat.format(toDate);
System.out.println("toDateStr--["+toDateStr+"]");
refNo = frDateStr+lveCode;
//Modified by Anjali R. on [31/12/2018][To update full year in ref_no][Start]
//refNo = frDateStr+lveCode;
SimpleDateFormat simpleDtFormat = new SimpleDateFormat("dd/MM/yyyy");
String frDtStr = simpleDtFormat.format(frDate);
refNo = frDtStr+lveCode;
//Modified by Anjali R. on [31/12/2018][To update full year in ref_no][End]
System.out.println("refNo--["+refNo+"]");
sql = "select ad_code__ench from leaves where lve_code = ?";
......@@ -432,15 +487,27 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
else
{
updCount = 0;
sql = "update employee_mthad set ref_type = 'E' ,ref_no = ?,type = 'F',amount = amount + ? "
//Modified by Anjali R. [31/12/2018][To update chg_date,chg_term and chg_usr][Start]
/*sql = "update employee_mthad set ref_type = 'E' ,ref_no = ?,type = 'F',amount = amount + ? "
+ "where emp_code = ? and month_code = ? and ad_code = ? and eff_date = ?";*/
sql = "update employee_mthad set ref_type = 'E' ,ref_no = ?,type = 'F',amount = amount + ?,chg_date = ?,chg_term= ?,chg_user = ? "
+ "where emp_code = ? and month_code = ? and ad_code = ? and eff_date = ?";
//Modified by Anjali R. [31/12/2018][To update chg_date,chg_term and chg_usr][End]
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, refNo);
pstmt.setDouble(2, enchAmt*-1);
pstmt.setString(3, empCode);
pstmt.setInt(4, month);
pstmt.setString(5, adCode);
pstmt.setTimestamp(6, frDate);
//Modified by Anjali R. [31/12/2018][To update chg_date,chg_term and chg_usr][Start]
pstmt.setTimestamp(3,new java.sql.Timestamp(System.currentTimeMillis()) );
pstmt.setString(4,chgUser);
pstmt.setString(5, chgUser);
//Modified by Anjali R. [31/12/2018][To update chg_date,chg_term and chg_usr][End]
pstmt.setString(6, empCode);
pstmt.setInt(7, month);
pstmt.setString(8, adCode);
pstmt.setTimestamp(9, frDate);
updCount = pstmt.executeUpdate();
if(pstmt != null)
{
......@@ -483,6 +550,7 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
errString = itmDBAccessEJB.getErrorString("", errString, "", "",conn);
return errString;
}
//Modified by Anjaili R. on [24/09/2018][End]
}
}
}
......
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