Commit be87d40c authored by arawankar's avatar arawankar

-Changes made in below components

EmpLvePrkBalTrfConf.java
-Changes made to update proper balance 
EmpLvePrkBalTrfIC.java
-Changes made to not allow the  employee to enter another entry while unconfirmed entry is already exist. 
AD89SUN091.sql
-Added sql file for the messages table


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@189375 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 9613d783
......@@ -776,7 +776,7 @@ public class EmpLvePrkBalTrfIC extends ValidatorEJB implements EmpLvePrkBalTrfIC
cnt =0;
String tranType = checkNull(genericUtility.getColumnValue("tran_type", dom,objContext ));
System.out.println("tranType--["+tranType+"]");
sql = " SELECT count(*) as cnt FROM EMP_LVEPRKBAL_TRFHDR WHERE EMP_CODE__FR = ? AND TRAN_TYPE = ? AND STATUS <> 'A' ";
sql = " SELECT count(*) as cnt FROM EMP_LVEPRKBAL_TRFHDR WHERE EMP_CODE__FR = ? AND TRAN_TYPE = ? AND STATUS <> 'C' ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, empCodeFrom);
pstmt.setString(2, tranType);
......
......@@ -591,7 +591,7 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa
String tranIdGen = tg.generateTranSeqID(refSer, "", keyString, conn);
System.out.println("Umakanta::uniqueKey[" + tranIdGen + "]");
//Added by Anjali R. on[16/08/2018][To give error if amount balance is changes after inserting record in EMP_LVEPRKBAL_TRFHDR][Start]
//Added by Anjali R. on[16/08/2018][To give error if amount transfer is greater than amount balance ][Start]
pStmt7.setString(1,empCodeFr);
pStmt7.setString(2, balCode);
pStmt7.setTimestamp(3, frDate);
......@@ -602,13 +602,34 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa
orgAmtBal = rs1.getDouble("amt_bal");
}
System.out.println("orgAmtBal--["+orgAmtBal+"]perkBalance["+perkBalance+"]");
if(orgAmtBal != perkBalance)
if(orgAmtBal > 0)
{
if(orgAmtBal < perkBalance)
{
retString = itmDBAccess.getErrorString("", "VTELPTRF25", userId, "", conn);
successFlag = false;
return retString;
}
//Added by Anjali R. on[16/08/2018][To give error if amount balance is changes after inserting record in EMP_LVEPRKBAL_TRFHDR][End]
}
else
{
double perkBalanceAbs = perkBalance;
System.out.println("orgAmtBal--["+orgAmtBal+"]");
orgAmtBal = Math.abs(orgAmtBal);
System.out.println("orgAmtBal--["+orgAmtBal+"]");
System.out.println("perkBalanceAbs--["+perkBalanceAbs+"]");
perkBalanceAbs = Math.abs(perkBalanceAbs);
System.out.println("perkBalance--["+perkBalanceAbs+"]");
if(orgAmtBal < perkBalanceAbs)
{
retString = itmDBAccess.getErrorString("", "VTELPTRF25", userId, "", conn);
successFlag = false;
return retString;
}
}
//Added by Anjali R. on[16/08/2018][To give error if amount transfer is greater than amount balance][End]
pStmt1.setString(1, tranIdGen);
pStmt1.setTimestamp(2, curDateTm);
pStmt1.setString(3, empCodeFr);
......@@ -656,7 +677,8 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa
// Added by Varsha V on 16-07-18 for updating AMOUNT for emp_code_fr
if (successFlag) {
// Modified by Piyush on 18/07/2018 [Should not update amount].Start
pStmt6.setDouble(1, perkBalance);
//pStmt6.setDouble(1, perkBalance);
pStmt6.setDouble(1, Math.abs(perkBalance));
pStmt6.setDouble(2, perkBalance);
pStmt6.setString(3, empCodeFr);
pStmt6.setString(4, balCode);
......
......@@ -2383,5 +2383,5 @@ END;
Insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,ERR_SOURCE,CHG_DATE,CHG_USER,CHG_TERM,OVERRIDE_INPUT,MAIL_OPTION)
values ('VTUNCONF01','Already record exist','For this employee unconfirmed record is already present.','E','Y',null,null,null,sysdate,'SUN','SUN',null,null);
Insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,ERR_SOURCE,CHG_DATE,CHG_USER,CHG_TERM,OVERRIDE_INPUT,MAIL_OPTION)
values ('VTELPTRF25','Amount balance Changed','In allow deduction table original amount is changed.','E','Y',null,null,null,sysdate,'SUN','SUN',null,null);
values ('VTELPTRF25','Insufficiant Balance','Employee does not have sufficient balance.','E','Y',null,null,null,sysdate,'SUN','SUN',null,null);
--Added by Anjali R. on[16-08-2018][End]
\ No newline at end of file
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