Commit dcd0a043 authored by ssalve's avatar ssalve

Sarita : Done changes for Single employee getting error while inserting data on 19 MARCH 2019

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@198603 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c96dae22
...@@ -455,7 +455,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -455,7 +455,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
String lsEmpCode = "",lcStartDate = "",lcEndDate="",lcAdCode="",lsfullClaim = "",lsPrevEmp = " ",lsTranId = ""; String lsEmpCode = "",lcStartDate = "",lcEndDate="",lcAdCode="",lsfullClaim = "",lsPrevEmp = " ",lsTranId = "";
String paySite = "",finEntity = "",deptCode = "",payMode = "",currCode = "",bankCode = "",acctCode = "", cctrCode = "",tranIdGenerate = ""; String paySite = "",finEntity = "",deptCode = "",payMode = "",currCode = "",bankCode = "",acctCode = "", cctrCode = "",tranIdGenerate = "";
String lsadCodeProc = "", lsAdCodeDet = "", lsRndOff = "",lsPostYN = "",lsAdShdescr=""; String lsadCodeProc = "", lsAdCodeDet = "", lsRndOff = "",lsPostYN = "",lsAdShdescr="";
double lcBalAmt1= 0.0 , lcClaimAmt1 = 0.0,lcTempBal = 0.0,lcTotClaimAmt = 0.0,lcVouchHdrAmt =0.0; double lcBalAmt1= 0.0 , lcClaimAmt1 = 0.0,lcTempBal = 0.0,lcTotClaimAmt = 0.0,lcTotClaimAmt1 = 0.0,lcVouchHdrAmt =0.0;
double lcBaseAmt = 0.0 , lcSlabAmt = 0.0, lcResultAmt = 0.0, lcCalcAmt = 0.0, lcAmt = 0.0, lcRndTo = 0.0; double lcBaseAmt = 0.0 , lcSlabAmt = 0.0, lcResultAmt = 0.0, lcCalcAmt = 0.0, lcAmt = 0.0, lcRndTo = 0.0;
int liClaimDet = 0,count = 0,liSeqNo = 0, liLineNo = 0,parentNodeListLength = 0 , childNodeListLength = 0,cnt1 = 0; int liClaimDet = 0,count = 0,liSeqNo = 0, liLineNo = 0,parentNodeListLength = 0 , childNodeListLength = 0,cnt1 = 0;
HashMap<String , String> headerDomValues = new HashMap<String , String>(); HashMap<String , String> headerDomValues = new HashMap<String , String>();
...@@ -464,7 +464,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -464,7 +464,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
ArrayList payDetList = new ArrayList(); ArrayList payDetList = new ArrayList();
HashMap payDet = null; HashMap payDet = null;
String erroCode = "",lsAdname = "",lcBalAmtStr = "", lcClaimAmtStr = ""; String erroCode = "",lsAdname = "",lcBalAmtStr = "", lcClaimAmtStr = "";
int cntr = 0; int cntr = 0 , countempHdr = 0;
SimpleDateFormat sdf = null; SimpleDateFormat sdf = null;
try try
{ {
...@@ -512,6 +512,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -512,6 +512,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
return errString; return errString;
} }
// --------------------- PB Code Not Migrated -------------------- [START] ---------------- // --------------------- PB Code Not Migrated -------------------- [START] ----------------
/* /*
// Modified by Piyush on 20/05/2011 [AD1BSUN002].Start // Modified by Piyush on 20/05/2011 [AD1BSUN002].Start
...@@ -816,6 +817,8 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -816,6 +817,8 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
pstmt = null; pstmt = null;
} }
if(!(lsEmpCode.equalsIgnoreCase(lsPrevEmp)))
{
String xmlValues = ""; String xmlValues = "";
xmlValues ="<?xml version=\"1.0\" encoding=\"utf-8\"?><Root>"; xmlValues ="<?xml version=\"1.0\" encoding=\"utf-8\"?><Root>";
xmlValues = xmlValues + "<Header></Header>"; xmlValues = xmlValues + "<Header></Header>";
...@@ -829,7 +832,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -829,7 +832,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
TransIDGenerator tg = new TransIDGenerator(xmlValues, "SYSTEM", CommonConstants.DB_NAME); TransIDGenerator tg = new TransIDGenerator(xmlValues, "SYSTEM", CommonConstants.DB_NAME);
tranIdGenerate = tg.generateTranSeqID("ECLAIM", "tran_id", keyString, conn); tranIdGenerate = tg.generateTranSeqID("ECLAIM", "tran_id", keyString, conn);
System.out.println("tranIdGenerate for emp claim = "+tranIdGenerate); //working properly... System.out.println("tranIdGenerate for emp claim = "+tranIdGenerate); //working properly...
}
if(tranIdGenerate == null || tranIdGenerate.trim().length() == 0) if(tranIdGenerate == null || tranIdGenerate.trim().length() == 0)
{ {
errString = itmDBAccessEJB.getErrorString("","VTTRANID","","",conn); errString = itmDBAccessEJB.getErrorString("","VTTRANID","","",conn);
...@@ -889,8 +892,8 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -889,8 +892,8 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
lcVouchHdrAmt = lcVouchHdrAmt + lcClaimAmt1; lcVouchHdrAmt = lcVouchHdrAmt + lcClaimAmt1;
System.out.println("liClaimDet ["+liClaimDet+"] \t lcTotClaimAmt ["+lcTotClaimAmt+"] \t lcVouchHdrAmt["+lcVouchHdrAmt+"]"); System.out.println("liClaimDet ["+liClaimDet+"] \t lcTotClaimAmt ["+lcTotClaimAmt+"] \t lcVouchHdrAmt["+lcVouchHdrAmt+"]");
//Added by sarita on 18 FEBRUARY 2019 to set claimDet and totClaimAmt set into table [END] //Added by sarita on 18 FEBRUARY 2019 to set claimDet and totClaimAmt set into table [END]
if(!(lsEmpCode.equalsIgnoreCase(lsPrevEmp))) /*if(!(lsEmpCode.equalsIgnoreCase(lsPrevEmp)))//Commented by sarita on 19 MARCH 2019
{ {*/
lsPrevEmp = lsEmpCode;//Added by sarita on 18 FEBRUARY 2019 to set emp code as previous employee lsPrevEmp = lsEmpCode;//Added by sarita on 18 FEBRUARY 2019 to set emp code as previous employee
if(liClaimDet > 0) if(liClaimDet > 0)
{ {
...@@ -1007,8 +1010,31 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -1007,8 +1010,31 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
/*lcVouchHdrAmt = 0.0; //Commented by sarita on 18 FEBRUARY 2019 /*lcVouchHdrAmt = 0.0; //Commented by sarita on 18 FEBRUARY 2019
lcTotClaimAmt = 0.0; lcTotClaimAmt = 0.0;
liClaimDet = 0;*/ liClaimDet = 0;*/
//Added by sarita on 19MARCH2019 [START]
count = 0; count = 0;
sql = "select count(*) as count from emp_adclaimhdr where tran_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranIdGenerate);
rs = pstmt.executeQuery();
if(rs.next())
{
countempHdr = rs.getInt("count");
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(countempHdr == 0)
{
countempHdr = 0;
//Added by sarita on 19MARCH2019 [END]
sql = " insert into emp_adclaimhdr (tran_id, tran_date, emp_code, claim_amt, loan_adjamt," sql = " insert into emp_adclaimhdr (tran_id, tran_date, emp_code, claim_amt, loan_adjamt,"
+ " payroll_voucher, prd_code__payroll, chg_date, chg_user, chg_term, ad_code,confirmed) " + " payroll_voucher, prd_code__payroll, chg_date, chg_user, chg_term, ad_code,confirmed) "
+ " values (?, ?,?,0,0,?,?,?,?,?,?,'Y')"; + " values (?, ?,?,0,0,?,?,?,?,?,?,'Y')";
...@@ -1022,19 +1048,20 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -1022,19 +1048,20 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
pstmt.setString(7, userId); pstmt.setString(7, userId);
pstmt.setString(8, chgTerm); pstmt.setString(8, chgTerm);
pstmt.setString(9, lsAdCode); pstmt.setString(9, lsAdCode);
count = pstmt.executeUpdate(); countempHdr = pstmt.executeUpdate();
System.out.println("no of row inserted emp_adclaimhdr = "+count); System.out.println("no of row inserted emp_adclaimhdr = "+countempHdr);
if(pstmt != null) if(pstmt != null)
{ {
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
if(count == 0) if(countempHdr == 0)
{ {
errString = itmDBAccessEJB.getErrorString("","DS000","","",conn);//Claimed amount should be same as balance amount in case of full claime errString = itmDBAccessEJB.getErrorString("","DS000","","",conn);//Claimed amount should be same as balance amount in case of full claime
return errString; return errString;
} }
}//END ----(!(lsEmpCode.equalsIgnoreCase(lsPrevEmp))) }
//}//END ----(!(lsEmpCode.equalsIgnoreCase(lsPrevEmp)))
//Commented by sarita on 18 FEBRUARY 2019 as claimDET and totClaimAmt was setting zero[START] //Commented by sarita on 18 FEBRUARY 2019 as claimDET and totClaimAmt was setting zero[START]
/*liClaimDet ++; /*liClaimDet ++;
lcTotClaimAmt = lcTotClaimAmt + lcClaimAmt1; lcTotClaimAmt = lcTotClaimAmt + lcClaimAmt1;
...@@ -1161,8 +1188,10 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -1161,8 +1188,10 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
} }
} }
//Added by sarita on 18 FEBRUARY 2019 [START] --[emp_adclaimhdr] //Added by sarita on 18 FEBRUARY 2019 [START] --[emp_adclaimhdr]
if(countempHdr > 0)
{
count = 0; count = 0;
sql = "update emp_adclaimhdr set claim_amt = ? where tran_id = ?"; sql = "update emp_adclaimhdr set claim_amt = claim_amt + ? where tran_id = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1,lcTotClaimAmt); pstmt.setDouble(1,lcTotClaimAmt);
pstmt.setString(2,tranIdGenerate); pstmt.setString(2,tranIdGenerate);
...@@ -1178,6 +1207,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -1178,6 +1207,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
errString = itmDBAccessEJB.getErrorString("","DS000","","",conn);//Claimed amount should be same as balance amount in case of full claim errString = itmDBAccessEJB.getErrorString("","DS000","","",conn);//Claimed amount should be same as balance amount in case of full claim
return errString; return errString;
} }
}
lcVouchHdrAmt = 0.0; //Commented by sarita on 18 FEBRUARY 2019 lcVouchHdrAmt = 0.0; //Commented by sarita on 18 FEBRUARY 2019
lcTotClaimAmt = 0.0; lcTotClaimAmt = 0.0;
liClaimDet = 0; liClaimDet = 0;
......
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