Skip to content

B
business-java
Commit 00b69fc3 authored by kmandhre's avatar kmandhre
Browse files
Options

update source 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94098 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 29bf2a33
Hide whitespace changes
Inline Side-by-side
Showing with 261 additions and 174 deletions
webitm-adm/ibase/webitm/ejb/adm/PerkClaimIC.java
View file @ 00b69fc3
...@@ -55,6 +55,8 @@ public class PerkClaimIC extends ValidatorEJB implements PerkClaimICLocal, PerkC ...@@ -55,6 +55,8 @@ public class PerkClaimIC extends ValidatorEJB implements PerkClaimICLocal, PerkC
catch(Exception e) catch(Exception e)
{ {
System.out.println("Exception : [PerlClaimIc][wfValData(String currFrmXmlStr)] : ==>\n"+e.getMessage()); System.out.println("Exception : [PerlClaimIc][wfValData(String currFrmXmlStr)] : ==>\n"+e.getMessage());
e.printStackTrace();
throw new ITMException(e);
} }
return (errString); return (errString);
} }
...@@ -445,6 +447,51 @@ public class PerkClaimIC extends ValidatorEJB implements PerkClaimICLocal, PerkC ...@@ -445,6 +447,51 @@ public class PerkClaimIC extends ValidatorEJB implements PerkClaimICLocal, PerkC
case 2 : case 2 :
{ {
System.out.println("Case 2 Validation"); System.out.println("Case 2 Validation");
NodeList parentNodeList = null;
Node parentNode = null;
int parentNodeListLength = 0;
double claimAmount = 0,balAmount = 0;
parentNodeList = allDom.getElementsByTagName("Detail2");
parentNodeListLength = parentNodeList.getLength();
System.out.println("Detail2 length = "+parentNodeListLength);
if(parentNodeListLength < 1)
{
errList.add( "VTNOSEL" );
errFields.add( " " );
}
else
{
fullAmt = checkNull(genericUtility.getColumnValue("full_amt", hdrDom));
for(int ctr = 0; ctr < parentNodeListLength ; ctr++ )
{
System.out.println("TEST LENGTH="+parentNodeListLength);
parentNode = parentNodeList.item(ctr);
//Element parentNode1 = (Element)parentNodeList.item(ctr);
//claimAmount = Double.parseDouble(genericUtility.getColumnValue("claim_amt", dom, "2")== null?"0":genericUtility.getColumnValue("claim_amt", dom, "2"));
claimAmount = Double.parseDouble(genericUtility.getColumnValueFromNode( "claim_amt", parentNodeList.item(ctr) )== null?"0":genericUtility.getColumnValueFromNode( "claim_amt", parentNodeList.item(ctr) ));
balAmount = Double.parseDouble(genericUtility.getColumnValueFromNode( "amt_bal", parentNodeList.item(ctr) )== null?"0":genericUtility.getColumnValueFromNode( "amt_bal", parentNodeList.item(ctr) ));
//balAmount = Double.parseDouble(genericUtility.getColumnValue("amt_bal", dom, "2")== null?"0":genericUtility.getColumnValue("amt_bal", dom, "2"));
System.out.println("Full amy=="+fullAmt+" "+balAmount+" "+claimAmount);
if("Y".equalsIgnoreCase(fullAmt))
{
if(balAmount != claimAmount)
{
errList.add( "VTPERK1" );
errFields.add( "claim_amt" );
}
}
else
{
if(claimAmount > balAmount)
{
errList.add( "VMADJAMT2" );
errFields.add( "claim_amt" );
}
}
}
}
/*
childList = parentList.item( 0 ).getChildNodes(); childList = parentList.item( 0 ).getChildNodes();
noOfChilds = childList.getLength(); noOfChilds = childList.getLength();
for (int ctr = 0; ctr < noOfChilds; ctr++) for (int ctr = 0; ctr < noOfChilds; ctr++)
...@@ -465,8 +512,9 @@ public class PerkClaimIC extends ValidatorEJB implements PerkClaimICLocal, PerkC ...@@ -465,8 +512,9 @@ public class PerkClaimIC extends ValidatorEJB implements PerkClaimICLocal, PerkC
{ {
lpnNo = genericUtility.getColumnValue( "lpn_no", currDom ); lpnNo = genericUtility.getColumnValue( "lpn_no", currDom );
}*/ }///
}// for loop end }*/
// for loop end
}//case 2 end }//case 2 end
break; break;
case 3: case 3:
...@@ -542,6 +590,7 @@ public class PerkClaimIC extends ValidatorEJB implements PerkClaimICLocal, PerkC ...@@ -542,6 +590,7 @@ public class PerkClaimIC extends ValidatorEJB implements PerkClaimICLocal, PerkC
{ {
System.out.println("Exception in PerlClaimIc == >"); System.out.println("Exception in PerlClaimIc == >");
e.printStackTrace(); e.printStackTrace();
throw new ITMException(e);
} }
finally finally
{ {
...@@ -661,6 +710,7 @@ public class PerkClaimIC extends ValidatorEJB implements PerkClaimICLocal, PerkC ...@@ -661,6 +710,7 @@ public class PerkClaimIC extends ValidatorEJB implements PerkClaimICLocal, PerkC
{ {
System.out.println ( "Exception : PerlClaimIc:defaul_ItemChanged(String,String):" + e.getMessage() + ":" ); System.out.println ( "Exception : PerlClaimIc:defaul_ItemChanged(String,String):" + e.getMessage() + ":" );
errString = genericUtility.createErrorString(e); errString = genericUtility.createErrorString(e);
throw new ITMException(e);
} }
System.out.println ( "returning from PerlClaimIc default_Itemchanged" ); System.out.println ( "returning from PerlClaimIc default_Itemchanged" );
return errString; return errString;
...@@ -688,6 +738,7 @@ public class PerkClaimIC extends ValidatorEJB implements PerkClaimICLocal, PerkC ...@@ -688,6 +738,7 @@ public class PerkClaimIC extends ValidatorEJB implements PerkClaimICLocal, PerkC
catch (Exception e) catch (Exception e)
{ {
e.printStackTrace(); e.printStackTrace();
throw new ITMException(e);
} }
return retValue; return retValue;
...@@ -723,7 +774,6 @@ public class PerkClaimIC extends ValidatorEJB implements PerkClaimICLocal, PerkC ...@@ -723,7 +774,6 @@ public class PerkClaimIC extends ValidatorEJB implements PerkClaimICLocal, PerkC
System.out.println("hello:"); System.out.println("hello:");
GenericUtility genericUtility = GenericUtility.getInstance(); GenericUtility genericUtility = GenericUtility.getInstance();
SimpleDateFormat simpleDateFormat = null;
AdmCommon admCommon = new AdmCommon(); AdmCommon admCommon = new AdmCommon();
try try
{ {
...@@ -733,7 +783,6 @@ public class PerkClaimIC extends ValidatorEJB implements PerkClaimICLocal, PerkC ...@@ -733,7 +783,6 @@ public class PerkClaimIC extends ValidatorEJB implements PerkClaimICLocal, PerkC
//DateFormat dateFormat = new SimpleDateFormat(genericUtility.getApplDateFormat()); //DateFormat dateFormat = new SimpleDateFormat(genericUtility.getApplDateFormat());
//String dbDateFormat = genericUtility.getDBDateFormat(); //String dbDateFormat = genericUtility.getDBDateFormat();
String applDateFormat = genericUtility.getApplDateFormat(); String applDateFormat = genericUtility.getApplDateFormat();
simpleDateFormat = new SimpleDateFormat("dd/MM/yy");
SimpleDateFormat sdf = new SimpleDateFormat(applDateFormat); SimpleDateFormat sdf = new SimpleDateFormat(applDateFormat);
ConnDriver connDriver = null; ConnDriver connDriver = null;
...@@ -789,28 +838,29 @@ public class PerkClaimIC extends ValidatorEJB implements PerkClaimICLocal, PerkC ...@@ -789,28 +838,29 @@ public class PerkClaimIC extends ValidatorEJB implements PerkClaimICLocal, PerkC
valueXmlString.append( "<chg_date><![CDATA[" ).append( currDateStr ).append( "]]></chg_date>\r\n" ); valueXmlString.append( "<chg_date><![CDATA[" ).append( currDateStr ).append( "]]></chg_date>\r\n" );
valueXmlString.append( "<chg_term><![CDATA[" ).append( chgTerm ).append( "]]></chg_term>\r\n" ); valueXmlString.append( "<chg_term><![CDATA[" ).append( chgTerm ).append( "]]></chg_term>\r\n" );
*/ */
valueXmlString.append("<claim_date><![CDATA["+ sdf.format(new java.util.Date()).toString() +"]]></claim_date>");
} }
else if( currentColumn.trim().equalsIgnoreCase( "emp_code" ) ) else if( currentColumn.trim().equalsIgnoreCase( "emp_code" ) )
{ {
empCode = genericUtility.getColumnValue("emp_code",currDom); empCode = checkNull(genericUtility.getColumnValue("emp_code",currDom));
valueXmlString.append( "<emp_code><![CDATA[" ).append( empCode ).append( "]]></emp_code>\r\n" ); valueXmlString.append( "<emp_code><![CDATA[" ).append( empCode ).append( "]]></emp_code>\r\n" );
empCode = genericUtility.getColumnValue("claim_date",currDom); empCode = checkNull(genericUtility.getColumnValue("claim_date",currDom));
valueXmlString.append( "<claim_date><![CDATA[" ).append( empCode ).append( "]]></claim_date>\r\n" ); valueXmlString.append( "<claim_date><![CDATA[" ).append( empCode ).append( "]]></claim_date>\r\n" );
adCode = genericUtility.getColumnValue("ad_code",currDom); adCode = checkNull(genericUtility.getColumnValue("ad_code",currDom));
valueXmlString.append( "<ad_code><![CDATA[" ).append( adCode ).append( "]]></ad_code>\r\n" ); valueXmlString.append( "<ad_code><![CDATA[" ).append( adCode ).append( "]]></ad_code>\r\n" );
adjLoan= genericUtility.getColumnValue("adjust_loan",currDom); adjLoan= checkNull(genericUtility.getColumnValue("adjust_loan",currDom));
valueXmlString.append( "<adjust_loan><![CDATA[" ).append( adjLoan ).append( "]]></adjust_loan>\r\n" ); valueXmlString.append( "<adjust_loan><![CDATA[" ).append( adjLoan ).append( "]]></adjust_loan>\r\n" );
fullAmt = genericUtility.getColumnValue("full_amt",currDom); fullAmt = checkNull(genericUtility.getColumnValue("full_amt",currDom));
valueXmlString.append( "<full_amt><![CDATA[" ).append( fullAmt ).append( "]]></full_amt>\r\n" ); valueXmlString.append( "<full_amt><![CDATA[" ).append( fullAmt ).append( "]]></full_amt>\r\n" );
payrollVoucher = genericUtility.getColumnValue("payroll_voucher",currDom); payrollVoucher = checkNull(genericUtility.getColumnValue("payroll_voucher",currDom));
valueXmlString.append( "<payroll_voucher><![CDATA[" ).append( payrollVoucher ).append( "]]></payroll_voucher>\r\n" ); valueXmlString.append( "<payroll_voucher><![CDATA[" ).append( payrollVoucher ).append( "]]></payroll_voucher>\r\n" );
payrollPrd = genericUtility.getColumnValue("payroll_prd",currDom); payrollPrd = checkNull(genericUtility.getColumnValue("payroll_prd",currDom));
valueXmlString.append( "<payroll_prd><![CDATA[" ).append( payrollPrd ).append( "]]></payroll_prd>\r\n" ); valueXmlString.append( "<payroll_prd><![CDATA[" ).append( payrollPrd ).append( "]]></payroll_prd>\r\n" );
bankCode = genericUtility.getColumnValue("bank_code",currDom); bankCode = checkNull(genericUtility.getColumnValue("bank_code",currDom));
valueXmlString.append( "<bank_code><![CDATA[" ).append( bankCode ).append( "]]></bank_code>\r\n" ); valueXmlString.append( "<bank_code><![CDATA[" ).append( bankCode ).append( "]]></bank_code>\r\n" );
payMode = genericUtility.getColumnValue("pay_mode",currDom); payMode = checkNull(genericUtility.getColumnValue("pay_mode",currDom));
valueXmlString.append( "<pay_mode><![CDATA[" ).append( payMode ).append( "]]></pay_mode>\r\n" ); valueXmlString.append( "<pay_mode><![CDATA[" ).append( payMode ).append( "]]></pay_mode>\r\n" );
adDescr = genericUtility.getColumnValue("ad_descr",currDom); adDescr = checkNull(genericUtility.getColumnValue("ad_descr",currDom));
valueXmlString.append( "<ad_descr><![CDATA[" ).append( adDescr ).append( "]]></ad_descr>\r\n" ); valueXmlString.append( "<ad_descr><![CDATA[" ).append( adDescr ).append( "]]></ad_descr>\r\n" );
descr = ""; descr = "";
...@@ -831,25 +881,25 @@ public class PerkClaimIC extends ValidatorEJB implements PerkClaimICLocal, PerkC ...@@ -831,25 +881,25 @@ public class PerkClaimIC extends ValidatorEJB implements PerkClaimICLocal, PerkC
} }
else if( currentColumn.trim().equalsIgnoreCase( "ad_code" ) ) else if( currentColumn.trim().equalsIgnoreCase( "ad_code" ) )
{ {
empCode = genericUtility.getColumnValue("emp_code",currDom); empCode = checkNull(genericUtility.getColumnValue("emp_code",currDom));
valueXmlString.append( "<emp_code><![CDATA[" ).append( empCode ).append( "]]></emp_code>\r\n" ); valueXmlString.append( "<emp_code><![CDATA[" ).append( empCode ).append( "]]></emp_code>\r\n" );
empCode = genericUtility.getColumnValue("claim_date",currDom); empCode = checkNull(genericUtility.getColumnValue("claim_date",currDom));
valueXmlString.append( "<claim_date><![CDATA[" ).append( empCode ).append( "]]></claim_date>\r\n" ); valueXmlString.append( "<claim_date><![CDATA[" ).append( empCode ).append( "]]></claim_date>\r\n" );
adCode = genericUtility.getColumnValue("ad_code",currDom); adCode = checkNull(genericUtility.getColumnValue("ad_code",currDom));
valueXmlString.append( "<ad_code><![CDATA[" ).append( adCode ).append( "]]></ad_code>\r\n" ); valueXmlString.append( "<ad_code><![CDATA[" ).append( adCode ).append( "]]></ad_code>\r\n" );
adjLoan= genericUtility.getColumnValue("adjust_loan",currDom); adjLoan= checkNull(genericUtility.getColumnValue("adjust_loan",currDom));
valueXmlString.append( "<adjust_loan><![CDATA[" ).append( adjLoan ).append( "]]></adjust_loan>\r\n" ); valueXmlString.append( "<adjust_loan><![CDATA[" ).append( adjLoan ).append( "]]></adjust_loan>\r\n" );
fullAmt = genericUtility.getColumnValue("full_amt",currDom); fullAmt = checkNull(genericUtility.getColumnValue("full_amt",currDom));
valueXmlString.append( "<full_amt><![CDATA[" ).append( fullAmt ).append( "]]></full_amt>\r\n" ); valueXmlString.append( "<full_amt><![CDATA[" ).append( fullAmt ).append( "]]></full_amt>\r\n" );
payrollVoucher = genericUtility.getColumnValue("payroll_voucher",currDom); payrollVoucher = checkNull(genericUtility.getColumnValue("payroll_voucher",currDom));
valueXmlString.append( "<payroll_voucher><![CDATA[" ).append( payrollVoucher ).append( "]]></payroll_voucher>\r\n" ); valueXmlString.append( "<payroll_voucher><![CDATA[" ).append( payrollVoucher ).append( "]]></payroll_voucher>\r\n" );
payrollPrd = genericUtility.getColumnValue("payroll_prd",currDom); payrollPrd = checkNull(genericUtility.getColumnValue("payroll_prd",currDom));
valueXmlString.append( "<payroll_prd><![CDATA[" ).append( payrollPrd ).append( "]]></payroll_prd>\r\n" ); valueXmlString.append( "<payroll_prd><![CDATA[" ).append( payrollPrd ).append( "]]></payroll_prd>\r\n" );
bankCode = genericUtility.getColumnValue("bank_code",currDom); bankCode = checkNull(genericUtility.getColumnValue("bank_code",currDom));
valueXmlString.append( "<bank_code><![CDATA[" ).append( bankCode ).append( "]]></bank_code>\r\n" ); valueXmlString.append( "<bank_code><![CDATA[" ).append( bankCode ).append( "]]></bank_code>\r\n" );
payMode = genericUtility.getColumnValue("pay_mode",currDom); payMode = checkNull(genericUtility.getColumnValue("pay_mode",currDom));
valueXmlString.append( "<pay_mode><![CDATA[" ).append( payMode ).append( "]]></pay_mode>\r\n" ); valueXmlString.append( "<pay_mode><![CDATA[" ).append( payMode ).append( "]]></pay_mode>\r\n" );
descr = genericUtility.getColumnValue("emp_name",currDom); descr = checkNull(genericUtility.getColumnValue("emp_name",currDom));
valueXmlString.append( "<emp_name><![CDATA[" ).append( descr ).append( "]]></emp_name>\r\n" ); valueXmlString.append( "<emp_name><![CDATA[" ).append( descr ).append( "]]></emp_name>\r\n" );
adDescr = ""; adDescr = "";
...@@ -866,7 +916,57 @@ public class PerkClaimIC extends ValidatorEJB implements PerkClaimICLocal, PerkC ...@@ -866,7 +916,57 @@ public class PerkClaimIC extends ValidatorEJB implements PerkClaimICLocal, PerkC
rs.close();rs = null; rs.close();rs = null;
pstmt.close();pstmt = null; pstmt.close();pstmt = null;
valueXmlString.append( "<ad_descr><![CDATA[" ).append( adDescr ).append( "]]></ad_descr>\r\n" ); valueXmlString.append( "<ad_descr><![CDATA[" ).append( adDescr ).append( "]]></ad_descr>\r\n" );
} }//end ad_code
else if( currentColumn.trim().equalsIgnoreCase( "payroll_voucher" ) )
{
empCode = checkNull(genericUtility.getColumnValue("emp_code",currDom));
valueXmlString.append( "<emp_code><![CDATA[" ).append( empCode ).append( "]]></emp_code>\r\n" );
empCode = checkNull(genericUtility.getColumnValue("claim_date",currDom));
valueXmlString.append( "<claim_date><![CDATA[" ).append( empCode ).append( "]]></claim_date>\r\n" );
adCode = checkNull(genericUtility.getColumnValue("ad_code",currDom));
valueXmlString.append( "<ad_code><![CDATA[" ).append( adCode ).append( "]]></ad_code>\r\n" );
adjLoan= checkNull(genericUtility.getColumnValue("adjust_loan",currDom));
valueXmlString.append( "<adjust_loan><![CDATA[" ).append( adjLoan ).append( "]]></adjust_loan>\r\n" );
fullAmt = checkNull(genericUtility.getColumnValue("full_amt",currDom));
valueXmlString.append( "<full_amt><![CDATA[" ).append( fullAmt ).append( "]]></full_amt>\r\n" );
bankCode = checkNull(genericUtility.getColumnValue("bank_code",currDom));
valueXmlString.append( "<bank_code><![CDATA[" ).append( bankCode ).append( "]]></bank_code>\r\n" );
payMode = checkNull(genericUtility.getColumnValue("pay_mode",currDom));
valueXmlString.append( "<pay_mode><![CDATA[" ).append( payMode ).append( "]]></pay_mode>\r\n" );
descr = checkNull(genericUtility.getColumnValue("emp_name",currDom));
valueXmlString.append( "<emp_name><![CDATA[" ).append( descr ).append( "]]></emp_name>\r\n" );
adDescr = "";
adCode = genericUtility.getColumnValue("ad_code",currDom);
sql = " select descr from allwdedn where ad_code = ? ";
System.out.println("adCode ="+adCode);
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, adCode);
rs = pstmt.executeQuery();
if( rs.next() )
{
adDescr = checkNull(rs.getString("descr"));
}
rs.close();rs = null;
pstmt.close();pstmt = null;
valueXmlString.append( "<ad_descr><![CDATA[" ).append( adDescr ).append( "]]></ad_descr>\r\n" );
payrollVoucher = checkNull(genericUtility.getColumnValue("payroll_voucher",currDom));
payrollPrd = checkNull(genericUtility.getColumnValue("payroll_prd",currDom));
if("V".equalsIgnoreCase(payrollVoucher))
{
valueXmlString.append( "<payroll_prd protect = '1'><![CDATA[" ).append( "" ).append( "]]></payroll_prd>\r\n" );
}
else
{
valueXmlString.append( "<payroll_prd protect = '0'><![CDATA[" ).append( payrollPrd ).append( "]]></payroll_prd>\r\n" );
}
valueXmlString.append( "<payroll_voucher><![CDATA[" ).append( payrollVoucher ).append( "]]></payroll_voucher>\r\n" );
}//end payroll_voucher
valueXmlString.append("</Detail1>\r\n"); valueXmlString.append("</Detail1>\r\n");
}//case 1 end here }//case 1 end here
break; break;
...@@ -890,7 +990,7 @@ public class PerkClaimIC extends ValidatorEJB implements PerkClaimICLocal, PerkC ...@@ -890,7 +990,7 @@ public class PerkClaimIC extends ValidatorEJB implements PerkClaimICLocal, PerkC
} }
else else
{ {
claimDate = simpleDateFormat.parse(genericUtility.getColumnValue("claim_date", hdrDom)); claimDate = sdf.parse(genericUtility.getColumnValue("claim_date", hdrDom));
} }
System.out.println("claimDate="+claimDate); System.out.println("claimDate="+claimDate);
if("Y".equalsIgnoreCase(adjLoan)) if("Y".equalsIgnoreCase(adjLoan))
...@@ -1015,8 +1115,8 @@ public class PerkClaimIC extends ValidatorEJB implements PerkClaimICLocal, PerkC ...@@ -1015,8 +1115,8 @@ public class PerkClaimIC extends ValidatorEJB implements PerkClaimICLocal, PerkC
domID++; domID++;
valueXmlString.append( "<Detail2 domID='"+ domID +"' selected=\"Y\">\r\n" ); valueXmlString.append( "<Detail2 domID='"+ domID +"' selected=\"N\">\r\n" );
valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\" />\r\n"); valueXmlString.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\" />\r\n");
valueXmlString.append( "<emp_code><![CDATA[" ).append( empCode ).append( "]]></emp_code>\r\n" ); valueXmlString.append( "<emp_code><![CDATA[" ).append( empCode ).append( "]]></emp_code>\r\n" );
valueXmlString.append( "<emp_fname><![CDATA[" ).append( fName).append( "]]></emp_fname>\r\n" ); valueXmlString.append( "<emp_fname><![CDATA[" ).append( fName).append( "]]></emp_fname>\r\n" );
valueXmlString.append( "<emp_lname><![CDATA[" ).append( lName).append( "]]></emp_lname>\r\n" ); valueXmlString.append( "<emp_lname><![CDATA[" ).append( lName).append( "]]></emp_lname>\r\n" );
...@@ -1054,7 +1154,7 @@ public class PerkClaimIC extends ValidatorEJB implements PerkClaimICLocal, PerkC ...@@ -1054,7 +1154,7 @@ public class PerkClaimIC extends ValidatorEJB implements PerkClaimICLocal, PerkC
} }
else else
{ {
claimDate = simpleDateFormat.parse(genericUtility.getColumnValue("claim_date", hdrDom)); claimDate = sdf.parse(genericUtility.getColumnValue("claim_date", hdrDom));
} }
parentNodeList = allDom.getElementsByTagName("Detail2"); parentNodeList = allDom.getElementsByTagName("Detail2");
parentNodeListLength = parentNodeList.getLength(); parentNodeListLength = parentNodeList.getLength();
...@@ -1214,6 +1314,7 @@ public class PerkClaimIC extends ValidatorEJB implements PerkClaimICLocal, PerkC ...@@ -1214,6 +1314,7 @@ public class PerkClaimIC extends ValidatorEJB implements PerkClaimICLocal, PerkC
{ {
System.out.println( "Exception :PerlClaimIc :default_ItemChanged(Document,String):" + e.getMessage() + ":" ); System.out.println( "Exception :PerlClaimIc :default_ItemChanged(Document,String):" + e.getMessage() + ":" );
valueXmlString = valueXmlString.append( genericUtility.createErrorString( e ) ); valueXmlString = valueXmlString.append( genericUtility.createErrorString( e ) );
throw new ITMException(e);
} }
finally finally
{ {
......
webitm-adm/ibase/webitm/ejb/adm/PerkClaimPos.java
View file @ 00b69fc3
...@@ -42,7 +42,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -42,7 +42,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
String errString = ""; String errString = "";
String sql = ""; String sql = "";
String empCode = "", adCode = "" , paySite = "" , bankCodeHdr = ""; String empCode = "", adCode = "" , paySite = "" , bankCodeHdr = "";
String payrollVoucher = "" , payrollPrd = "",envVar = "",mounth = ""; String payrollVoucher = "" , payrollPrd = "",envVar = "",mounth = "",fullAmt = "";
String finEntity = "",deptCode = "", payMode = "", payModeHdr = "",currCode = "",bankCode = ""; String finEntity = "",deptCode = "", payMode = "", payModeHdr = "",currCode = "",bankCode = "";
String acctCode = "" , cctrCode = ""; String acctCode = "" , cctrCode = "";
String refNo = "",schemeNo = "",loanAdCode = "" ; String refNo = "",schemeNo = "",loanAdCode = "" ;
...@@ -97,28 +97,11 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -97,28 +97,11 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
errString = itmDBAccess.getErrorString("","VTNOSEL","","",conn); errString = itmDBAccess.getErrorString("","VTNOSEL","","",conn);
return errString; return errString;
} }
///To check for previous pending claims
for(int ctr = 0; ctr < parentNodeListLength ; ctr++ )
{
System.out.println("TEST LENGTH="+parentNodeListLength);
parentNode = parentNodeList.item(ctr);
//Element parentNode1 = (Element)parentNodeList.item(ctr);
//String selected = parentNode1.getAttribute("selected");//change by Kunal on 31/08/12
claimAmount = Double.parseDouble(genericUtility.getColumnValue("claim_amt", dom, "2")== null?"0":genericUtility.getColumnValue("claim_amt", dom, "2"));
balAmount = Double.parseDouble(genericUtility.getColumnValue("amt_bal", dom, "2")== null?"0":genericUtility.getColumnValue("amt_bal", dom, "2"));
if(balAmount != claimAmount)
{
errString = itmDBAccess.getErrorString("","VTPERK1","","",conn);
return errString;
}
}
payrollVoucher = genericUtility.getColumnValue("payroll_voucher", dom); payrollVoucher = genericUtility.getColumnValue("payroll_voucher", dom);
payrollPrd = checkNull(genericUtility.getColumnValue("payroll_prd", dom)); payrollPrd = checkNull(genericUtility.getColumnValue("payroll_prd", dom));
empCode = genericUtility.getColumnValue("emp_code", dom); empCode = genericUtility.getColumnValue("emp_code", dom);
adCode = checkNull(genericUtility.getColumnValue("ad_code", dom)); adCode = checkNull(genericUtility.getColumnValue("ad_code", dom));
fullAmt = checkNull(genericUtility.getColumnValue("full_amt", dom));
if(genericUtility.getColumnValue("claim_date", dom) == null) if(genericUtility.getColumnValue("claim_date", dom) == null)
{ {
claimDate = null; claimDate = null;
...@@ -128,12 +111,38 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -128,12 +111,38 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
claimDate = sdf.parse(genericUtility.getColumnValue("claim_date", dom)); claimDate = sdf.parse(genericUtility.getColumnValue("claim_date", dom));
} }
System.out.println(payrollVoucher+" "+payrollPrd+" "+empCode+" "+adCode+" "+claimDate ); System.out.println(payrollVoucher+" "+payrollPrd+" "+empCode+" "+adCode+" "+claimDate+" "+fullAmt );
///To check for previous pending claims
for(int ctr = 0; ctr < parentNodeListLength ; ctr++ )
{
System.out.println("TEST LENGTH="+parentNodeListLength);
parentNode = parentNodeList.item(ctr);
//Element parentNode1 = (Element)parentNodeList.item(ctr);
//String selected = parentNode1.getAttribute("selected");//change by Kunal on 31/08/12
//claimAmount = Double.parseDouble(genericUtility.getColumnValue("claim_amt", dom, "2")== null?"0":genericUtility.getColumnValue("claim_amt", dom, "2"));
claimAmount = Double.parseDouble(genericUtility.getColumnValueFromNode( "claim_amt", parentNodeList.item(ctr) )== null?"0":genericUtility.getColumnValueFromNode( "claim_amt", parentNodeList.item(ctr) ));
balAmount = Double.parseDouble(genericUtility.getColumnValueFromNode( "amt_bal", parentNodeList.item(ctr) )== null?"0":genericUtility.getColumnValueFromNode( "amt_bal", parentNodeList.item(ctr) ));
//balAmount = Double.parseDouble(genericUtility.getColumnValue("amt_bal", dom, "2")== null?"0":genericUtility.getColumnValue("amt_bal", dom, "2"));
if("Y".equalsIgnoreCase(fullAmt))
{
if(balAmount != claimAmount)
{
errString = itmDBAccess.getErrorString("","VTPERK1","","",conn);
return errString;
}
}
}
if(payrollPrd != null && payrollPrd.trim().length() >= 6) if(payrollPrd != null && payrollPrd.trim().length() >= 6)
{ {
mounth = payrollPrd.trim().substring(4,5); mounth = payrollPrd.trim().substring(4,6);
} }
System.out.println("mounth==="+mounth);
if("P".equalsIgnoreCase(payrollVoucher)) if("P".equalsIgnoreCase(payrollVoucher))
{ {
envVar = admCommon.getEnv("999999", adCode.trim()+"_CLAIMAD", conn); envVar = admCommon.getEnv("999999", adCode.trim()+"_CLAIMAD", conn);
...@@ -147,12 +156,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -147,12 +156,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, payrollPrd); pstmt.setString(1, payrollPrd);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs == null) if(rs.next())
{
errString = itmDBAccess.getErrorString("","DS000","","",conn);
return errString;
}
else if(rs.next())
{ {
frDate = rs.getTimestamp("fr_date"); frDate = rs.getTimestamp("fr_date");
toDate = rs.getTimestamp("to_date"); toDate = rs.getTimestamp("to_date");
...@@ -162,12 +166,8 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -162,12 +166,8 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
if(payrollPrd != null)
{
mounth = payrollPrd.trim().substring(4,5);
}
sql = " select key_string from transetup where upper(tran_window) = 'W_LOAN_RECO' "; /*sql = " select key_string from transetup where upper(tran_window) = 'W_LOAN_RECO' ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs == null) if(rs == null)
...@@ -179,7 +179,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -179,7 +179,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
*/
parentNodeList = dom.getElementsByTagName("Detail2"); parentNodeList = dom.getElementsByTagName("Detail2");
parentNodeListLength = parentNodeList.getLength(); parentNodeListLength = parentNodeList.getLength();
double claimTotalAmt = 0.0; double claimTotalAmt = 0.0;
...@@ -187,9 +187,10 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -187,9 +187,10 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
for(int ctr = 0; ctr < parentNodeListLength ; ctr++ ) for(int ctr = 0; ctr < parentNodeListLength ; ctr++ )
{ {
System.out.println("TEST LENGTH="+parentNodeListLength); System.out.println("TEST LENGTH="+parentNodeListLength);
parentNode = parentNodeList.item(ctr); //parentNode = parentNodeList.item(ctr);
//Element parentNode1 = (Element)parentNodeList.item(ctr); //Element parentNode1 = (Element)parentNodeList.item(ctr);
claimAmount = Double.parseDouble(genericUtility.getColumnValue("claim_amt", dom, "2")== null?"0":genericUtility.getColumnValue("claim_amt", dom, "2")); //claimAmount = Double.parseDouble(genericUtility.getColumnValue("claim_amt", dom, "2")== null?"0":genericUtility.getColumnValue("claim_amt", dom, "2"));
claimAmount = Double.parseDouble(genericUtility.getColumnValueFromNode( "claim_amt", parentNodeList.item(ctr) )== null?"0":genericUtility.getColumnValueFromNode( "claim_amt", parentNodeList.item(ctr) ));
System.out.println("claimAmount="+claimAmount); System.out.println("claimAmount="+claimAmount);
claimTotalAmt = claimTotalAmt + claimAmount; claimTotalAmt = claimTotalAmt + claimAmount;
} }
...@@ -223,12 +224,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -223,12 +224,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, empCode); pstmt.setString(1, empCode);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs == null) if(rs.next())
{
errString = itmDBAccess.getErrorString("","DS000","","",conn);
return errString;
}
else if(rs.next())
{ {
paySite = checkNull(rs.getString("pay_site")); paySite = checkNull(rs.getString("pay_site"));
finEntity = checkNull(rs.getString("fin_entity")); finEntity = checkNull(rs.getString("fin_entity"));
...@@ -253,7 +249,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -253,7 +249,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
payMode = payModeHdr; payMode = payModeHdr;
} }
sql = " select key_string from transetup where upper(tran_window) ='T_EMP_ADCLAIM'"; /*sql = " select key_string from transetup where upper(tran_window) ='T_EMP_ADCLAIM'";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs == null) if(rs == null)
...@@ -264,8 +260,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -264,8 +260,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;*/
currDate = new java.sql.Timestamp(System.currentTimeMillis()); currDate = new java.sql.Timestamp(System.currentTimeMillis());
userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode"); userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode");
...@@ -356,7 +351,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -356,7 +351,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
pstmt.setTimestamp(7, currDate); pstmt.setTimestamp(7, currDate);
pstmt.setString(8, userId); pstmt.setString(8, userId);
pstmt.setString(9, chgTerm); pstmt.setString(9, chgTerm);
pstmt.setString(9, tranIdGenerate); pstmt.setString(10, tranIdGenerate);
noRowInst = pstmt.executeUpdate(); noRowInst = pstmt.executeUpdate();
System.out.println("no of row inserted employee_mthad = "+noRowInst); System.out.println("no of row inserted employee_mthad = "+noRowInst);
pstmt.close(); pstmt.close();
...@@ -410,10 +405,10 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -410,10 +405,10 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
payHdr.put("acct_code__pay",acctCode); payHdr.put("acct_code__pay",acctCode);
payHdr.put("cctr_code__pay",cctrCode); payHdr.put("cctr_code__pay",cctrCode);
payHdr.put("pay_mode",payMode); payHdr.put("pay_mode",payMode);
payHdr.put("batch_no",paySite+envVar); payHdr.put("batch_no",paySite+" ");
payHdr.put("vouch_type","O"); payHdr.put("vouch_type","O");
payHdr.put("curr_code",currCode); payHdr.put("curr_code",currCode);
payHdr.put("exch_rate",1); payHdr.put("exch_rate",1.0);
payHdr.put("remarks","Through claim, " + envVar + " , on " + claimDate.toString()); payHdr.put("remarks","Through claim, " + envVar + " , on " + claimDate.toString());
payHdr.put("chg_date",currDate); payHdr.put("chg_date",currDate);
payHdr.put("chg_user",userId); payHdr.put("chg_user",userId);
...@@ -426,26 +421,29 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -426,26 +421,29 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
for(int ctr = 0; ctr < parentNodeListLength ; ctr++ ) for(int ctr = 0; ctr < parentNodeListLength ; ctr++ )
{ {
//parse Detail2 start //parse Detail2 start
System.out.println("TEST LENGTH="+parentNodeListLength); System.out.println("TEST LENGTH Detail2 ="+parentNodeListLength);
parentNode = parentNodeList.item(ctr); //parentNode = parentNodeList.item(ctr);
claimAmount = Double.parseDouble(genericUtility.getColumnValue("claim_amt", dom, "2")== null?"0":genericUtility.getColumnValue("claim_amt", dom, "2")); //claimAmount = Double.parseDouble(genericUtility.getColumnValue("claim_amt", dom, "2")== null?"0":genericUtility.getColumnValue("claim_amt", dom, "2"));
balAmount = Double.parseDouble(genericUtility.getColumnValue("amt_bal", dom, "2")== null?"0":genericUtility.getColumnValue("amt_bal", dom, "2")); claimAmount = Double.parseDouble(genericUtility.getColumnValueFromNode( "claim_amt", parentNodeList.item(ctr) )== null?"0":genericUtility.getColumnValueFromNode( "claim_amt", parentNodeList.item(ctr) ));
if(genericUtility.getColumnValue("start_date", dom, "2") == null) balAmount = Double.parseDouble(genericUtility.getColumnValueFromNode( "amt_bal", parentNodeList.item(ctr) )== null?"0":genericUtility.getColumnValueFromNode( "amt_bal", parentNodeList.item(ctr) ));
//balAmount = Double.parseDouble(genericUtility.getColumnValue("amt_bal", dom, "2")== null?"0":genericUtility.getColumnValue("amt_bal", dom, "2"));
if(genericUtility.getColumnValueFromNode( "start_date", parentNodeList.item(ctr) ) == null)
{ {
startDate = null; startDate = null;
} }
else else
{ {
startDate = simpleDateFormat.parse(genericUtility.getColumnValue("start_date", dom, "2")); startDate = simpleDateFormat.parse(genericUtility.getColumnValueFromNode( "start_date", parentNodeList.item(ctr) ));
} }
if(genericUtility.getColumnValue("end_date", dom, "2") == null) if(genericUtility.getColumnValueFromNode( "end_date", parentNodeList.item(ctr) ) == null)
{ {
endDate = null; endDate = null;
} }
else else
{ {
endDate = simpleDateFormat.parse(genericUtility.getColumnValue("end_date", dom, "2")); endDate = simpleDateFormat.parse(genericUtility.getColumnValueFromNode( "end_date", parentNodeList.item(ctr) ));
} }
System.out.println("457 "+claimAmount+" "+balAmount+" "+startDate+" "+endDate);
//ls_errcode = nvo_claimproc.gbf_claim_proc(ls_ad ,ls_emp ,ld_start,ld_end ,lc_claimamt) //ls_errcode = nvo_claimproc.gbf_claim_proc(ls_ad ,ls_emp ,ld_start,ld_end ,lc_claimamt)
sql = " update allowdedn_bal set amt_bal = amt_bal - ? ,amt_adj = amt_adj + ? " sql = " update allowdedn_bal set amt_bal = amt_bal - ? ,amt_adj = amt_adj + ? "
+" where emp_code = ? and ad_code = ? and start_date = ? and end_date = ? "; +" where emp_code = ? and ad_code = ? and start_date = ? and end_date = ? ";
...@@ -470,8 +468,6 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -470,8 +468,6 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
pstmt.setDate(4,startDate ==null?null: new java.sql.Date(startDate.getTime())); pstmt.setDate(4,startDate ==null?null: new java.sql.Date(startDate.getTime()));
pstmt.setDouble(5,balAmount ); pstmt.setDouble(5,balAmount );
pstmt.setDouble(6,claimAmount ); pstmt.setDouble(6,claimAmount );
pstmt.setDate(6,endDate ==null?null: new java.sql.Date(endDate.getTime()));
noRowInst = pstmt.executeUpdate(); noRowInst = pstmt.executeUpdate();
System.out.println("no of row inserted emp_adclaim= "+noRowInst); System.out.println("no of row inserted emp_adclaim= "+noRowInst);
pstmt.close(); pstmt.close();
...@@ -493,7 +489,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -493,7 +489,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
pstmt.close(); pstmt.close();
pstmt = null;*/ pstmt = null;*/
payDet = new HashMap(); payDet = new HashMap();
payDet.put("amount", claimDate); payDet.put("amount", claimAmount);
payDet.put("ad_code", adCode); payDet.put("ad_code", adCode);
payDetList.add(payDet); payDetList.add(payDet);
...@@ -506,7 +502,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -506,7 +502,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
for(int ctr = 0; ctr < parentNodeListLength ; ctr++ ) for(int ctr = 0; ctr < parentNodeListLength ; ctr++ )
{ {
//parse Detail3 start //parse Detail3 start
System.out.println("TEST LENGTH="+parentNodeListLength); System.out.println("TEST LENGTH LOAN=="+parentNodeListLength);
parentNode = parentNodeList.item(ctr); parentNode = parentNodeList.item(ctr);
...@@ -563,11 +559,11 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -563,11 +559,11 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
//issue //issue
tranIdForLoan = generateTranId( "w_loan_reco", paySite, claimDateStr, conn ); tranIdForLoan = generateTranId( "w_loan_reco", paySite, claimDateStr, conn );
System.out.println("tranIdGenerate for Loan Reco = "+tranIdForLoan); System.out.println("tranIdGenerate for Loan Reco = "+tranIdForLoan);
if(tranIdForLoan == null || tranIdForLoan.trim().length() == 0) /*if(tranIdForLoan == null || tranIdForLoan.trim().length() == 0)
{ {
errString = itmDBAccess.getErrorString("","VTTRANID","","",conn); errString = itmDBAccess.getErrorString("","VTTRANID","","",conn);
return errString; return errString;
} }*/
sql = "insert into loan_reco (reco_no, reco_date, loan_no, scheme_no, emp_code," sql = "insert into loan_reco (reco_no, reco_date, loan_no, scheme_no, emp_code,"
+" start_date, loan_amt, loan_interest, mon_inst, ad_code, reco_amt, chg_date, chg_user, chg_term, remarks, confirmed)" +" start_date, loan_amt, loan_interest, mon_inst, ad_code, reco_amt, chg_date, chg_user, chg_term, remarks, confirmed)"
...@@ -604,6 +600,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -604,6 +600,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
errString = itmDBAccess.getErrorString("","VMDLOANRECO","","",conn); errString = itmDBAccess.getErrorString("","VMDLOANRECO","","",conn);
return errString; return errString;
} }
}//parse Detail3 end Loan
/*else issue /*else issue
if dw_loan_reco.update() <> 1 then if dw_loan_reco.update() <> 1 then
ls_errcode = "DS000" + string(sqlca.sqldbcode) +'~t Error updating Loan_reco from employee : '+ls_emp ls_errcode = "DS000" + string(sqlca.sqldbcode) +'~t Error updating Loan_reco from employee : '+ls_emp
...@@ -614,6 +611,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -614,6 +611,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
{ {
//ls_errcode = gf_payroll_voucher(s_payr_hdr, dw_payrv_det, 'dw_claim') //ls_errcode = gf_payroll_voucher(s_payr_hdr, dw_payrv_det, 'dw_claim')
errString = payrollVoucher(payHdr,payDetList, "dw_claim",xtraParams,conn); errString = payrollVoucher(payHdr,payDetList, "dw_claim",xtraParams,conn);
System.out.println("614"+errString);
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ {
return errString; return errString;
...@@ -726,7 +724,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -726,7 +724,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
end if end if
//end code for edi //end code for edi
*/ */
}//parse Detail3 end
...@@ -747,6 +745,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -747,6 +745,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
catch (Exception e1) catch (Exception e1)
{ {
e1.printStackTrace(); e1.printStackTrace();
throw new ITMException(e1);
} }
} }
finally finally
...@@ -775,8 +774,6 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -775,8 +774,6 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -915,6 +912,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -915,6 +912,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode"); userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode");
chgTerm = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "chgTerm" ); chgTerm = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "chgTerm" );
SimpleDateFormat sdfAppl = new SimpleDateFormat(genericUtility.getApplDateFormat()); SimpleDateFormat sdfAppl = new SimpleDateFormat(genericUtility.getApplDateFormat());
System.out.println("pay header=="+payHdr.toString());
tranDate = (Date)payHdr.get("tran_date"); tranDate = (Date)payHdr.get("tran_date");
totalAmt = (Double)payHdr.get("tot_amt"); totalAmt = (Double)payHdr.get("tot_amt");
exchRate = (Double)payHdr.get("exch_rate"); exchRate = (Double)payHdr.get("exch_rate");
...@@ -977,23 +975,18 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -977,23 +975,18 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
//do //do
//{ //{
sql = "select key_string from transetup where tran_window = ?"; /*sql = "select key_string from transetup where tran_window = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,winName); pstmt.setString(1,winName);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs == null) if(rs.next())
{
errString = itmDBAccess.getErrorString("","VTSEQ","","",conn);
return errString;
}
else
{ {
keyString = rs.getString("key_string") ; keyString = rs.getString("key_string") ;
} }
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;*/
sql = "select site_code__acct from site where site_code = ?"; sql = "select site_code__acct from site where site_code = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -1019,7 +1012,8 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -1019,7 +1012,8 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
} }
tranId = generateTranId(winName, siteCodeAcct, tranDateStr, conn); tranId = generateTranId(winName, siteCodeAcct, tranDateStr, conn);
if(tranId == null || tranId.trim().length() == 0) System.out.println("1026 tranId ="+tranId);
/*if(tranId == null || tranId.trim().length() == 0)
{ {
errString = itmDBAccess.getErrorString("","VTTRANID","","",conn); errString = itmDBAccess.getErrorString("","VTTRANID","","",conn);
return errString; return errString;
...@@ -1028,7 +1022,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -1028,7 +1022,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
{ {
errString = itmDBAccess.getErrorString("","VTTRANID","","",conn); errString = itmDBAccess.getErrorString("","VTTRANID","","",conn);
return errString; return errString;
} }*/
totalAmtbc = totalAmt*exchRate; totalAmtbc = totalAmt*exchRate;
errCode = nfCheckPeriod("ADM",tranDate,(String)payHdr.get("site_code")); errCode = nfCheckPeriod("ADM",tranDate,(String)payHdr.get("site_code"));
...@@ -1190,6 +1184,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -1190,6 +1184,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
{ {
payDet = new HashMap(); payDet = new HashMap();
payDet = (HashMap) payDetList.get(ctr); payDet = (HashMap) payDetList.get(ctr);
System.out.println("Pay Detail=="+payDet.toString());
adCode = (String)payDet.get("ad_code"); adCode = (String)payDet.get("ad_code");
...@@ -1883,12 +1878,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -1883,12 +1878,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
sql = "select ledg_post_conf from transetup where upper(tran_window) = 'W_PAYR_VOUCHER' "; sql = "select ledg_post_conf from transetup where upper(tran_window) = 'W_PAYR_VOUCHER' ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs == null) if(rs.next())
{
errString = itmDBAccess.getErrorString("","VTSEQ","","",conn);
return errString;
}
else if(rs.next())
{ {
ledgPostConf = checkNull(rs.getString("ledg_post_conf")); ledgPostConf = checkNull(rs.getString("ledg_post_conf"));
} }
...@@ -1915,6 +1905,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -1915,6 +1905,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
} }
//ls_errcode = gbf_post_payr_vou(lds_hdr.describe("datawindow.data"), lds_det.describe("datawindow.data"),ai_commit) //ls_errcode = gbf_post_payr_vou(lds_hdr.describe("datawindow.data"), lds_det.describe("datawindow.data"),ai_commit)
errString = gbfPostPayrVoucher(payVouchHdr,payVouchDetList,payVouchAdvList,xtraParams,conn); errString = gbfPostPayrVoucher(payVouchHdr,payVouchDetList,payVouchAdvList,xtraParams,conn);
System.out.println("1908"+errString);
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ {
return errString; return errString;
...@@ -1991,9 +1982,6 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -1991,9 +1982,6 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
cctrCodeHdr = (String)payVouchHdr.get("cctr_code__pay"); cctrCodeHdr = (String)payVouchHdr.get("cctr_code__pay");
remarks = "Transfer for HR related payment of " + empCode; remarks = "Transfer for HR related payment of " + empCode;
//ls_errcode = gbf_post_payr_vouhdr(as_tran_hdr) //ls_errcode = gbf_post_payr_vouhdr(as_tran_hdr)
errString = gbfPostPayrVoucherHdr(payVouchHdr,payVouchDetList,payVouchAdvList,xtraParams,conn); errString = gbfPostPayrVoucherHdr(payVouchHdr,payVouchDetList,payVouchAdvList,xtraParams,conn);
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
...@@ -2044,12 +2032,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -2044,12 +2032,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, siteCode); pstmt.setString(1, siteCode);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs == null) if(rs.next())
{
errString = itmDBAccess.getErrorString("","VMSITE","","",conn);
return errString;
}
else
{ {
finEntityFr = rs.getString("fin_entity"); finEntityFr = rs.getString("fin_entity");
} }
...@@ -2062,12 +2045,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -2062,12 +2045,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, siteCodePayment); pstmt.setString(1, siteCodePayment);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs == null) if(rs.next())
{
errString = itmDBAccess.getErrorString("","VMSITE","","",conn);
return errString;
}
else
{ {
finEntityTo = rs.getString("fin_entity"); finEntityTo = rs.getString("fin_entity");
} }
...@@ -2082,13 +2060,13 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -2082,13 +2060,13 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
pstmt.setString(1, siteCode); pstmt.setString(1, siteCode);
pstmt.setString(2, siteCodePayment); pstmt.setString(2, siteCodePayment);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs == null) if(rs.next())
{ {
errString = itmDBAccess.getErrorString("","VMSITE","","",conn); /*errString = itmDBAccess.getErrorString("","VMSITE","","",conn);
return errString; return errString;
} }
else else
{ {*/
linkType = rs.getString("link_type"); linkType = rs.getString("link_type");
acctCodePay = rs.getString("acct_code__pay"); acctCodePay = rs.getString("acct_code__pay");
cctrCodePay = rs.getString("cctr_code__pay"); cctrCodePay = rs.getString("cctr_code__pay");
...@@ -2107,7 +2085,6 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -2107,7 +2085,6 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
if (rs.next()) if (rs.next())
{ {
keyString = rs.getString("key_string"); keyString = rs.getString("key_string");
} }
rs.close();rs = null; rs.close();rs = null;
pstmt.close();pstmt = null; pstmt.close();pstmt = null;
...@@ -2129,7 +2106,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -2129,7 +2106,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
tranId = tg.generateTranSeqID("P-IBCA", "tran_id", keyString, conn); tranId = tg.generateTranSeqID("P-IBCA", "tran_id", keyString, conn);
//refNo = generateTranId( "t_miscpay_ref", siteCode, tranDateStr, conn ); //refNo = generateTranId( "t_miscpay_ref", siteCode, tranDateStr, conn );
System.out.println("tranIdGenerate for w_pay_ibca = "+tranId); System.out.println("tranIdGenerate for w_pay_ibca = "+tranId);
if(tranId == null || tranId.trim().length() == 0) /*if(tranId == null || tranId.trim().length() == 0)
{ {
errString = itmDBAccess.getErrorString("","VTTRANID","","",conn); errString = itmDBAccess.getErrorString("","VTTRANID","","",conn);
return errString; return errString;
...@@ -2138,7 +2115,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -2138,7 +2115,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
{ {
errString = itmDBAccess.getErrorString("","VTTRANID","","",conn); errString = itmDBAccess.getErrorString("","VTTRANID","","",conn);
return errString; return errString;
} }*/
/*SimpleDateFormat sdfAppl = new SimpleDateFormat(genericUtility.getApplDateFormat()); /*SimpleDateFormat sdfAppl = new SimpleDateFormat(genericUtility.getApplDateFormat());
String claimDateStr = sdfAppl.format(today); String claimDateStr = sdfAppl.format(today);
...@@ -2378,8 +2355,8 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -2378,8 +2355,8 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
sCode = empCode; sCode = empCode;
} }
glTraceMap.put("ref_id", tranId); glTraceMap.put("ref_id", tranId);
glTraceMap.put("tran_date", tranDate); glTraceMap.put("tran_date", new Timestamp(tranDate ==null?null:tranDate.getTime()));
glTraceMap.put("eff_date", effDate); glTraceMap.put("eff_date", new Timestamp(effDate ==null?null:effDate.getTime()) );
glTraceMap.put("fin_entity", finEntity); glTraceMap.put("fin_entity", finEntity);
glTraceMap.put("site_code", siteCode); glTraceMap.put("site_code", siteCode);
glTraceMap.put("sundry_type", sType); glTraceMap.put("sundry_type", sType);
...@@ -2393,19 +2370,20 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -2393,19 +2370,20 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
glTraceMap.put("entry_batch_no", entryBatchNo); glTraceMap.put("entry_batch_no", entryBatchNo);
if(totalAmt > 0) if(totalAmt > 0)
{ {
glTraceMap.put("dr_amt", 0); glTraceMap.put("dr_amt", 0.0);
glTraceMap.put("cr_amt", totalAmt); glTraceMap.put("cr_amt", totalAmt);
} }
else else
{ {
glTraceMap.put("dr_amt", 0-totalAmt); glTraceMap.put("dr_amt", 0-totalAmt);
glTraceMap.put("cr_amt", 0); glTraceMap.put("cr_amt", 0.0);
} }
glTraceMap.put("ref_type", "A"); glTraceMap.put("ref_type", "A");
glTraceMap.put("ref_ser", "P-VOUC"); glTraceMap.put("ref_ser", "P-VOUC");
glTraceMap.put("remarks", remarks); glTraceMap.put("remarks", remarks);
errString = finCommon.glTraceUpdate(glTraceMap, conn); errString = finCommon.glTraceUpdate(glTraceMap, conn);
System.out.println("errString2386="+errString);
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ {
return errString; return errString;
...@@ -2413,8 +2391,8 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -2413,8 +2391,8 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
if("O".equalsIgnoreCase(sType)) if("O".equalsIgnoreCase(sType))
{ {
sundryBalMap.put("tran_date",tranDate); sundryBalMap.put("tran_date",new Timestamp(tranDate ==null?null:tranDate.getTime()));
sundryBalMap.put("eff_date ",effDate); sundryBalMap.put("eff_date ",new Timestamp(effDate ==null?null:effDate.getTime()));
sundryBalMap.put("fin_entity",finEntity); sundryBalMap.put("fin_entity",finEntity);
sundryBalMap.put("site_code",siteCode); sundryBalMap.put("site_code",siteCode);
sundryBalMap.put("sundry_type",sType); sundryBalMap.put("sundry_type",sType);
...@@ -2427,20 +2405,21 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -2427,20 +2405,21 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
if(totalAmt > 0) if(totalAmt > 0)
{ {
sundryBalMap.put("dr_amt",0); sundryBalMap.put("dr_amt",0.0);
sundryBalMap.put("cr_amt",totalAmt); sundryBalMap.put("cr_amt",totalAmt);
} }
else else
{ {
sundryBalMap.put("dr_amt",0-totalAmt); sundryBalMap.put("dr_amt",0-totalAmt);
sundryBalMap.put("cr_amt",0); sundryBalMap.put("cr_amt",0.0);
} }
sundryBalMap.put("adv_amt",0); sundryBalMap.put("adv_amt",0);
sType = (String)sundryBalMap.get("sundry_type"); sType = (String)sundryBalMap.get("sundry_type");
sCode = (String)sundryBalMap.get("sundry_code"); sCode = (String)sundryBalMap.get("sundry_code");
sundryBalMap.put("contact_code",finCommon.getContactCode(sType,sCode,conn)); sundryBalMap.put("contact_code",finCommon.getContactCode(sType,sCode,conn));
errString = finCommon.gbf_sundrybal_upd(sundryBalMap,conn); errString = finCommon.gbf_sundrybal_upd(sundryBalMap,conn);
System.out.println("2422 errString="+errString);
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ {
return errString; return errString;
...@@ -2474,27 +2453,25 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -2474,27 +2453,25 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
sql = "select key_string from transetup where upper(tran_window) = 'T_MISCPAY_REF' "; sql = "select key_string from transetup where upper(tran_window) = 'T_MISCPAY_REF' ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs == null) if (rs.next())
{
keyString = rs.getString("key_string");
}
rs.close();rs = null;
pstmt.close();pstmt = null;
if(keyString == null || keyString.trim().length() == 0)
{ {
sql = " select key_string from transetup where upper(tran_window) = 'GENERAL' "; sql = " select key_string from transetup where upper(tran_window) = 'GENERAL' ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) if (rs.next())
{ {
keyString = rs.getString("key_string"); keyString = rs.getString("key_string");
} }
rs.close();rs = null;
pstmt.close();pstmt = null;
} }
else if (rs.next())
{
keyString = rs.getString("key_string");
}
rs.close();rs = null;
pstmt.close();pstmt = null;
System.out.println("keyString :"+keyString); System.out.println("keyString :"+keyString);
SimpleDateFormat sdfAppl = new SimpleDateFormat(genericUtility.getApplDateFormat()); SimpleDateFormat sdfAppl = new SimpleDateFormat(genericUtility.getApplDateFormat());
String tranDateStr = sdfAppl.format(tranDate); String tranDateStr = sdfAppl.format(tranDate);
...@@ -2522,18 +2499,18 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -2522,18 +2499,18 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
return errString; return errString;
} }
miscPayMap.put("tran_ser","P-VOUC"); miscPayMap.put("tran_ser","P-VOUC");
miscPayMap.put("tran_date",tranDate); miscPayMap.put("tran_date",new Timestamp(tranDate ==null?null:tranDate.getTime()));
miscPayMap.put("ref_no",refNo); miscPayMap.put("ref_no",refNo);
miscPayMap.put("ref_date",tranDate); miscPayMap.put("ref_date",new Timestamp(tranDate ==null?null:tranDate.getTime()));
miscPayMap.put("bill_no"," "); miscPayMap.put("bill_no"," ");
miscPayMap.put("bill_date",refDate); miscPayMap.put("bill_date",new Timestamp(refDate ==null?null:refDate.getTime()));
miscPayMap.put("curr_code",currCode); miscPayMap.put("curr_code",currCode);
miscPayMap.put("exch_rate",exchRate); miscPayMap.put("exch_rate",exchRate);
miscPayMap.put("sundry_type","O"); miscPayMap.put("sundry_type","O");
miscPayMap.put("sundry_code",""); miscPayMap.put("sundry_code","");
miscPayMap.put("acct_code",acctCodePay); miscPayMap.put("acct_code",acctCodePay);
miscPayMap.put("cctr_code",cctrCodePay); miscPayMap.put("cctr_code",cctrCodePay);
miscPayMap.put("due_date",tranDate); miscPayMap.put("due_date",new Timestamp(tranDate ==null?null:tranDate.getTime()));
miscPayMap.put("site_code",siteCode); miscPayMap.put("site_code",siteCode);
miscPayMap.put("fin_entity",finEntity); miscPayMap.put("fin_entity",finEntity);
miscPayMap.put("tot_amt",totalAmt); miscPayMap.put("tot_amt",totalAmt);
...@@ -2541,7 +2518,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -2541,7 +2518,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
miscPayMap.put("auto_pay","Y"); miscPayMap.put("auto_pay","Y");
miscPayMap.put("pay_mode",payMode); miscPayMap.put("pay_mode",payMode);
miscPayMap.put("paid","N"); miscPayMap.put("paid","N");
miscPayMap.put("adv_amt",0); miscPayMap.put("adv_amt",0.0);
miscPayMap.put("entry_batch_no",entryBatchNo); miscPayMap.put("entry_batch_no",entryBatchNo);
sundryCode = empCode; sundryCode = empCode;
if("Y".equalsIgnoreCase(hold)) if("Y".equalsIgnoreCase(hold))
...@@ -2576,15 +2553,16 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -2576,15 +2553,16 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
} }
else else
{ {
miscPayMap.put("hold_amt",0); miscPayMap.put("hold_amt",0.0);
} }
} }
else else
{ {
miscPayMap.put("hold_amt",0); miscPayMap.put("hold_amt",0.0);
} }
errString = finCommon.gbfMiscPayUpd(miscPayMap,conn); errString = finCommon.gbfMiscPayUpd(miscPayMap,conn);
System.out.println("2565="+errString);
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ {
return errString; return errString;
...@@ -2657,18 +2635,18 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -2657,18 +2635,18 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
if("D".equalsIgnoreCase(postOption)) if("D".equalsIgnoreCase(postOption))
{ {
miscPayMap.put("tran_ser","P-VOUC"); miscPayMap.put("tran_ser","P-VOUC");
miscPayMap.put("tran_date",tranDate); miscPayMap.put("tran_date",new Timestamp(tranDate ==null?null:tranDate.getTime()));
miscPayMap.put("ref_no",tranId); miscPayMap.put("ref_no",tranId);
miscPayMap.put("ref_date",tranDate); miscPayMap.put("ref_date",new Timestamp(tranDate ==null?null:tranDate.getTime()));
miscPayMap.put("bill_no"," "); miscPayMap.put("bill_no"," ");
miscPayMap.put("bill_date",refDate); miscPayMap.put("bill_date",new Timestamp(refDate ==null?null:refDate.getTime()));
miscPayMap.put("curr_code",currCode); miscPayMap.put("curr_code",currCode);
miscPayMap.put("exch_rate",exchRate); miscPayMap.put("exch_rate",exchRate);
miscPayMap.put("sundry_type","E"); miscPayMap.put("sundry_type","E");
miscPayMap.put("sundry_code",empCode); miscPayMap.put("sundry_code",empCode);
miscPayMap.put("acct_code",acctCodePay); miscPayMap.put("acct_code",acctCodePay);
miscPayMap.put("cctr_code",cctrCodePay); miscPayMap.put("cctr_code",cctrCodePay);
miscPayMap.put("due_date",tranDate); miscPayMap.put("due_date",new Timestamp(tranDate ==null?null:tranDate.getTime()));
miscPayMap.put("site_code",siteCode); miscPayMap.put("site_code",siteCode);
miscPayMap.put("fin_entity",finEntity); miscPayMap.put("fin_entity",finEntity);
miscPayMap.put("tot_amt",totalAmt); miscPayMap.put("tot_amt",totalAmt);
...@@ -2676,7 +2654,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -2676,7 +2654,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
miscPayMap.put("auto_pay","Y"); miscPayMap.put("auto_pay","Y");
miscPayMap.put("pay_mode",payMode); miscPayMap.put("pay_mode",payMode);
miscPayMap.put("paid","N"); miscPayMap.put("paid","N");
miscPayMap.put("adv_amt",0); miscPayMap.put("adv_amt",0.0);
miscPayMap.put("entry_batch_no",entryBatchNo); miscPayMap.put("entry_batch_no",entryBatchNo);
sundryCode = empCode; sundryCode = empCode;
...@@ -2712,10 +2690,11 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -2712,10 +2690,11 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
} }
else else
{ {
miscPayMap.put("hold_amt",0); miscPayMap.put("hold_amt",0.0);
} }
} }
errString = finCommon.gbfMiscPayUpd(miscPayMap,conn); errString = finCommon.gbfMiscPayUpd(miscPayMap,conn);
System.out.println("2697 errString="+errString);
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ {
return errString; return errString;
...@@ -2775,9 +2754,10 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -2775,9 +2754,10 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
glTraceMap = new HashMap(); glTraceMap = new HashMap();
payVouchAdv = new HashMap(); payVouchAdv = new HashMap();
payVouchAdv = (HashMap) payVouchAdvList.get(ctr); payVouchAdv = (HashMap) payVouchAdvList.get(ctr);
System.out.println("2755 payVouchAdv="+payVouchAdv);
glTraceMap.put("tran_date", tranDate); glTraceMap.put("tran_date", new Timestamp(tranDate ==null?null:tranDate.getTime()));
glTraceMap.put("eff_date", effDate); glTraceMap.put("eff_date", new Timestamp(effDate ==null?null:effDate.getTime()) );
glTraceMap.put("fin_entity", finEntity); glTraceMap.put("fin_entity", finEntity);
glTraceMap.put("site_code", siteCode); glTraceMap.put("site_code", siteCode);
glTraceMap.put("sundry_type", "E"); glTraceMap.put("sundry_type", "E");
...@@ -2792,11 +2772,11 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -2792,11 +2772,11 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
if((Double)payVouchAdv.get("adj_amt") > 0) if((Double)payVouchAdv.get("adj_amt") > 0)
{ {
glTraceMap.put("dr_amt", (Double)payVouchAdv.get("adj_amt") ); glTraceMap.put("dr_amt", (Double)payVouchAdv.get("adj_amt") );
glTraceMap.put("cr_amt", 0); glTraceMap.put("cr_amt", 0.0);
} }
else else
{ {
glTraceMap.put("dr_amt", 0); glTraceMap.put("dr_amt", 0.0);
glTraceMap.put("cr_amt", 0 - (Double)payVouchAdv.get("adj_amt") ); glTraceMap.put("cr_amt", 0 - (Double)payVouchAdv.get("adj_amt") );
} }
glTraceMap.put("ref_type", "A"); glTraceMap.put("ref_type", "A");
...@@ -2805,13 +2785,14 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -2805,13 +2785,14 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
glTraceMap.put("remarks", remarks); glTraceMap.put("remarks", remarks);
errString = finCommon.glTraceUpdate(glTraceMap, conn); errString = finCommon.glTraceUpdate(glTraceMap, conn);
System.out.println("2788 errString="+errString);
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ {
return errString; return errString;
} }
sundryBalMap.put("tran_date",tranDate); sundryBalMap.put("tran_date",new Timestamp(tranDate ==null?null:tranDate.getTime()));
sundryBalMap.put("eff_date ",effDate); sundryBalMap.put("eff_date ",new Timestamp(effDate ==null?null:effDate.getTime()));
sundryBalMap.put("fin_entity",finEntity); sundryBalMap.put("fin_entity",finEntity);
sundryBalMap.put("site_code",siteCode); sundryBalMap.put("site_code",siteCode);
sundryBalMap.put("sundry_type","E"); sundryBalMap.put("sundry_type","E");
...@@ -2825,11 +2806,11 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -2825,11 +2806,11 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
if((Double)payVouchAdv.get("adj_amt") > 0) if((Double)payVouchAdv.get("adj_amt") > 0)
{ {
sundryBalMap.put("dr_amt",(Double)payVouchAdv.get("adj_amt")); sundryBalMap.put("dr_amt",(Double)payVouchAdv.get("adj_amt"));
sundryBalMap.put("cr_amt",0); sundryBalMap.put("cr_amt",0.0);
} }
else else
{ {
sundryBalMap.put("dr_amt",0); sundryBalMap.put("dr_amt",0.0);
sundryBalMap.put("cr_amt",0 - (Double)payVouchAdv.get("adj_amt")); sundryBalMap.put("cr_amt",0 - (Double)payVouchAdv.get("adj_amt"));
} }
sundryBalMap.put("adv_amt",0); sundryBalMap.put("adv_amt",0);
...@@ -2838,6 +2819,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -2838,6 +2819,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
sundryBalMap.put("contact_code",finCommon.getContactCode(sType,sCode,conn)); sundryBalMap.put("contact_code",finCommon.getContactCode(sType,sCode,conn));
errString = finCommon.gbf_sundrybal_upd(sundryBalMap,conn); errString = finCommon.gbf_sundrybal_upd(sundryBalMap,conn);
System.out.println("2822 errString ="+errString);
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ {
return errString; return errString;
...@@ -3055,6 +3037,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -3055,6 +3037,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
glTraceMap.put("remarks", remarks); glTraceMap.put("remarks", remarks);
errString = finCommon.glTraceUpdate(glTraceMap, conn); errString = finCommon.glTraceUpdate(glTraceMap, conn);
System.out.println("3040 errString="+errString);
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ {
return errString; return errString;
...@@ -3090,6 +3073,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -3090,6 +3073,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
sundryBalMap.put("contact_code",finCommon.getContactCode(sType,sCode,conn)); sundryBalMap.put("contact_code",finCommon.getContactCode(sType,sCode,conn));
errString = finCommon.gbf_sundrybal_upd(sundryBalMap,conn); errString = finCommon.gbf_sundrybal_upd(sundryBalMap,conn);
System.out.println("3076 errString="+errString);
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ {
return errString; return errString;
...@@ -3335,7 +3319,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -3335,7 +3319,7 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
genericUtility = GenericUtility.getInstance(); genericUtility = GenericUtility.getInstance();
userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode"); userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode");
chgTerm = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "chgTerm" ); chgTerm = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "chgTerm" );
System.out.println("payIbca Header = "+payIbcaHdr); System.out.println("payIbca Header = "+payIbcaHdr.toString());
if(payIbcaHdr == null) if(payIbcaHdr == null)
{ {
errString = itmDBAccess.getErrorString("","VTIMP","","",conn); errString = itmDBAccess.getErrorString("","VTIMP","","",conn);
...@@ -3381,11 +3365,13 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per ...@@ -3381,11 +3365,13 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
{ {
// Call the hdr and detail posting for pibca - issue type // Call the hdr and detail posting for pibca - issue type
errString = gbfPostPayrIbcaHdrIss(payIbcaHdr,xtraParams,conn); errString = gbfPostPayrIbcaHdrIss(payIbcaHdr,xtraParams,conn);
System.out.println("3368 errString="+errString);
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ {
return errString; return errString;
} }
errString = gbfPostPayrIbcaDetIss(payIbcaHdr,payIbcaDetList,xtraParams,conn); errString = gbfPostPayrIbcaDetIss(payIbcaHdr,payIbcaDetList,xtraParams,conn);
System.out.println("3374 errString="+errString);
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ {
return errString; return errString;
......
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