Skip to content

B
business-java
Commit 14bc9e70 authored by tmahadi's avatar tmahadi
Browse files
Options

changes committed in head by azhar 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@104221 ce508802-f39f-4f6c-b175-0d175dae99d5
parent cc2bb4a3
Hide whitespace changes
Inline Side-by-side
Showing with 566 additions and 285 deletions
webitm-fin/ibase/webitm/ejb/fin/BankRecoWizIC.java
View file @ 14bc9e70
...@@ -2890,8 +2890,8 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -2890,8 +2890,8 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
String childNodeName = null; String childNodeName = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null; ResultSet rs = null;
int childNodeListLength = 0,length=0; int childNodeListLength = 0,length=0, lengthOld = 0;
Date frDt = null, toDt = null , filDt = null; Date frDt = null, toDt = null , filDt = null, rfDt = null;
int ctr=0; int ctr=0;
StringBuffer valueXmlString = new StringBuffer(""); StringBuffer valueXmlString = new StringBuffer("");
StringBuffer originalXmlStringBuff = new StringBuffer(); StringBuffer originalXmlStringBuff = new StringBuffer();
...@@ -2986,17 +2986,22 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -2986,17 +2986,22 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
filterXml.append("<bank_descr>" + bankName + "</bank_descr>"); filterXml.append("<bank_descr>" + bankName + "</bank_descr>");
filterXml.append("</Detail1>"); filterXml.append("</Detail1>");
filterXml.append("<Detail2>"); filterXml.append("<Detail2>");
parentNodeList = dom1.getElementsByTagName("Detail"); parentNodeList = dom1.getElementsByTagName("Detail");
parentNode = parentNodeList.item(0); parentNode = parentNodeList.item(0);
length=dom1.getElementsByTagName("Detail").getLength(); length=dom1.getElementsByTagName("Detail").getLength();
System.out.println("length ::::::"+length); System.out.println("length ::::::"+length);
lengthOld=dom.getElementsByTagName("Detail").getLength();
System.out.println("length ::::::"+lengthOld);
String tranName="",refDate="",tranType="",amtBs="",refMode="",effDate="",statNo="",statDate="",amtAdj="",status="",amtBc="" ; String tranName="",refDate="",tranType="",amtBs="",refMode="",effDate="",statNo="",statDate="",amtAdj="",status="",amtBc="" ;
System.out.println("filterData :"+filterData); System.out.println("filterData :"+filterData);
System.out.println("filterList :"+filterList); System.out.println("filterList :"+filterList);
if("ref_date".equalsIgnoreCase(filterList)){//TODO if("ref_date".equalsIgnoreCase(filterList) && fromDate.length() ==0){//TODO
System.out.println("filter by cheque date"); System.out.println("filter by cheque date");
filDt = sdf1.parse(filterData); filDt = sdf1.parse(filterData);
} }
...@@ -3004,9 +3009,198 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -3004,9 +3009,198 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
System.out.println("formatted filter date::" + filDt); System.out.println("formatted filter date::" + filDt);
if("none".equalsIgnoreCase(filterList.trim())){ if(fromDate.length() > 0 && filterData.trim().length() == 0 && !filterList.trim().equalsIgnoreCase("none")){
for(int i=0 ; i<length ; i++)
{
tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("tranName : "+tranName);
if(tranName.equalsIgnoreCase("bankStatement"))
{
System.out.println("in for:bankStatement when filter is from date to date...................");
refId=checkNull(genericUtility.getColumnValueFromNode("ref_no", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("refId : "+refId);
tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("tranName : "+tranName);
refDate=checkNull(genericUtility.getColumnValueFromNode("ref_date", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("refDate : "+refDate);
tranType=checkNull(genericUtility.getColumnValueFromNode("tran_type", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("tranType : "+tranType);
amtBs=checkNull(genericUtility.getColumnValueFromNode("amt_bc", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("amtBs : "+amtBs);
currCode=checkNull(genericUtility.getColumnValueFromNode("curr_code", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("currCode : "+currCode);
amtBs=checkNull(genericUtility.getColumnValueFromNode("amt_bs", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("amtBs : "+amtBs);
tranType=checkNull(genericUtility.getColumnValueFromNode("tran_type", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("tranType : "+tranType);
tranId=checkNull(genericUtility.getColumnValueFromNode("tran_id", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("tranId : "+tranId);
refMode=checkNull(genericUtility.getColumnValueFromNode("ref_mode", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("refMode : "+refMode);
effDate=checkNull(genericUtility.getColumnValueFromNode("eff_date", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("effDate : "+effDate);
statNo=checkNull(genericUtility.getColumnValueFromNode("stat_no", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("statNo : "+statNo);
statDate=checkNull(genericUtility.getColumnValueFromNode("stat_date", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("statDate : "+statDate);
amtAdj=checkNull(genericUtility.getColumnValueFromNode("amt_adj", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("amtAdj : "+amtAdj);
status=checkNull(genericUtility.getColumnValueFromNode("status", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("status : "+status);
exchRate=checkNull(genericUtility.getColumnValueFromNode("exch_rate", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("exchRate : "+exchRate);
tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("tranName : "+tranName);
siteCodeNew=checkNull(genericUtility.getColumnValueFromNode("site_code", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("siteCodeNew: "+siteCodeNew);
bankCodeNew=checkNull(genericUtility.getColumnValueFromNode("bank_code", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("bankCodeNew: "+ bankCodeNew);
}
if(tranName.equalsIgnoreCase("bankTransaction"))
{
System.out.println("in for: bankTransaction when filter is from date to date................");
refId=checkNull(genericUtility.getColumnValueFromNode("ref_no", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("refId : "+refId);
refDate=checkNull(genericUtility.getColumnValueFromNode("ref_date", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("refDate : "+refDate);
amtBs=checkNull(genericUtility.getColumnValueFromNode("amt_bc", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("amtBs : "+amtBs);
currCode=checkNull(genericUtility.getColumnValueFromNode("curr_code", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("currCode : "+currCode);
amtBs=checkNull(genericUtility.getColumnValueFromNode("amt_bc", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("amtBs : "+amtBs);
refMode=checkNull(genericUtility.getColumnValueFromNode("ref_mode", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("refMode : "+refMode);
tranId=checkNull(genericUtility.getColumnValueFromNode("tran_id", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("tranId : "+tranId);
tranType=checkNull(genericUtility.getColumnValueFromNode("tran_type", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("tranType : "+tranType);
acctCode=checkNull(genericUtility.getColumnValueFromNode("acct_code", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("acctCode : "+acctCode);
cctrCode=checkNull(genericUtility.getColumnValueFromNode("cctr_code", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("cctrCode : "+cctrCode);
sundryCode=checkNull(genericUtility.getColumnValueFromNode("sundry_code", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("sundryCode : "+sundryCode);
status=checkNull(genericUtility.getColumnValueFromNode("status", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("status : "+status);
exchRate=checkNull(genericUtility.getColumnValueFromNode("exch_rate", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("exchRate : "+exchRate);
amtAdj=checkNull(genericUtility.getColumnValueFromNode("amt_adj", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("amtAdj : "+amtAdj);
tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("tranName : "+tranName);
siteCodeNew=checkNull(genericUtility.getColumnValueFromNode("site_code", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("siteCodeNew: "+siteCodeNew);
bankCodeNew=checkNull(genericUtility.getColumnValueFromNode("bank_code", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("bankCodeNew: "+ bankCodeNew);
}
rfDt = sdf1.parse(refDate);
System.out.println("formatted ref date:: " + rfDt);
if (((frDt.before(rfDt) || frDt.equals(rfDt)) && (toDt.after(rfDt) || toDt.equals(rfDt)))){
System.out.println("Entering into filter data xml for from date to date.....");
tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("tranName : "+tranName);
if(tranName.equalsIgnoreCase("bankStatement"))
{
System.out.println("in if : bankStatement when filter is from date to date........");
refId=checkNull(genericUtility.getColumnValueFromNode("ref_no", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("refId : "+refId);
tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("tranName : "+tranName);
refDate=checkNull(genericUtility.getColumnValueFromNode("ref_date", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("refDate : "+refDate);
tranType=checkNull(genericUtility.getColumnValueFromNode("tran_type", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("tranType : "+tranType);
amtBs=checkNull(genericUtility.getColumnValueFromNode("amt_bc", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("amtBs : "+amtBs);
currCode=checkNull(genericUtility.getColumnValueFromNode("curr_code", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("currCode : "+currCode);
amtBs=checkNull(genericUtility.getColumnValueFromNode("amt_bs", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("amtBs : "+amtBs);
tranType=checkNull(genericUtility.getColumnValueFromNode("tran_type", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("tranType : "+tranType);
tranId=checkNull(genericUtility.getColumnValueFromNode("tran_id", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("tranId : "+tranId);
refMode=checkNull(genericUtility.getColumnValueFromNode("ref_mode", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("refMode : "+refMode);
effDate=checkNull(genericUtility.getColumnValueFromNode("eff_date", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("effDate : "+effDate);
statNo=checkNull(genericUtility.getColumnValueFromNode("stat_no", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("statNo : "+statNo);
statDate=checkNull(genericUtility.getColumnValueFromNode("stat_date", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("statDate : "+statDate);
amtAdj=checkNull(genericUtility.getColumnValueFromNode("amt_adj", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("amtAdj : "+amtAdj);
status=checkNull(genericUtility.getColumnValueFromNode("status", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("status : "+status);
exchRate=checkNull(genericUtility.getColumnValueFromNode("exch_rate", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("exchRate : "+exchRate);
tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("tranName : "+tranName);
siteCodeNew=checkNull(genericUtility.getColumnValueFromNode("site_code", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("siteCodeNew: "+siteCodeNew);
bankCodeNew=checkNull(genericUtility.getColumnValueFromNode("bank_code", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("bankCodeNew: "+ bankCodeNew);
}
filterXml.append("<Detail domID='1' selected='N'>");
System.out.println("record found for from date to date::");
if(tranName.equalsIgnoreCase("bankStatement"))
{
filterXml.append("<ref_no>" + refId+ "</ref_no>");
filterXml.append("<tran_name>" + tranName+ "</tran_name>");
filterXml.append("<ref_date>" + refDate+ "</ref_date>");
filterXml.append("<tran_type>" + tranType+ "</tran_type>");
filterXml.append("<amt_bc>" + amtBs+ "</amt_bc>");
filterXml.append("<curr_code>" + currCode+ "</curr_code>");
filterXml.append("<amt_bs>" + amtBs+ "</amt_bs>");
filterXml.append("<tran_id>" + tranId+ "</tran_id>");
filterXml.append("<ref_mode>" + refMode+ "</ref_mode>");
filterXml.append("<eff_date>" + effDate+ "</eff_date>");
filterXml.append("<stat_no>" + statNo+ "</stat_no>");
filterXml.append("<stat_date>" + statDate+ "</stat_date>");
filterXml.append("<amt_adj>" + amtAdj+ "</amt_adj>");
filterXml.append("<status>" + status+ "</status>");
filterXml.append("<exch_rate>" + exchRate+ "</exch_rate>");
filterXml.append("<site_code>" + siteCodeNew + "</site_code>");
filterXml.append("<bank_code>" + bankCodeNew + "</bank_code>");
}
filterXml.append("</Detail>");
System.out.println("before bank transaction::" + filterXml.toString());
}
if(tranName.equalsIgnoreCase("bankTransaction"))
{
System.out.println("not filtering bank transaction:::");
filterXml.append("<Detail domID='1' selected='N'>");
filterXml.append("<ref_no>" + refId+ "</ref_no>");
filterXml.append("<ref_date>" + refDate+ "</ref_date>");
filterXml.append("<amt_bc>" + amtBs+ "</amt_bc>");
filterXml.append("<curr_code>" + currCode+ "</curr_code>");
filterXml.append("<amt_bc>" + amtBs+ "</amt_bc>");
filterXml.append("<ref_mode>" + refMode+ "</ref_mode>");
filterXml.append("<tran_id>" + tranId+ "</tran_id>");
filterXml.append("<tran_type>" + tranType+ "</tran_type>");
filterXml.append("<acct_code>" + acctCode+ "</acct_code>");
filterXml.append("<cctr_code>" + cctrCode+ "</cctr_code>");
filterXml.append("<sundry_code>" + sundryCode+ "</sundry_code>");
filterXml.append("<status>" + status+ "</status>");
filterXml.append("<exch_rate>" + exchRate+ "</exch_rate>");
filterXml.append("<amt_adj>" + amtAdj+ "</amt_adj>");
filterXml.append("<tran_name>" + tranName+ "</tran_name>");
filterXml.append("<site_code>" + siteCodeNew + "</site_code>");
filterXml.append("<bank_code>" + bankCodeNew + "</bank_code>");
filterXml.append("</Detail>");
}
}
}else if("none".equalsIgnoreCase(filterList.trim()) && filterData.trim().length() == 0){
//if(fromDate.length() == 0){
for(int i=0 ; i<length ; i++) for(int i=0 ; i<length ; i++)
{ {
tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom1.getElementsByTagName("Detail").item(i))); tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom1.getElementsByTagName("Detail").item(i)));
...@@ -3054,7 +3248,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -3054,7 +3248,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
siteCodeNew=checkNull(genericUtility.getColumnValueFromNode("site_code", dom1.getElementsByTagName("Detail").item(i))); siteCodeNew=checkNull(genericUtility.getColumnValueFromNode("site_code", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("siteCodeNew: "+siteCodeNew); System.out.println("siteCodeNew: "+siteCodeNew);
bankCodeNew=checkNull(genericUtility.getColumnValueFromNode("bank_code", dom1.getElementsByTagName("Detail").item(i))); bankCodeNew=checkNull(genericUtility.getColumnValueFromNode("bank_code", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("siteCodeNew: "+ bankCodeNew); System.out.println("bankCodeNew: "+ bankCodeNew);
} }
...@@ -3094,7 +3288,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -3094,7 +3288,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
siteCodeNew=checkNull(genericUtility.getColumnValueFromNode("site_code", dom1.getElementsByTagName("Detail").item(i))); siteCodeNew=checkNull(genericUtility.getColumnValueFromNode("site_code", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("siteCodeNew: "+siteCodeNew); System.out.println("siteCodeNew: "+siteCodeNew);
bankCodeNew=checkNull(genericUtility.getColumnValueFromNode("bank_code", dom1.getElementsByTagName("Detail").item(i))); bankCodeNew=checkNull(genericUtility.getColumnValueFromNode("bank_code", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("siteCodeNew: "+ bankCodeNew); System.out.println("bankCodeNew: "+ bankCodeNew);
} }
...@@ -3145,224 +3339,390 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -3145,224 +3339,390 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
filterXml.append("<tran_name>" + tranName+ "</tran_name>"); filterXml.append("<tran_name>" + tranName+ "</tran_name>");
filterXml.append("<site_code>" + siteCodeNew + "</site_code>"); filterXml.append("<site_code>" + siteCodeNew + "</site_code>");
filterXml.append("<bank_code>" + bankCodeNew + "</bank_code>"); filterXml.append("<bank_code>" + bankCodeNew + "</bank_code>");
} }
filterXml.append("</Detail>"); filterXml.append("</Detail>");
} }
filterXml.append("</Detail2>"); filterXml.append("</Detail2>");
resultString = filterXml.toString(); resultString = filterXml.toString();
System.out.println("resultString when filter is none :"+resultString); System.out.println("resultString when filter is none :"+resultString);
return resultString; return resultString;
//}
/*else if(fromDate.length()>0){
for(int i=0 ; i<length ; i++)
{
tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranName : "+tranName);
if(tranName.equalsIgnoreCase("bankStatement"))
{
System.out.println("in for:bankStatement when filter is from date to date...................");
}else{ refId=checkNull(genericUtility.getColumnValueFromNode("ref_no", dom.getElementsByTagName("Detail").item(i)));
System.out.println("refId : "+refId);
tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranName : "+tranName);
refDate=checkNull(genericUtility.getColumnValueFromNode("ref_date", dom.getElementsByTagName("Detail").item(i)));
System.out.println("refDate : "+refDate);
tranType=checkNull(genericUtility.getColumnValueFromNode("tran_type", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranType : "+tranType);
amtBs=checkNull(genericUtility.getColumnValueFromNode("amt_bc", dom.getElementsByTagName("Detail").item(i)));
System.out.println("amtBs : "+amtBs);
currCode=checkNull(genericUtility.getColumnValueFromNode("curr_code", dom.getElementsByTagName("Detail").item(i)));
System.out.println("currCode : "+currCode);
amtBs=checkNull(genericUtility.getColumnValueFromNode("amt_bs", dom.getElementsByTagName("Detail").item(i)));
System.out.println("amtBs : "+amtBs);
tranType=checkNull(genericUtility.getColumnValueFromNode("tran_type", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranType : "+tranType);
tranId=checkNull(genericUtility.getColumnValueFromNode("tran_id", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranId : "+tranId);
refMode=checkNull(genericUtility.getColumnValueFromNode("ref_mode", dom.getElementsByTagName("Detail").item(i)));
System.out.println("refMode : "+refMode);
effDate=checkNull(genericUtility.getColumnValueFromNode("eff_date", dom.getElementsByTagName("Detail").item(i)));
System.out.println("effDate : "+effDate);
statNo=checkNull(genericUtility.getColumnValueFromNode("stat_no", dom.getElementsByTagName("Detail").item(i)));
System.out.println("statNo : "+statNo);
statDate=checkNull(genericUtility.getColumnValueFromNode("stat_date", dom.getElementsByTagName("Detail").item(i)));
System.out.println("statDate : "+statDate);
amtAdj=checkNull(genericUtility.getColumnValueFromNode("amt_adj", dom.getElementsByTagName("Detail").item(i)));
System.out.println("amtAdj : "+amtAdj);
status=checkNull(genericUtility.getColumnValueFromNode("status", dom.getElementsByTagName("Detail").item(i)));
System.out.println("status : "+status);
exchRate=checkNull(genericUtility.getColumnValueFromNode("exch_rate", dom.getElementsByTagName("Detail").item(i)));
System.out.println("exchRate : "+exchRate);
tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranName : "+tranName);
siteCodeNew=checkNull(genericUtility.getColumnValueFromNode("site_code", dom.getElementsByTagName("Detail").item(i)));
System.out.println("siteCodeNew: "+siteCodeNew);
bankCodeNew=checkNull(genericUtility.getColumnValueFromNode("bank_code", dom.getElementsByTagName("Detail").item(i)));
System.out.println("siteCodeNew: "+ bankCodeNew);
}
if(tranName.equalsIgnoreCase("bankTransaction"))
{
System.out.println("in for: bankTransaction when filter is none................");
refId=checkNull(genericUtility.getColumnValueFromNode("ref_no", dom.getElementsByTagName("Detail").item(i)));
System.out.println("refId : "+refId);
refDate=checkNull(genericUtility.getColumnValueFromNode("ref_date", dom.getElementsByTagName("Detail").item(i)));
System.out.println("refDate : "+refDate);
amtBs=checkNull(genericUtility.getColumnValueFromNode("amt_bc", dom.getElementsByTagName("Detail").item(i)));
System.out.println("amtBs : "+amtBs);
currCode=checkNull(genericUtility.getColumnValueFromNode("curr_code", dom.getElementsByTagName("Detail").item(i)));
System.out.println("currCode : "+currCode);
amtBs=checkNull(genericUtility.getColumnValueFromNode("amt_bc", dom.getElementsByTagName("Detail").item(i)));
System.out.println("amtBs : "+amtBs);
refMode=checkNull(genericUtility.getColumnValueFromNode("ref_mode", dom.getElementsByTagName("Detail").item(i)));
System.out.println("refMode : "+refMode);
tranId=checkNull(genericUtility.getColumnValueFromNode("tran_id", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranId : "+tranId);
tranType=checkNull(genericUtility.getColumnValueFromNode("tran_type", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranType : "+tranType);
acctCode=checkNull(genericUtility.getColumnValueFromNode("acct_code", dom.getElementsByTagName("Detail").item(i)));
System.out.println("acctCode : "+acctCode);
cctrCode=checkNull(genericUtility.getColumnValueFromNode("cctr_code", dom.getElementsByTagName("Detail").item(i)));
System.out.println("cctrCode : "+cctrCode);
sundryCode=checkNull(genericUtility.getColumnValueFromNode("sundry_code", dom.getElementsByTagName("Detail").item(i)));
System.out.println("sundryCode : "+sundryCode);
status=checkNull(genericUtility.getColumnValueFromNode("status", dom.getElementsByTagName("Detail").item(i)));
System.out.println("status : "+status);
exchRate=checkNull(genericUtility.getColumnValueFromNode("exch_rate", dom.getElementsByTagName("Detail").item(i)));
System.out.println("exchRate : "+exchRate);
amtAdj=checkNull(genericUtility.getColumnValueFromNode("amt_adj", dom.getElementsByTagName("Detail").item(i)));
System.out.println("amtAdj : "+amtAdj);
tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranName : "+tranName);
siteCodeNew=checkNull(genericUtility.getColumnValueFromNode("site_code", dom.getElementsByTagName("Detail").item(i)));
System.out.println("siteCodeNew: "+siteCodeNew);
bankCodeNew=checkNull(genericUtility.getColumnValueFromNode("bank_code", dom.getElementsByTagName("Detail").item(i)));
System.out.println("siteCodeNew: "+ bankCodeNew);
}
rfDt = sdf1.parse(refDate);
System.out.println("formatted ref date:: " + rfDt);
if (((frDt.before(rfDt) || frDt.equals(rfDt)) && (toDt.after(rfDt) || toDt.equals(rfDt)))){
System.out.println("Entering into filter data xml for from date to date.....");
tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("tranName : "+tranName);
if(tranName.equalsIgnoreCase("bankStatement"))
{
System.out.println("in if : bankStatement when filter is not none........");
refId=checkNull(genericUtility.getColumnValueFromNode("ref_no", dom.getElementsByTagName("Detail").item(i)));
System.out.println("refId : "+refId);
tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranName : "+tranName);
refDate=checkNull(genericUtility.getColumnValueFromNode("ref_date", dom.getElementsByTagName("Detail").item(i)));
System.out.println("refDate : "+refDate);
tranType=checkNull(genericUtility.getColumnValueFromNode("tran_type", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranType : "+tranType);
amtBs=checkNull(genericUtility.getColumnValueFromNode("amt_bc", dom.getElementsByTagName("Detail").item(i)));
System.out.println("amtBs : "+amtBs);
currCode=checkNull(genericUtility.getColumnValueFromNode("curr_code", dom.getElementsByTagName("Detail").item(i)));
System.out.println("currCode : "+currCode);
amtBs=checkNull(genericUtility.getColumnValueFromNode("amt_bs", dom.getElementsByTagName("Detail").item(i)));
System.out.println("amtBs : "+amtBs);
tranType=checkNull(genericUtility.getColumnValueFromNode("tran_type", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranType : "+tranType);
tranId=checkNull(genericUtility.getColumnValueFromNode("tran_id", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranId : "+tranId);
refMode=checkNull(genericUtility.getColumnValueFromNode("ref_mode", dom.getElementsByTagName("Detail").item(i)));
System.out.println("refMode : "+refMode);
effDate=checkNull(genericUtility.getColumnValueFromNode("eff_date", dom.getElementsByTagName("Detail").item(i)));
System.out.println("effDate : "+effDate);
statNo=checkNull(genericUtility.getColumnValueFromNode("stat_no", dom.getElementsByTagName("Detail").item(i)));
System.out.println("statNo : "+statNo);
statDate=checkNull(genericUtility.getColumnValueFromNode("stat_date", dom.getElementsByTagName("Detail").item(i)));
System.out.println("statDate : "+statDate);
amtAdj=checkNull(genericUtility.getColumnValueFromNode("amt_adj", dom.getElementsByTagName("Detail").item(i)));
System.out.println("amtAdj : "+amtAdj);
status=checkNull(genericUtility.getColumnValueFromNode("status", dom.getElementsByTagName("Detail").item(i)));
System.out.println("status : "+status);
exchRate=checkNull(genericUtility.getColumnValueFromNode("exch_rate", dom.getElementsByTagName("Detail").item(i)));
System.out.println("exchRate : "+exchRate);
tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranName : "+tranName);
siteCodeNew=checkNull(genericUtility.getColumnValueFromNode("site_code", dom.getElementsByTagName("Detail").item(i)));
System.out.println("siteCodeNew: "+siteCodeNew);
bankCodeNew=checkNull(genericUtility.getColumnValueFromNode("bank_code", dom.getElementsByTagName("Detail").item(i)));
System.out.println("siteCodeNew: "+ bankCodeNew);
}
filterXml.append("<Detail domID='1' selected='N'>");
System.out.println("record found for from date to date::");
if(tranName.equalsIgnoreCase("bankStatement"))
{
filterXml.append("<ref_no>" + refId+ "</ref_no>");
filterXml.append("<tran_name>" + tranName+ "</tran_name>");
filterXml.append("<ref_date>" + refDate+ "</ref_date>");
filterXml.append("<tran_type>" + tranType+ "</tran_type>");
filterXml.append("<amt_bc>" + amtBs+ "</amt_bc>");
filterXml.append("<curr_code>" + currCode+ "</curr_code>");
filterXml.append("<amt_bs>" + amtBs+ "</amt_bs>");
filterXml.append("<tran_id>" + tranId+ "</tran_id>");
filterXml.append("<ref_mode>" + refMode+ "</ref_mode>");
filterXml.append("<eff_date>" + effDate+ "</eff_date>");
filterXml.append("<stat_no>" + statNo+ "</stat_no>");
filterXml.append("<stat_date>" + statDate+ "</stat_date>");
filterXml.append("<amt_adj>" + amtAdj+ "</amt_adj>");
filterXml.append("<status>" + status+ "</status>");
filterXml.append("<exch_rate>" + exchRate+ "</exch_rate>");
filterXml.append("<site_code>" + siteCodeNew + "</site_code>");
filterXml.append("<bank_code>" + bankCodeNew + "</bank_code>");
}
filterXml.append("</Detail>");
System.out.println("before bank transaction::" + filterXml.toString());
}
if(tranName.equalsIgnoreCase("bankTransaction"))
{
System.out.println("not filtering bank transaction:::");
filterXml.append("<Detail domID='1' selected='N'>");
filterXml.append("<ref_no>" + refId+ "</ref_no>");
filterXml.append("<ref_date>" + refDate+ "</ref_date>");
filterXml.append("<amt_bc>" + amtBs+ "</amt_bc>");
filterXml.append("<curr_code>" + currCode+ "</curr_code>");
filterXml.append("<amt_bc>" + amtBs+ "</amt_bc>");
filterXml.append("<ref_mode>" + refMode+ "</ref_mode>");
filterXml.append("<tran_id>" + tranId+ "</tran_id>");
filterXml.append("<tran_type>" + tranType+ "</tran_type>");
filterXml.append("<acct_code>" + acctCode+ "</acct_code>");
filterXml.append("<cctr_code>" + cctrCode+ "</cctr_code>");
filterXml.append("<sundry_code>" + sundryCode+ "</sundry_code>");
filterXml.append("<status>" + status+ "</status>");
filterXml.append("<exch_rate>" + exchRate+ "</exch_rate>");
filterXml.append("<amt_adj>" + amtAdj+ "</amt_adj>");
filterXml.append("<tran_name>" + tranName+ "</tran_name>");
filterXml.append("<site_code>" + siteCodeNew + "</site_code>");
filterXml.append("<bank_code>" + bankCodeNew + "</bank_code>");
filterXml.append("</Detail>");
}
}
}*/
}else if(fromDate.length() == 0 && filterData.trim().length() > 0){
for(int i=0 ; i<length ; i++) for(int i=0 ; i<lengthOld ; i++)
{ {
tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom1.getElementsByTagName("Detail").item(i))); tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("tranName : "+tranName); System.out.println("tranName : "+tranName);
if(tranName.equalsIgnoreCase("bankStatement")) if(tranName.equalsIgnoreCase("bankStatement"))
{ {
System.out.println("in for : bankStatement when filter is not none..................."); System.out.println("in for : bankStatement when filter is not none...................");
refId=checkNull(genericUtility.getColumnValueFromNode("ref_no", dom1.getElementsByTagName("Detail").item(i))); refId=checkNull(genericUtility.getColumnValueFromNode("ref_no", dom.getElementsByTagName("Detail").item(i)));
System.out.println("refId : "+refId); System.out.println("refId : "+refId);
tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom1.getElementsByTagName("Detail").item(i))); tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranName : "+tranName); System.out.println("tranName : "+tranName);
refDate=checkNull(genericUtility.getColumnValueFromNode("ref_date", dom1.getElementsByTagName("Detail").item(i))); refDate=checkNull(genericUtility.getColumnValueFromNode("ref_date", dom.getElementsByTagName("Detail").item(i)));
System.out.println("refDate : "+refDate); System.out.println("refDate : "+refDate);
tranType=checkNull(genericUtility.getColumnValueFromNode("tran_type", dom1.getElementsByTagName("Detail").item(i))); tranType=checkNull(genericUtility.getColumnValueFromNode("tran_type", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranType : "+tranType); System.out.println("tranType : "+tranType);
amtBs=checkNull(genericUtility.getColumnValueFromNode("amt_bc", dom1.getElementsByTagName("Detail").item(i))); amtBs=checkNull(genericUtility.getColumnValueFromNode("amt_bc", dom.getElementsByTagName("Detail").item(i)));
System.out.println("amtBs : "+amtBs); System.out.println("amtBs : "+amtBs);
currCode=checkNull(genericUtility.getColumnValueFromNode("curr_code", dom1.getElementsByTagName("Detail").item(i))); currCode=checkNull(genericUtility.getColumnValueFromNode("curr_code", dom.getElementsByTagName("Detail").item(i)));
System.out.println("currCode : "+currCode); System.out.println("currCode : "+currCode);
/*amtBs=checkNull(genericUtility.getColumnValueFromNode("amt_bs", dom.getElementsByTagName("Detail").item(i))); /*amtBs=checkNull(genericUtility.getColumnValueFromNode("amt_bs", dom.getElementsByTagName("Detail").item(i)));
System.out.println("amtBs : "+amtBs);*/ System.out.println("amtBs : "+amtBs);*/
tranType=checkNull(genericUtility.getColumnValueFromNode("tran_type", dom1.getElementsByTagName("Detail").item(i))); tranType=checkNull(genericUtility.getColumnValueFromNode("tran_type", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranType : "+tranType); System.out.println("tranType : "+tranType);
tranId=checkNull(genericUtility.getColumnValueFromNode("tran_id", dom1.getElementsByTagName("Detail").item(i))); tranId=checkNull(genericUtility.getColumnValueFromNode("tran_id", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranId : "+tranId); System.out.println("tranId : "+tranId);
refMode=checkNull(genericUtility.getColumnValueFromNode("ref_mode", dom1.getElementsByTagName("Detail").item(i))); refMode=checkNull(genericUtility.getColumnValueFromNode("ref_mode", dom.getElementsByTagName("Detail").item(i)));
System.out.println("refMode : "+refMode); System.out.println("refMode : "+refMode);
effDate=checkNull(genericUtility.getColumnValueFromNode("eff_date", dom1.getElementsByTagName("Detail").item(i))); effDate=checkNull(genericUtility.getColumnValueFromNode("eff_date", dom.getElementsByTagName("Detail").item(i)));
System.out.println("effDate : "+effDate); System.out.println("effDate : "+effDate);
statNo=checkNull(genericUtility.getColumnValueFromNode("stat_no", dom1.getElementsByTagName("Detail").item(i))); statNo=checkNull(genericUtility.getColumnValueFromNode("stat_no", dom.getElementsByTagName("Detail").item(i)));
System.out.println("statNo : "+statNo); System.out.println("statNo : "+statNo);
statDate=checkNull(genericUtility.getColumnValueFromNode("stat_date", dom1.getElementsByTagName("Detail").item(i))); statDate=checkNull(genericUtility.getColumnValueFromNode("stat_date", dom.getElementsByTagName("Detail").item(i)));
System.out.println("statDate : "+statDate); System.out.println("statDate : "+statDate);
amtAdj=checkNull(genericUtility.getColumnValueFromNode("amt_adj", dom1.getElementsByTagName("Detail").item(i))); amtAdj=checkNull(genericUtility.getColumnValueFromNode("amt_adj", dom.getElementsByTagName("Detail").item(i)));
System.out.println("amtAdj : "+amtAdj); System.out.println("amtAdj : "+amtAdj);
status=checkNull(genericUtility.getColumnValueFromNode("status", dom1.getElementsByTagName("Detail").item(i))); status=checkNull(genericUtility.getColumnValueFromNode("status", dom.getElementsByTagName("Detail").item(i)));
System.out.println("status : "+status); System.out.println("status : "+status);
exchRate=checkNull(genericUtility.getColumnValueFromNode("exch_rate", dom1.getElementsByTagName("Detail").item(i))); exchRate=checkNull(genericUtility.getColumnValueFromNode("exch_rate", dom.getElementsByTagName("Detail").item(i)));
System.out.println("exchRate : "+exchRate); System.out.println("exchRate : "+exchRate);
tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom1.getElementsByTagName("Detail").item(i))); tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranName : "+tranName); System.out.println("tranName : "+tranName);
siteCodeNew=checkNull(genericUtility.getColumnValueFromNode("site_code", dom1.getElementsByTagName("Detail").item(i))); siteCodeNew=checkNull(genericUtility.getColumnValueFromNode("site_code", dom.getElementsByTagName("Detail").item(i)));
System.out.println("siteCodeNew: "+siteCodeNew); System.out.println("siteCodeNew: "+siteCodeNew);
bankCodeNew=checkNull(genericUtility.getColumnValueFromNode("bank_code", dom1.getElementsByTagName("Detail").item(i))); bankCodeNew=checkNull(genericUtility.getColumnValueFromNode("bank_code", dom.getElementsByTagName("Detail").item(i)));
System.out.println("siteCodeNew: "+ bankCodeNew); System.out.println("bankCodeNew: "+ bankCodeNew);
} }
if(tranName.equalsIgnoreCase("bankTransaction")) if(tranName.equalsIgnoreCase("bankTransaction"))
{ {
System.out.println("in for: bankTransaction when filter is not none................"); System.out.println("in for: bankTransaction when filter is not none................");
refId=checkNull(genericUtility.getColumnValueFromNode("ref_no", dom1.getElementsByTagName("Detail").item(i))); refId=checkNull(genericUtility.getColumnValueFromNode("ref_no", dom.getElementsByTagName("Detail").item(i)));
System.out.println("refId : "+refId); System.out.println("refId : "+refId);
refDate=checkNull(genericUtility.getColumnValueFromNode("ref_date", dom1.getElementsByTagName("Detail").item(i))); refDate=checkNull(genericUtility.getColumnValueFromNode("ref_date", dom.getElementsByTagName("Detail").item(i)));
System.out.println("refDate : "+refDate); System.out.println("refDate : "+refDate);
amtBs=checkNull(genericUtility.getColumnValueFromNode("amt_bc", dom1.getElementsByTagName("Detail").item(i))); amtBs=checkNull(genericUtility.getColumnValueFromNode("amt_bc", dom.getElementsByTagName("Detail").item(i)));
System.out.println("amtBs : "+amtBs); System.out.println("amtBs : "+amtBs);
currCode=checkNull(genericUtility.getColumnValueFromNode("curr_code", dom1.getElementsByTagName("Detail").item(i))); currCode=checkNull(genericUtility.getColumnValueFromNode("curr_code", dom.getElementsByTagName("Detail").item(i)));
System.out.println("currCode : "+currCode); System.out.println("currCode : "+currCode);
amtBs=checkNull(genericUtility.getColumnValueFromNode("amt_bc", dom1.getElementsByTagName("Detail").item(i))); amtBs=checkNull(genericUtility.getColumnValueFromNode("amt_bc", dom.getElementsByTagName("Detail").item(i)));
System.out.println("amtBs : "+amtBs); System.out.println("amtBs : "+amtBs);
refMode=checkNull(genericUtility.getColumnValueFromNode("ref_mode", dom1.getElementsByTagName("Detail").item(i))); refMode=checkNull(genericUtility.getColumnValueFromNode("ref_mode", dom.getElementsByTagName("Detail").item(i)));
System.out.println("refMode : "+refMode); System.out.println("refMode : "+refMode);
tranId=checkNull(genericUtility.getColumnValueFromNode("tran_id", dom1.getElementsByTagName("Detail").item(i))); tranId=checkNull(genericUtility.getColumnValueFromNode("tran_id", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranId : "+tranId); System.out.println("tranId : "+tranId);
tranType=checkNull(genericUtility.getColumnValueFromNode("tran_type", dom1.getElementsByTagName("Detail").item(i))); tranType=checkNull(genericUtility.getColumnValueFromNode("tran_type", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranType : "+tranType); System.out.println("tranType : "+tranType);
acctCode=checkNull(genericUtility.getColumnValueFromNode("acct_code", dom1.getElementsByTagName("Detail").item(i))); acctCode=checkNull(genericUtility.getColumnValueFromNode("acct_code", dom.getElementsByTagName("Detail").item(i)));
System.out.println("acctCode : "+acctCode); System.out.println("acctCode : "+acctCode);
cctrCode=checkNull(genericUtility.getColumnValueFromNode("cctr_code", dom1.getElementsByTagName("Detail").item(i))); cctrCode=checkNull(genericUtility.getColumnValueFromNode("cctr_code", dom.getElementsByTagName("Detail").item(i)));
System.out.println("cctrCode : "+cctrCode); System.out.println("cctrCode : "+cctrCode);
sundryCode=checkNull(genericUtility.getColumnValueFromNode("sundry_code", dom1.getElementsByTagName("Detail").item(i))); sundryCode=checkNull(genericUtility.getColumnValueFromNode("sundry_code", dom.getElementsByTagName("Detail").item(i)));
System.out.println("sundryCode : "+sundryCode); System.out.println("sundryCode : "+sundryCode);
status=checkNull(genericUtility.getColumnValueFromNode("status", dom1.getElementsByTagName("Detail").item(i))); status=checkNull(genericUtility.getColumnValueFromNode("status", dom.getElementsByTagName("Detail").item(i)));
System.out.println("status : "+status); System.out.println("status : "+status);
exchRate=checkNull(genericUtility.getColumnValueFromNode("exch_rate", dom1.getElementsByTagName("Detail").item(i))); exchRate=checkNull(genericUtility.getColumnValueFromNode("exch_rate", dom.getElementsByTagName("Detail").item(i)));
System.out.println("exchRate : "+exchRate); System.out.println("exchRate : "+exchRate);
amtAdj=checkNull(genericUtility.getColumnValueFromNode("amt_adj", dom1.getElementsByTagName("Detail").item(i))); amtAdj=checkNull(genericUtility.getColumnValueFromNode("amt_adj", dom.getElementsByTagName("Detail").item(i)));
System.out.println("amtAdj : "+amtAdj); System.out.println("amtAdj : "+amtAdj);
tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom1.getElementsByTagName("Detail").item(i))); tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranName : "+tranName); System.out.println("tranName : "+tranName);
siteCodeNew=checkNull(genericUtility.getColumnValueFromNode("site_code", dom1.getElementsByTagName("Detail").item(i))); siteCodeNew=checkNull(genericUtility.getColumnValueFromNode("site_code", dom.getElementsByTagName("Detail").item(i)));
System.out.println("siteCodeNew: "+siteCodeNew); System.out.println("siteCodeNew: "+siteCodeNew);
bankCodeNew=checkNull(genericUtility.getColumnValueFromNode("bank_code", dom1.getElementsByTagName("Detail").item(i))); bankCodeNew=checkNull(genericUtility.getColumnValueFromNode("bank_code", dom.getElementsByTagName("Detail").item(i)));
System.out.println("siteCodeNew: "+ bankCodeNew); System.out.println("bankCodeNew: "+ bankCodeNew);
} }
rfDt = sdf1.parse(refDate);
Date rfDt = sdf1.parse(refDate);
System.out.println("formatted ref date:: " + rfDt); System.out.println("formatted ref date:: " + rfDt);
if(fromDate.length() > 0 && toDate.length() > 0){ //if(fromDate.length() > 0 && toDate.length() > 0){
System.out.println("from date not null:: "); //System.out.println("from date not null:: ");
if (((amtBs.trim().equalsIgnoreCase(filterData.trim()) && "amt_bc".equalsIgnoreCase(filterList.trim())) if (((amtBs.trim().equalsIgnoreCase(filterData.trim()) && "amt_bc".equalsIgnoreCase(filterList.trim()))
|| (refId.trim().equalsIgnoreCase(filterData.trim()) && "ref_no".equalsIgnoreCase(filterList.trim())) || (refId.trim().equalsIgnoreCase(filterData.trim()) && "ref_no".equalsIgnoreCase(filterList.trim()))
|| (refDate.trim().equalsIgnoreCase(filterData.trim()) && "ref_date".equalsIgnoreCase(filterList.trim()))) || (refDate.trim().equalsIgnoreCase(filterData.trim()) && "ref_date".equalsIgnoreCase(filterList.trim()))))
&& ((frDt.before(rfDt) || frDt.equals(rfDt)) && (toDt.after(rfDt) || toDt.equals(rfDt)))) //&& ((frDt.before(rfDt) || frDt.equals(rfDt)) && (toDt.after(rfDt) || toDt.equals(rfDt))))
{ {
System.out.println("Entering into filter data xml....."); System.out.println("Entering into filter data xml when filter is not none.....");
tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom1.getElementsByTagName("Detail").item(i))); tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranName : "+tranName); System.out.println("tranName : "+tranName);
if(tranName.equalsIgnoreCase("bankStatement")) if(tranName.equalsIgnoreCase("bankStatement"))
{ {
System.out.println("in if : bankStatement when filter is not none........"); System.out.println("in if : bankStatement when filter is not none........");
refId=checkNull(genericUtility.getColumnValueFromNode("ref_no", dom1.getElementsByTagName("Detail").item(i))); refId=checkNull(genericUtility.getColumnValueFromNode("ref_no", dom.getElementsByTagName("Detail").item(i)));
System.out.println("refId : "+refId); System.out.println("refId : "+refId);
tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom1.getElementsByTagName("Detail").item(i))); tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranName : "+tranName); System.out.println("tranName : "+tranName);
refDate=checkNull(genericUtility.getColumnValueFromNode("ref_date", dom1.getElementsByTagName("Detail").item(i))); refDate=checkNull(genericUtility.getColumnValueFromNode("ref_date", dom.getElementsByTagName("Detail").item(i)));
System.out.println("refDate : "+refDate); System.out.println("refDate : "+refDate);
tranType=checkNull(genericUtility.getColumnValueFromNode("tran_type", dom1.getElementsByTagName("Detail").item(i))); tranType=checkNull(genericUtility.getColumnValueFromNode("tran_type", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranType : "+tranType); System.out.println("tranType : "+tranType);
amtBs=checkNull(genericUtility.getColumnValueFromNode("amt_bc", dom1.getElementsByTagName("Detail").item(i))); amtBs=checkNull(genericUtility.getColumnValueFromNode("amt_bc", dom.getElementsByTagName("Detail").item(i)));
System.out.println("amtBs : "+amtBs); System.out.println("amtBs : "+amtBs);
currCode=checkNull(genericUtility.getColumnValueFromNode("curr_code", dom1.getElementsByTagName("Detail").item(i))); currCode=checkNull(genericUtility.getColumnValueFromNode("curr_code", dom.getElementsByTagName("Detail").item(i)));
System.out.println("currCode : "+currCode); System.out.println("currCode : "+currCode);
amtBs=checkNull(genericUtility.getColumnValueFromNode("amt_bs", dom1.getElementsByTagName("Detail").item(i))); amtBs=checkNull(genericUtility.getColumnValueFromNode("amt_bs", dom.getElementsByTagName("Detail").item(i)));
System.out.println("amtBs : "+amtBs); System.out.println("amtBs : "+amtBs);
tranType=checkNull(genericUtility.getColumnValueFromNode("tran_type", dom1.getElementsByTagName("Detail").item(i))); tranType=checkNull(genericUtility.getColumnValueFromNode("tran_type", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranType : "+tranType); System.out.println("tranType : "+tranType);
tranId=checkNull(genericUtility.getColumnValueFromNode("tran_id", dom1.getElementsByTagName("Detail").item(i))); tranId=checkNull(genericUtility.getColumnValueFromNode("tran_id", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranId : "+tranId); System.out.println("tranId : "+tranId);
refMode=checkNull(genericUtility.getColumnValueFromNode("ref_mode", dom1.getElementsByTagName("Detail").item(i))); refMode=checkNull(genericUtility.getColumnValueFromNode("ref_mode", dom.getElementsByTagName("Detail").item(i)));
System.out.println("refMode : "+refMode); System.out.println("refMode : "+refMode);
effDate=checkNull(genericUtility.getColumnValueFromNode("eff_date", dom1.getElementsByTagName("Detail").item(i))); effDate=checkNull(genericUtility.getColumnValueFromNode("eff_date", dom.getElementsByTagName("Detail").item(i)));
System.out.println("effDate : "+effDate); System.out.println("effDate : "+effDate);
statNo=checkNull(genericUtility.getColumnValueFromNode("stat_no", dom1.getElementsByTagName("Detail").item(i))); statNo=checkNull(genericUtility.getColumnValueFromNode("stat_no", dom.getElementsByTagName("Detail").item(i)));
System.out.println("statNo : "+statNo); System.out.println("statNo : "+statNo);
statDate=checkNull(genericUtility.getColumnValueFromNode("stat_date", dom1.getElementsByTagName("Detail").item(i))); statDate=checkNull(genericUtility.getColumnValueFromNode("stat_date", dom.getElementsByTagName("Detail").item(i)));
System.out.println("statDate : "+statDate); System.out.println("statDate : "+statDate);
amtAdj=checkNull(genericUtility.getColumnValueFromNode("amt_adj", dom1.getElementsByTagName("Detail").item(i))); amtAdj=checkNull(genericUtility.getColumnValueFromNode("amt_adj", dom.getElementsByTagName("Detail").item(i)));
System.out.println("amtAdj : "+amtAdj); System.out.println("amtAdj : "+amtAdj);
status=checkNull(genericUtility.getColumnValueFromNode("status", dom1.getElementsByTagName("Detail").item(i))); status=checkNull(genericUtility.getColumnValueFromNode("status", dom.getElementsByTagName("Detail").item(i)));
System.out.println("status : "+status); System.out.println("status : "+status);
exchRate=checkNull(genericUtility.getColumnValueFromNode("exch_rate", dom1.getElementsByTagName("Detail").item(i))); exchRate=checkNull(genericUtility.getColumnValueFromNode("exch_rate", dom.getElementsByTagName("Detail").item(i)));
System.out.println("exchRate : "+exchRate); System.out.println("exchRate : "+exchRate);
tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom1.getElementsByTagName("Detail").item(i))); tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranName : "+tranName); System.out.println("tranName : "+tranName);
siteCodeNew=checkNull(genericUtility.getColumnValueFromNode("site_code", dom1.getElementsByTagName("Detail").item(i))); siteCodeNew=checkNull(genericUtility.getColumnValueFromNode("site_code", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("siteCodeNew: "+siteCodeNew); System.out.println("siteCodeNew: "+siteCodeNew);
bankCodeNew=checkNull(genericUtility.getColumnValueFromNode("bank_code", dom1.getElementsByTagName("Detail").item(i))); bankCodeNew=checkNull(genericUtility.getColumnValueFromNode("bank_code", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("siteCodeNew: "+ bankCodeNew); System.out.println("bankCodeNew: "+ bankCodeNew);
} }
if(tranName.equalsIgnoreCase("bankTransaction")) if(tranName.equalsIgnoreCase("bankTransaction"))
{ {
System.out.println("in if bankTransaction when filter is not none........"); System.out.println("in if bankTransaction when filter is not none........");
refId=checkNull(genericUtility.getColumnValueFromNode("ref_no", dom1.getElementsByTagName("Detail").item(i))); refId=checkNull(genericUtility.getColumnValueFromNode("ref_no", dom.getElementsByTagName("Detail").item(i)));
System.out.println("refId : "+refId); System.out.println("refId : "+refId);
refDate=checkNull(genericUtility.getColumnValueFromNode("ref_date", dom1.getElementsByTagName("Detail").item(i))); refDate=checkNull(genericUtility.getColumnValueFromNode("ref_date", dom.getElementsByTagName("Detail").item(i)));
System.out.println("refDate : "+refDate); System.out.println("refDate : "+refDate);
amtBc=checkNull(genericUtility.getColumnValueFromNode("amt_bc", dom1.getElementsByTagName("Detail").item(i))); amtBc=checkNull(genericUtility.getColumnValueFromNode("amt_bc", dom.getElementsByTagName("Detail").item(i)));
System.out.println("amtBc : "+amtBc); System.out.println("amtBc : "+amtBc);
currCode=checkNull(genericUtility.getColumnValueFromNode("curr_code", dom1.getElementsByTagName("Detail").item(i))); currCode=checkNull(genericUtility.getColumnValueFromNode("curr_code", dom.getElementsByTagName("Detail").item(i)));
System.out.println("currCode : "+currCode); System.out.println("currCode : "+currCode);
amtBc=checkNull(genericUtility.getColumnValueFromNode("amt_bc", dom1.getElementsByTagName("Detail").item(i))); amtBc=checkNull(genericUtility.getColumnValueFromNode("amt_bc", dom.getElementsByTagName("Detail").item(i)));
System.out.println("amtBc : "+amtBc); System.out.println("amtBc : "+amtBc);
refMode=checkNull(genericUtility.getColumnValueFromNode("ref_mode", dom1.getElementsByTagName("Detail").item(i))); refMode=checkNull(genericUtility.getColumnValueFromNode("ref_mode", dom.getElementsByTagName("Detail").item(i)));
System.out.println("refMode : "+refMode); System.out.println("refMode : "+refMode);
tranId=checkNull(genericUtility.getColumnValueFromNode("tran_id", dom1.getElementsByTagName("Detail").item(i))); tranId=checkNull(genericUtility.getColumnValueFromNode("tran_id", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranId : "+tranId); System.out.println("tranId : "+tranId);
tranType=checkNull(genericUtility.getColumnValueFromNode("tran_type", dom1.getElementsByTagName("Detail").item(i))); tranType=checkNull(genericUtility.getColumnValueFromNode("tran_type", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranType : "+tranType); System.out.println("tranType : "+tranType);
acctCode=checkNull(genericUtility.getColumnValueFromNode("acct_code", dom1.getElementsByTagName("Detail").item(i))); acctCode=checkNull(genericUtility.getColumnValueFromNode("acct_code", dom.getElementsByTagName("Detail").item(i)));
System.out.println("acctCode : "+acctCode); System.out.println("acctCode : "+acctCode);
cctrCode=checkNull(genericUtility.getColumnValueFromNode("cctr_code", dom1.getElementsByTagName("Detail").item(i))); cctrCode=checkNull(genericUtility.getColumnValueFromNode("cctr_code", dom.getElementsByTagName("Detail").item(i)));
System.out.println("cctrCode : "+cctrCode); System.out.println("cctrCode : "+cctrCode);
sundryCode=checkNull(genericUtility.getColumnValueFromNode("sundry_code", dom1.getElementsByTagName("Detail").item(i))); sundryCode=checkNull(genericUtility.getColumnValueFromNode("sundry_code", dom.getElementsByTagName("Detail").item(i)));
System.out.println("sundryCode : "+sundryCode); System.out.println("sundryCode : "+sundryCode);
status=checkNull(genericUtility.getColumnValueFromNode("status", dom1.getElementsByTagName("Detail").item(i))); status=checkNull(genericUtility.getColumnValueFromNode("status", dom.getElementsByTagName("Detail").item(i)));
System.out.println("status : "+status); System.out.println("status : "+status);
exchRate=checkNull(genericUtility.getColumnValueFromNode("exch_rate", dom1.getElementsByTagName("Detail").item(i))); exchRate=checkNull(genericUtility.getColumnValueFromNode("exch_rate", dom.getElementsByTagName("Detail").item(i)));
System.out.println("exchRate : "+exchRate); System.out.println("exchRate : "+exchRate);
amtAdj=checkNull(genericUtility.getColumnValueFromNode("amt_adj", dom1.getElementsByTagName("Detail").item(i))); amtAdj=checkNull(genericUtility.getColumnValueFromNode("amt_adj", dom.getElementsByTagName("Detail").item(i)));
System.out.println("amtAdj : "+amtAdj); System.out.println("amtAdj : "+amtAdj);
tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom1.getElementsByTagName("Detail").item(i))); tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranName : "+tranName); System.out.println("tranName : "+tranName);
siteCodeNew=checkNull(genericUtility.getColumnValueFromNode("site_code", dom1.getElementsByTagName("Detail").item(i))); siteCodeNew=checkNull(genericUtility.getColumnValueFromNode("site_code", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("siteCodeNew: "+siteCodeNew); System.out.println("siteCodeNew: "+siteCodeNew);
bankCodeNew=checkNull(genericUtility.getColumnValueFromNode("bank_code", dom1.getElementsByTagName("Detail").item(i))); bankCodeNew=checkNull(genericUtility.getColumnValueFromNode("bank_code", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("siteCodeNew: "+ bankCodeNew); System.out.println("bankCodeNew: "+ bankCodeNew);
} }
filterXml.append("<Detail domID='1' selected='N'>"); filterXml.append("<Detail domID='1' selected='N'>");
System.out.println("record found::"); System.out.println("record found::");
if(tranName.equalsIgnoreCase("bankStatement")) if(tranName.equalsIgnoreCase("bankStatement"))
{ {
...@@ -3385,8 +3745,6 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -3385,8 +3745,6 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
filterXml.append("<tran_name>" + tranName+ "</tran_name>"); filterXml.append("<tran_name>" + tranName+ "</tran_name>");
filterXml.append("<site_code>" + siteCodeNew + "</site_code>"); filterXml.append("<site_code>" + siteCodeNew + "</site_code>");
filterXml.append("<bank_code>" + bankCodeNew + "</bank_code>"); filterXml.append("<bank_code>" + bankCodeNew + "</bank_code>");
} }
if(tranName.equalsIgnoreCase("bankTransaction")) if(tranName.equalsIgnoreCase("bankTransaction"))
{ {
...@@ -3407,136 +3765,102 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -3407,136 +3765,102 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
filterXml.append("<tran_name>" + tranName+ "</tran_name>"); filterXml.append("<tran_name>" + tranName+ "</tran_name>");
filterXml.append("<site_code>" + siteCodeNew + "</site_code>"); filterXml.append("<site_code>" + siteCodeNew + "</site_code>");
filterXml.append("<bank_code>" + bankCodeNew + "</bank_code>"); filterXml.append("<bank_code>" + bankCodeNew + "</bank_code>");
} }
filterXml.append("</Detail>"); filterXml.append("</Detail>");
//filterXml.append("<cnt>1</cnt>");
// filterXml.append("</Detail2>");
// filterXml.append("</Root>");
System.out.println("filterXm: :"+filterXml); System.out.println("filterXm: :"+filterXml);
//break;
}// end of if checking equality condition of ref id }// end of if checking equality condition of ref id
}//from date and to date not null //}//from date and to date not null
else if("ref_date".equalsIgnoreCase(filterList)) { else if("ref_date".equalsIgnoreCase(filterList) && fromDate.length() == 0) {
if((amtBs.trim().equalsIgnoreCase(filterData.trim()) && "amt_bc".equalsIgnoreCase(filterList.trim()))
if(
(amtBs.trim().equalsIgnoreCase(filterData.trim()) && "amt_bc".equalsIgnoreCase(filterList.trim()))
|| (refId.trim().equalsIgnoreCase(filterData.trim()) && "ref_no".equalsIgnoreCase(filterList.trim())) || (refId.trim().equalsIgnoreCase(filterData.trim()) && "ref_no".equalsIgnoreCase(filterList.trim()))
|| (filDt.equals(rfDt) && "ref_date".equalsIgnoreCase(filterList.trim())) || (filDt.equals(rfDt) && "ref_date".equalsIgnoreCase(filterList.trim())))
)
{ {
System.out.println("Entering into filter data xml..when filter is ref date.");
System.out.println("Entering into filter data xml... from date and to date is null.."); tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom.getElementsByTagName("Detail").item(i)));
tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("tranName : "+tranName); System.out.println("tranName : "+tranName);
if(tranName.equalsIgnoreCase("in else if bankStatement when filter is not none...")) if(tranName.equalsIgnoreCase("in else if bankStatement when filter is ref date..."))
{ {
System.out.println("bankStatement........"); System.out.println("bankStatement........");
refId=checkNull(genericUtility.getColumnValueFromNode("ref_no", dom1.getElementsByTagName("Detail").item(i))); refId=checkNull(genericUtility.getColumnValueFromNode("ref_no", dom.getElementsByTagName("Detail").item(i)));
System.out.println("refId : "+refId); System.out.println("refId : "+refId);
tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom1.getElementsByTagName("Detail").item(i))); tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranName : "+tranName); System.out.println("tranName : "+tranName);
refDate=checkNull(genericUtility.getColumnValueFromNode("ref_date", dom1.getElementsByTagName("Detail").item(i))); refDate=checkNull(genericUtility.getColumnValueFromNode("ref_date", dom.getElementsByTagName("Detail").item(i)));
System.out.println("refDate : "+refDate); System.out.println("refDate : "+refDate);
tranType=checkNull(genericUtility.getColumnValueFromNode("tran_type", dom1.getElementsByTagName("Detail").item(i))); tranType=checkNull(genericUtility.getColumnValueFromNode("tran_type", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranType : "+tranType); System.out.println("tranType : "+tranType);
amtBs=checkNull(genericUtility.getColumnValueFromNode("amt_bc", dom1.getElementsByTagName("Detail").item(i))); amtBs=checkNull(genericUtility.getColumnValueFromNode("amt_bc", dom.getElementsByTagName("Detail").item(i)));
System.out.println("amtBs : "+amtBs); System.out.println("amtBs : "+amtBs);
currCode=checkNull(genericUtility.getColumnValueFromNode("curr_code", dom1.getElementsByTagName("Detail").item(i))); currCode=checkNull(genericUtility.getColumnValueFromNode("curr_code", dom.getElementsByTagName("Detail").item(i)));
System.out.println("currCode : "+currCode); System.out.println("currCode : "+currCode);
amtBs=checkNull(genericUtility.getColumnValueFromNode("amt_bs", dom1.getElementsByTagName("Detail").item(i))); amtBs=checkNull(genericUtility.getColumnValueFromNode("amt_bs", dom.getElementsByTagName("Detail").item(i)));
System.out.println("amtBs : "+amtBs); System.out.println("amtBs : "+amtBs);
tranType=checkNull(genericUtility.getColumnValueFromNode("tran_type", dom1.getElementsByTagName("Detail").item(i))); tranType=checkNull(genericUtility.getColumnValueFromNode("tran_type", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranType : "+tranType); System.out.println("tranType : "+tranType);
tranId=checkNull(genericUtility.getColumnValueFromNode("tran_id", dom1.getElementsByTagName("Detail").item(i))); tranId=checkNull(genericUtility.getColumnValueFromNode("tran_id", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranId : "+tranId); System.out.println("tranId : "+tranId);
refMode=checkNull(genericUtility.getColumnValueFromNode("ref_mode", dom1.getElementsByTagName("Detail").item(i))); refMode=checkNull(genericUtility.getColumnValueFromNode("ref_mode", dom.getElementsByTagName("Detail").item(i)));
System.out.println("refMode : "+refMode); System.out.println("refMode : "+refMode);
effDate=checkNull(genericUtility.getColumnValueFromNode("eff_date", dom1.getElementsByTagName("Detail").item(i))); effDate=checkNull(genericUtility.getColumnValueFromNode("eff_date", dom.getElementsByTagName("Detail").item(i)));
System.out.println("effDate : "+effDate); System.out.println("effDate : "+effDate);
statNo=checkNull(genericUtility.getColumnValueFromNode("stat_no", dom1.getElementsByTagName("Detail").item(i))); statNo=checkNull(genericUtility.getColumnValueFromNode("stat_no", dom.getElementsByTagName("Detail").item(i)));
System.out.println("statNo : "+statNo); System.out.println("statNo : "+statNo);
statDate=checkNull(genericUtility.getColumnValueFromNode("stat_date", dom1.getElementsByTagName("Detail").item(i))); statDate=checkNull(genericUtility.getColumnValueFromNode("stat_date", dom.getElementsByTagName("Detail").item(i)));
System.out.println("statDate : "+statDate); System.out.println("statDate : "+statDate);
amtAdj=checkNull(genericUtility.getColumnValueFromNode("amt_adj", dom1.getElementsByTagName("Detail").item(i))); amtAdj=checkNull(genericUtility.getColumnValueFromNode("amt_adj", dom.getElementsByTagName("Detail").item(i)));
System.out.println("amtAdj : "+amtAdj); System.out.println("amtAdj : "+amtAdj);
status=checkNull(genericUtility.getColumnValueFromNode("status", dom1.getElementsByTagName("Detail").item(i))); status=checkNull(genericUtility.getColumnValueFromNode("status", dom.getElementsByTagName("Detail").item(i)));
System.out.println("status : "+status); System.out.println("status : "+status);
exchRate=checkNull(genericUtility.getColumnValueFromNode("exch_rate", dom1.getElementsByTagName("Detail").item(i))); exchRate=checkNull(genericUtility.getColumnValueFromNode("exch_rate", dom.getElementsByTagName("Detail").item(i)));
System.out.println("exchRate : "+exchRate); System.out.println("exchRate : "+exchRate);
tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom1.getElementsByTagName("Detail").item(i))); tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranName : "+tranName); System.out.println("tranName : "+tranName);
siteCodeNew=checkNull(genericUtility.getColumnValueFromNode("site_code", dom1.getElementsByTagName("Detail").item(i))); siteCodeNew=checkNull(genericUtility.getColumnValueFromNode("site_code", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("siteCodeNew: "+siteCodeNew); System.out.println("siteCodeNew: "+siteCodeNew);
bankCodeNew=checkNull(genericUtility.getColumnValueFromNode("bank_code", dom1.getElementsByTagName("Detail").item(i))); bankCodeNew=checkNull(genericUtility.getColumnValueFromNode("bank_code", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("siteCodeNew: "+ bankCodeNew); System.out.println("bankCodeNew: "+ bankCodeNew);
} }
if(tranName.equalsIgnoreCase("bankTransaction")) if(tranName.equalsIgnoreCase("bankTransaction"))
{ {
System.out.println("in else if bankTransaction when filter is not none........"); System.out.println("in else if bankTransaction when filter is ref date........");
refId=checkNull(genericUtility.getColumnValueFromNode("ref_no", dom1.getElementsByTagName("Detail").item(i))); refId=checkNull(genericUtility.getColumnValueFromNode("ref_no", dom.getElementsByTagName("Detail").item(i)));
System.out.println("refId : "+refId); System.out.println("refId : "+refId);
refDate=checkNull(genericUtility.getColumnValueFromNode("ref_date", dom1.getElementsByTagName("Detail").item(i))); refDate=checkNull(genericUtility.getColumnValueFromNode("ref_date", dom.getElementsByTagName("Detail").item(i)));
System.out.println("refDate : "+refDate); System.out.println("refDate : "+refDate);
amtBc=checkNull(genericUtility.getColumnValueFromNode("amt_bc", dom1.getElementsByTagName("Detail").item(i))); amtBc=checkNull(genericUtility.getColumnValueFromNode("amt_bc", dom.getElementsByTagName("Detail").item(i)));
System.out.println("amtBc : "+amtBc); System.out.println("amtBc : "+amtBc);
currCode=checkNull(genericUtility.getColumnValueFromNode("curr_code", dom1.getElementsByTagName("Detail").item(i))); currCode=checkNull(genericUtility.getColumnValueFromNode("curr_code", dom.getElementsByTagName("Detail").item(i)));
System.out.println("currCode : "+currCode); System.out.println("currCode : "+currCode);
amtBc=checkNull(genericUtility.getColumnValueFromNode("amt_bc", dom1.getElementsByTagName("Detail").item(i))); amtBc=checkNull(genericUtility.getColumnValueFromNode("amt_bc", dom.getElementsByTagName("Detail").item(i)));
System.out.println("amtBc : "+amtBc); System.out.println("amtBc : "+amtBc);
refMode=checkNull(genericUtility.getColumnValueFromNode("ref_mode", dom1.getElementsByTagName("Detail").item(i))); refMode=checkNull(genericUtility.getColumnValueFromNode("ref_mode", dom.getElementsByTagName("Detail").item(i)));
System.out.println("refMode : "+refMode); System.out.println("refMode : "+refMode);
tranId=checkNull(genericUtility.getColumnValueFromNode("tran_id", dom1.getElementsByTagName("Detail").item(i))); tranId=checkNull(genericUtility.getColumnValueFromNode("tran_id", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranId : "+tranId); System.out.println("tranId : "+tranId);
tranType=checkNull(genericUtility.getColumnValueFromNode("tran_type", dom1.getElementsByTagName("Detail").item(i))); tranType=checkNull(genericUtility.getColumnValueFromNode("tran_type", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranType : "+tranType); System.out.println("tranType : "+tranType);
acctCode=checkNull(genericUtility.getColumnValueFromNode("acct_code", dom1.getElementsByTagName("Detail").item(i))); acctCode=checkNull(genericUtility.getColumnValueFromNode("acct_code", dom.getElementsByTagName("Detail").item(i)));
System.out.println("acctCode : "+acctCode); System.out.println("acctCode : "+acctCode);
cctrCode=checkNull(genericUtility.getColumnValueFromNode("cctr_code", dom1.getElementsByTagName("Detail").item(i))); cctrCode=checkNull(genericUtility.getColumnValueFromNode("cctr_code", dom.getElementsByTagName("Detail").item(i)));
System.out.println("cctrCode : "+cctrCode); System.out.println("cctrCode : "+cctrCode);
sundryCode=checkNull(genericUtility.getColumnValueFromNode("sundry_code", dom1.getElementsByTagName("Detail").item(i))); sundryCode=checkNull(genericUtility.getColumnValueFromNode("sundry_code", dom.getElementsByTagName("Detail").item(i)));
System.out.println("sundryCode : "+sundryCode); System.out.println("sundryCode : "+sundryCode);
status=checkNull(genericUtility.getColumnValueFromNode("status", dom1.getElementsByTagName("Detail").item(i))); status=checkNull(genericUtility.getColumnValueFromNode("status", dom.getElementsByTagName("Detail").item(i)));
System.out.println("status : "+status); System.out.println("status : "+status);
exchRate=checkNull(genericUtility.getColumnValueFromNode("exch_rate", dom1.getElementsByTagName("Detail").item(i))); exchRate=checkNull(genericUtility.getColumnValueFromNode("exch_rate", dom.getElementsByTagName("Detail").item(i)));
System.out.println("exchRate : "+exchRate); System.out.println("exchRate : "+exchRate);
amtAdj=checkNull(genericUtility.getColumnValueFromNode("amt_adj", dom1.getElementsByTagName("Detail").item(i))); amtAdj=checkNull(genericUtility.getColumnValueFromNode("amt_adj", dom.getElementsByTagName("Detail").item(i)));
System.out.println("amtAdj : "+amtAdj); System.out.println("amtAdj : "+amtAdj);
tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom1.getElementsByTagName("Detail").item(i))); tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranName : "+tranName); System.out.println("tranName : "+tranName);
siteCodeNew=checkNull(genericUtility.getColumnValueFromNode("site_code", dom1.getElementsByTagName("Detail").item(i))); siteCodeNew=checkNull(genericUtility.getColumnValueFromNode("site_code", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("siteCodeNew: "+siteCodeNew); System.out.println("siteCodeNew: "+siteCodeNew);
bankCodeNew=checkNull(genericUtility.getColumnValueFromNode("bank_code", dom1.getElementsByTagName("Detail").item(i))); bankCodeNew=checkNull(genericUtility.getColumnValueFromNode("bank_code", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("siteCodeNew: "+ bankCodeNew); System.out.println("bankCodeNew: "+ bankCodeNew);
} }
filterXml.append("<Detail domID='1' selected='N'>"); filterXml.append("<Detail domID='1' selected='N'>");
System.out.println("record found::"); System.out.println("record found::");
if(tranName.equalsIgnoreCase("bankStatement")) if(tranName.equalsIgnoreCase("bankStatement"))
{ {
...@@ -3559,8 +3883,6 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -3559,8 +3883,6 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
filterXml.append("<tran_name>" + tranName+ "</tran_name>"); filterXml.append("<tran_name>" + tranName+ "</tran_name>");
filterXml.append("<site_code>" + siteCodeNew + "</site_code>"); filterXml.append("<site_code>" + siteCodeNew + "</site_code>");
filterXml.append("<bank_code>" + bankCodeNew + "</bank_code>"); filterXml.append("<bank_code>" + bankCodeNew + "</bank_code>");
} }
if(tranName.equalsIgnoreCase("bankTransaction")) if(tranName.equalsIgnoreCase("bankTransaction"))
{ {
...@@ -3581,129 +3903,99 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -3581,129 +3903,99 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
filterXml.append("<tran_name>" + tranName+ "</tran_name>"); filterXml.append("<tran_name>" + tranName+ "</tran_name>");
filterXml.append("<site_code>" + siteCodeNew + "</site_code>"); filterXml.append("<site_code>" + siteCodeNew + "</site_code>");
filterXml.append("<bank_code>" + bankCodeNew + "</bank_code>"); filterXml.append("<bank_code>" + bankCodeNew + "</bank_code>");
} }
filterXml.append("</Detail>"); filterXml.append("</Detail>");
//filterXml.append("<cnt>1</cnt>");
// filterXml.append("</Detail2>");
// filterXml.append("</Root>");
System.out.println("filterXm: :"+filterXml); System.out.println("filterXm: :"+filterXml);
//break;
} }
}else{ }else{
if((amtBs.trim().equalsIgnoreCase(filterData.trim()) && "amt_bc".equalsIgnoreCase(filterList.trim())) if((amtBs.trim().equalsIgnoreCase(filterData.trim()) && "amt_bc".equalsIgnoreCase(filterList.trim()))
|| (refId.trim().equalsIgnoreCase(filterData.trim()) && "ref_no".equalsIgnoreCase(filterList.trim())) || (refId.trim().equalsIgnoreCase(filterData.trim()) && "ref_no".equalsIgnoreCase(filterList.trim()))
|| (refDate.trim().equalsIgnoreCase(filterData.trim()) && "ref_date".equalsIgnoreCase(filterList.trim()))) || (refDate.trim().equalsIgnoreCase(filterData.trim()) && "ref_date".equalsIgnoreCase(filterList.trim())))
{ {
System.out.println("Entering into filter data xml... ");
System.out.println("Entering into filter data xml... from date and to date is null.."); tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom.getElementsByTagName("Detail").item(i)));
tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("tranName : "+tranName); System.out.println("tranName : "+tranName);
if(tranName.equalsIgnoreCase("in else if bankStatement when filter is not none...")) if(tranName.equalsIgnoreCase("in else if bankStatement when filter is not none..."))
{ {
System.out.println("bankStatement........"); System.out.println("bankStatement........");
refId=checkNull(genericUtility.getColumnValueFromNode("ref_no", dom1.getElementsByTagName("Detail").item(i))); refId=checkNull(genericUtility.getColumnValueFromNode("ref_no", dom.getElementsByTagName("Detail").item(i)));
System.out.println("refId : "+refId); System.out.println("refId : "+refId);
tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom1.getElementsByTagName("Detail").item(i))); tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranName : "+tranName); System.out.println("tranName : "+tranName);
refDate=checkNull(genericUtility.getColumnValueFromNode("ref_date", dom1.getElementsByTagName("Detail").item(i))); refDate=checkNull(genericUtility.getColumnValueFromNode("ref_date", dom.getElementsByTagName("Detail").item(i)));
System.out.println("refDate : "+refDate); System.out.println("refDate : "+refDate);
tranType=checkNull(genericUtility.getColumnValueFromNode("tran_type", dom1.getElementsByTagName("Detail").item(i))); tranType=checkNull(genericUtility.getColumnValueFromNode("tran_type", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranType : "+tranType); System.out.println("tranType : "+tranType);
amtBs=checkNull(genericUtility.getColumnValueFromNode("amt_bc", dom1.getElementsByTagName("Detail").item(i))); amtBs=checkNull(genericUtility.getColumnValueFromNode("amt_bc", dom.getElementsByTagName("Detail").item(i)));
System.out.println("amtBs : "+amtBs); System.out.println("amtBs : "+amtBs);
currCode=checkNull(genericUtility.getColumnValueFromNode("curr_code", dom1.getElementsByTagName("Detail").item(i))); currCode=checkNull(genericUtility.getColumnValueFromNode("curr_code", dom.getElementsByTagName("Detail").item(i)));
System.out.println("currCode : "+currCode); System.out.println("currCode : "+currCode);
amtBs=checkNull(genericUtility.getColumnValueFromNode("amt_bs", dom1.getElementsByTagName("Detail").item(i))); amtBs=checkNull(genericUtility.getColumnValueFromNode("amt_bs", dom.getElementsByTagName("Detail").item(i)));
System.out.println("amtBs : "+amtBs); System.out.println("amtBs : "+amtBs);
tranType=checkNull(genericUtility.getColumnValueFromNode("tran_type", dom1.getElementsByTagName("Detail").item(i))); tranType=checkNull(genericUtility.getColumnValueFromNode("tran_type", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranType : "+tranType); System.out.println("tranType : "+tranType);
tranId=checkNull(genericUtility.getColumnValueFromNode("tran_id", dom1.getElementsByTagName("Detail").item(i))); tranId=checkNull(genericUtility.getColumnValueFromNode("tran_id", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranId : "+tranId); System.out.println("tranId : "+tranId);
refMode=checkNull(genericUtility.getColumnValueFromNode("ref_mode", dom1.getElementsByTagName("Detail").item(i))); refMode=checkNull(genericUtility.getColumnValueFromNode("ref_mode", dom.getElementsByTagName("Detail").item(i)));
System.out.println("refMode : "+refMode); System.out.println("refMode : "+refMode);
effDate=checkNull(genericUtility.getColumnValueFromNode("eff_date", dom1.getElementsByTagName("Detail").item(i))); effDate=checkNull(genericUtility.getColumnValueFromNode("eff_date", dom.getElementsByTagName("Detail").item(i)));
System.out.println("effDate : "+effDate); System.out.println("effDate : "+effDate);
statNo=checkNull(genericUtility.getColumnValueFromNode("stat_no", dom1.getElementsByTagName("Detail").item(i))); statNo=checkNull(genericUtility.getColumnValueFromNode("stat_no", dom.getElementsByTagName("Detail").item(i)));
System.out.println("statNo : "+statNo); System.out.println("statNo : "+statNo);
statDate=checkNull(genericUtility.getColumnValueFromNode("stat_date", dom1.getElementsByTagName("Detail").item(i))); statDate=checkNull(genericUtility.getColumnValueFromNode("stat_date", dom.getElementsByTagName("Detail").item(i)));
System.out.println("statDate : "+statDate); System.out.println("statDate : "+statDate);
amtAdj=checkNull(genericUtility.getColumnValueFromNode("amt_adj", dom1.getElementsByTagName("Detail").item(i))); amtAdj=checkNull(genericUtility.getColumnValueFromNode("amt_adj", dom.getElementsByTagName("Detail").item(i)));
System.out.println("amtAdj : "+amtAdj); System.out.println("amtAdj : "+amtAdj);
status=checkNull(genericUtility.getColumnValueFromNode("status", dom1.getElementsByTagName("Detail").item(i))); status=checkNull(genericUtility.getColumnValueFromNode("status", dom.getElementsByTagName("Detail").item(i)));
System.out.println("status : "+status); System.out.println("status : "+status);
exchRate=checkNull(genericUtility.getColumnValueFromNode("exch_rate", dom1.getElementsByTagName("Detail").item(i))); exchRate=checkNull(genericUtility.getColumnValueFromNode("exch_rate", dom.getElementsByTagName("Detail").item(i)));
System.out.println("exchRate : "+exchRate); System.out.println("exchRate : "+exchRate);
tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom1.getElementsByTagName("Detail").item(i))); tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranName : "+tranName); System.out.println("tranName : "+tranName);
siteCodeNew=checkNull(genericUtility.getColumnValueFromNode("site_code", dom1.getElementsByTagName("Detail").item(i))); siteCodeNew=checkNull(genericUtility.getColumnValueFromNode("site_code", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("siteCodeNew: "+siteCodeNew); System.out.println("siteCodeNew: "+siteCodeNew);
bankCodeNew=checkNull(genericUtility.getColumnValueFromNode("bank_code", dom1.getElementsByTagName("Detail").item(i))); bankCodeNew=checkNull(genericUtility.getColumnValueFromNode("bank_code", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("siteCodeNew: "+ bankCodeNew); System.out.println("bankCodeNew: "+ bankCodeNew);
} }
if(tranName.equalsIgnoreCase("bankTransaction")) if(tranName.equalsIgnoreCase("bankTransaction"))
{ {
System.out.println("in else if bankTransaction when filter is not none........"); System.out.println("in else if bankTransaction when filter is not none........");
refId=checkNull(genericUtility.getColumnValueFromNode("ref_no", dom1.getElementsByTagName("Detail").item(i))); refId=checkNull(genericUtility.getColumnValueFromNode("ref_no", dom.getElementsByTagName("Detail").item(i)));
System.out.println("refId : "+refId); System.out.println("refId : "+refId);
refDate=checkNull(genericUtility.getColumnValueFromNode("ref_date", dom1.getElementsByTagName("Detail").item(i))); refDate=checkNull(genericUtility.getColumnValueFromNode("ref_date", dom.getElementsByTagName("Detail").item(i)));
System.out.println("refDate : "+refDate); System.out.println("refDate : "+refDate);
amtBc=checkNull(genericUtility.getColumnValueFromNode("amt_bc", dom1.getElementsByTagName("Detail").item(i))); amtBc=checkNull(genericUtility.getColumnValueFromNode("amt_bc", dom.getElementsByTagName("Detail").item(i)));
System.out.println("amtBc : "+amtBc); System.out.println("amtBc : "+amtBc);
currCode=checkNull(genericUtility.getColumnValueFromNode("curr_code", dom1.getElementsByTagName("Detail").item(i))); currCode=checkNull(genericUtility.getColumnValueFromNode("curr_code", dom.getElementsByTagName("Detail").item(i)));
System.out.println("currCode : "+currCode); System.out.println("currCode : "+currCode);
amtBc=checkNull(genericUtility.getColumnValueFromNode("amt_bc", dom1.getElementsByTagName("Detail").item(i))); amtBc=checkNull(genericUtility.getColumnValueFromNode("amt_bc", dom.getElementsByTagName("Detail").item(i)));
System.out.println("amtBc : "+amtBc); System.out.println("amtBc : "+amtBc);
refMode=checkNull(genericUtility.getColumnValueFromNode("ref_mode", dom1.getElementsByTagName("Detail").item(i))); refMode=checkNull(genericUtility.getColumnValueFromNode("ref_mode", dom.getElementsByTagName("Detail").item(i)));
System.out.println("refMode : "+refMode); System.out.println("refMode : "+refMode);
tranId=checkNull(genericUtility.getColumnValueFromNode("tran_id", dom1.getElementsByTagName("Detail").item(i))); tranId=checkNull(genericUtility.getColumnValueFromNode("tran_id", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranId : "+tranId); System.out.println("tranId : "+tranId);
tranType=checkNull(genericUtility.getColumnValueFromNode("tran_type", dom1.getElementsByTagName("Detail").item(i))); tranType=checkNull(genericUtility.getColumnValueFromNode("tran_type", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranType : "+tranType); System.out.println("tranType : "+tranType);
acctCode=checkNull(genericUtility.getColumnValueFromNode("acct_code", dom1.getElementsByTagName("Detail").item(i))); acctCode=checkNull(genericUtility.getColumnValueFromNode("acct_code", dom.getElementsByTagName("Detail").item(i)));
System.out.println("acctCode : "+acctCode); System.out.println("acctCode : "+acctCode);
cctrCode=checkNull(genericUtility.getColumnValueFromNode("cctr_code", dom1.getElementsByTagName("Detail").item(i))); cctrCode=checkNull(genericUtility.getColumnValueFromNode("cctr_code", dom.getElementsByTagName("Detail").item(i)));
System.out.println("cctrCode : "+cctrCode); System.out.println("cctrCode : "+cctrCode);
sundryCode=checkNull(genericUtility.getColumnValueFromNode("sundry_code", dom1.getElementsByTagName("Detail").item(i))); sundryCode=checkNull(genericUtility.getColumnValueFromNode("sundry_code", dom.getElementsByTagName("Detail").item(i)));
System.out.println("sundryCode : "+sundryCode); System.out.println("sundryCode : "+sundryCode);
status=checkNull(genericUtility.getColumnValueFromNode("status", dom1.getElementsByTagName("Detail").item(i))); status=checkNull(genericUtility.getColumnValueFromNode("status", dom.getElementsByTagName("Detail").item(i)));
System.out.println("status : "+status); System.out.println("status : "+status);
exchRate=checkNull(genericUtility.getColumnValueFromNode("exch_rate", dom1.getElementsByTagName("Detail").item(i))); exchRate=checkNull(genericUtility.getColumnValueFromNode("exch_rate", dom.getElementsByTagName("Detail").item(i)));
System.out.println("exchRate : "+exchRate); System.out.println("exchRate : "+exchRate);
amtAdj=checkNull(genericUtility.getColumnValueFromNode("amt_adj", dom1.getElementsByTagName("Detail").item(i))); amtAdj=checkNull(genericUtility.getColumnValueFromNode("amt_adj", dom.getElementsByTagName("Detail").item(i)));
System.out.println("amtAdj : "+amtAdj); System.out.println("amtAdj : "+amtAdj);
tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom1.getElementsByTagName("Detail").item(i))); tranName=checkNull(genericUtility.getColumnValueFromNode("tran_name", dom.getElementsByTagName("Detail").item(i)));
System.out.println("tranName : "+tranName); System.out.println("tranName : "+tranName);
siteCodeNew=checkNull(genericUtility.getColumnValueFromNode("site_code", dom1.getElementsByTagName("Detail").item(i))); siteCodeNew=checkNull(genericUtility.getColumnValueFromNode("site_code", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("siteCodeNew: "+siteCodeNew); System.out.println("siteCodeNew: "+siteCodeNew);
bankCodeNew=checkNull(genericUtility.getColumnValueFromNode("bank_code", dom1.getElementsByTagName("Detail").item(i))); bankCodeNew=checkNull(genericUtility.getColumnValueFromNode("bank_code", dom1.getElementsByTagName("Detail").item(i)));
System.out.println("siteCodeNew: "+ bankCodeNew); System.out.println("bankCodeNew: "+ bankCodeNew);
} }
filterXml.append("<Detail domID='1' selected='N'>"); filterXml.append("<Detail domID='1' selected='N'>");
...@@ -3729,8 +4021,6 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -3729,8 +4021,6 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
filterXml.append("<tran_name>" + tranName+ "</tran_name>"); filterXml.append("<tran_name>" + tranName+ "</tran_name>");
filterXml.append("<site_code>" + siteCodeNew + "</site_code>"); filterXml.append("<site_code>" + siteCodeNew + "</site_code>");
filterXml.append("<bank_code>" + bankCodeNew + "</bank_code>"); filterXml.append("<bank_code>" + bankCodeNew + "</bank_code>");
} }
if(tranName.equalsIgnoreCase("bankTransaction")) if(tranName.equalsIgnoreCase("bankTransaction"))
{ {
...@@ -3751,32 +4041,14 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -3751,32 +4041,14 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
filterXml.append("<tran_name>" + tranName+ "</tran_name>"); filterXml.append("<tran_name>" + tranName+ "</tran_name>");
filterXml.append("<site_code>" + siteCodeNew + "</site_code>"); filterXml.append("<site_code>" + siteCodeNew + "</site_code>");
filterXml.append("<bank_code>" + bankCodeNew + "</bank_code>"); filterXml.append("<bank_code>" + bankCodeNew + "</bank_code>");
} }
filterXml.append("</Detail>"); filterXml.append("</Detail>");
//filterXml.append("<cnt>1</cnt>");
// filterXml.append("</Detail2>");
// filterXml.append("</Root>");
System.out.println("filterXm: :"+filterXml); System.out.println("filterXm: :"+filterXml);
//break;
} }
} }
}//end of for loop }//end of for loop
} }
filterXml.append("</Detail2>"); filterXml.append("</Detail2>");
resultString = filterXml.toString(); resultString = filterXml.toString();
System.out.println("resultString>>>>>>>>>>> :"+resultString); System.out.println("resultString>>>>>>>>>>> :"+resultString);
......
webitm-fin/ibase/webitm/ejb/fin/MiscVoucherPostSave.java
View file @ 14bc9e70
...@@ -285,6 +285,7 @@ public class MiscVoucherPostSave extends ValidatorEJB implements MiscVoucherPost ...@@ -285,6 +285,7 @@ public class MiscVoucherPostSave extends ValidatorEJB implements MiscVoucherPost
String sql = "", varValue = "",tranId = "", refSer = "", refNo = ""; String sql = "", varValue = "",tranId = "", refSer = "", refNo = "";
double totAmtPayAbs = 0.0, adjAmtPayAbs = 0.0, adjAmt = 0.0, totAmtTemp = 0.0; double totAmtPayAbs = 0.0, adjAmtPayAbs = 0.0, adjAmt = 0.0, totAmtTemp = 0.0;
double totAmtPay = 0.0, adjAmtPay = 0.0, adjAmtAbs = 0.0; double totAmtPay = 0.0, adjAmtPay = 0.0, adjAmtAbs = 0.0;
String currCodePay = "", acctCode = "",cctrCode = "", exchRate = "";
int lineNo = 1; int lineNo = 1;
try { try {
...@@ -308,7 +309,7 @@ public class MiscVoucherPostSave extends ValidatorEJB implements MiscVoucherPost ...@@ -308,7 +309,7 @@ public class MiscVoucherPostSave extends ValidatorEJB implements MiscVoucherPost
System.out.println("var value ::: " + varValue); System.out.println("var value ::: " + varValue);
sql = "select tran_id,tran_ser,ref_no,tot_amt,adj_amt from misc_payables where site_code = ? and sundry_type = ? and sundry_code = ? " + sql = "select tran_id,tran_ser,ref_no,tot_amt,adj_amt,curr_code,acct_code,cctr_code,exch_rate from misc_payables where site_code = ? and sundry_type = ? and sundry_code = ? " +
"and tot_amt <> adj_amt and tot_amt < 0 and acct_code in ("+ varValue + ") order by tran_date"; "and tot_amt <> adj_amt and tot_amt < 0 and acct_code in ("+ varValue + ") order by tran_date";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, siteCode); pstmt.setString(1, siteCode);
...@@ -324,8 +325,12 @@ public class MiscVoucherPostSave extends ValidatorEJB implements MiscVoucherPost ...@@ -324,8 +325,12 @@ public class MiscVoucherPostSave extends ValidatorEJB implements MiscVoucherPost
adjAmtPay = rs.getDouble("adj_amt"); adjAmtPay = rs.getDouble("adj_amt");
totAmtPayAbs = Math.abs(rs.getDouble("tot_amt")); totAmtPayAbs = Math.abs(rs.getDouble("tot_amt"));
adjAmtPayAbs = Math.abs(rs.getDouble("adj_amt")); adjAmtPayAbs = Math.abs(rs.getDouble("adj_amt"));
currCodePay = checkNullAndTrim(rs.getString("curr_code"));
acctCode = checkNullAndTrim(rs.getString("acct_code"));
cctrCode = checkNullAndTrim(rs.getString("cctr_code"));
exchRate = checkNullAndTrim(rs.getString("exch_rate"));
System.out.println("tran id :: " + tranId + " tran ser::: " + refSer + "ref no::: " + refNo + " ::tot amt " + totAmtPayAbs + "::adj amt pay:: " + adjAmtPayAbs); System.out.println("tran id :: " + tranId + " tran ser::: " + refSer + "ref no::: " + refNo + " ::tot amt " + totAmtPayAbs + "::adj amt pay:: " + adjAmtPayAbs + ":::curr code::" + currCodePay + "::acct code::" + acctCode);
if (totAmtTemp > 0) { if (totAmtTemp > 0) {
adjAmt = totAmtPay - adjAmtPay - getUnconfirmedVouchValue(refNo, siteCode, sundryCode, sundryType, refSer, conn); adjAmt = totAmtPay - adjAmtPay - getUnconfirmedVouchValue(refNo, siteCode, sundryCode, sundryType, refSer, conn);
...@@ -349,7 +354,7 @@ public class MiscVoucherPostSave extends ValidatorEJB implements MiscVoucherPost ...@@ -349,7 +354,7 @@ public class MiscVoucherPostSave extends ValidatorEJB implements MiscVoucherPost
System.out.println("total amount temp:: " + totAmtTemp); System.out.println("total amount temp:: " + totAmtTemp);
if(adjAmtAbs > 0){ if(adjAmtAbs > 0){
sql = "Insert into misc_vouchadv(tran_id,ref_ser,ref_no,adj_amt,tot_amt,line_no) values(?,?,?,?,?,?)";// TODO insert sql = "Insert into misc_vouchadv(tran_id,ref_ser,ref_no,adj_amt,tot_amt,line_no,curr_code,acct_code,cctr_code,exch_rate__vouch) values(?,?,?,?,?,?,?,?,?,?)";// TODO insert
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tran_id); pstmt.setString(1, tran_id);
pstmt.setString(2, refSer); pstmt.setString(2, refSer);
...@@ -357,6 +362,10 @@ public class MiscVoucherPostSave extends ValidatorEJB implements MiscVoucherPost ...@@ -357,6 +362,10 @@ public class MiscVoucherPostSave extends ValidatorEJB implements MiscVoucherPost
pstmt.setDouble(4, adjAmt); pstmt.setDouble(4, adjAmt);
pstmt.setDouble(5, totAmtPay); pstmt.setDouble(5, totAmtPay);
pstmt.setInt(6, lineNo); pstmt.setInt(6, lineNo);
pstmt.setString(7, currCodePay);
pstmt.setString(8, acctCode);
pstmt.setString(9, cctrCode);
pstmt.setString(10, exchRate);
pstmt.executeUpdate(); pstmt.executeUpdate();
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
......
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