Commit 968a467d authored by mmhatre's avatar mmhatre

Bank reconciliation - Log and statement manual reconciliation - System should...

Bank reconciliation - Log and statement manual reconciliation - System should match only the total amount of banktran_log and bank_statement and if the amount matches to reconcile the same

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@202174 ce508802-f39f-4f6c-b175-0d175dae99d5
parent ae5cb6ea
...@@ -1681,6 +1681,9 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -1681,6 +1681,9 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
{ {
String refNOBS="",statusBS="",statusBT=""; String refNOBS="",statusBS="",statusBT="";
System.out.println("In Manually...............autoReconFilter["+autoReconFilter+"]"); System.out.println("In Manually...............autoReconFilter["+autoReconFilter+"]");
autoReconFilter="AMT"; //added by manish mhatre on 17-jun-2019
System.out.println("autoreconfilter_src:"+autoReconFilter);
isReconcile=false; isReconcile=false;
rType ="M"; rType ="M";
System.out.println("xmlString(Manually) :"+stringBuffer.toString()); System.out.println("xmlString(Manually) :"+stringBuffer.toString());
...@@ -1732,7 +1735,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -1732,7 +1735,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
System.out.println("autoReconFilterValue["+autoReconFilterValue+"]refNo+refDate+amtAdj["+""+refNo+refDate+amtAdj+"]"); System.out.println("autoReconFilterValue["+autoReconFilterValue+"]refNo+refDate+amtAdj["+""+refNo+refDate+amtAdj+"]");
if( autoReconFilterValue != null && autoReconFilterValue.trim().length() > 0 ) /* if( autoReconFilterValue != null && autoReconFilterValue.trim().length() > 0 )
{ {
if( "REFNO_DATE_AMT".equalsIgnoreCase(autoReconFilter) && ( bankStmtCnt==1 || bankTrntCnt == 1 )) if( "REFNO_DATE_AMT".equalsIgnoreCase(autoReconFilter) && ( bankStmtCnt==1 || bankTrntCnt == 1 ))
{ {
...@@ -1783,7 +1786,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -1783,7 +1786,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
} }
} }
/*else if("AMT".equalsIgnoreCase(autoReconFilter) && (autoReconFilterValue != null && autoReconFilterValue.trim().length() > 0 ) && ( bankStmtCnt==1 || bankTrntCnt == 1 )) else if("AMT".equalsIgnoreCase(autoReconFilter) && (autoReconFilterValue != null && autoReconFilterValue.trim().length() > 0 ) && ( bankStmtCnt==1 || bankTrntCnt == 1 ))
{ {
System.out.println("@@@@:AMT:autoReconFilterValue["+autoReconFilterValue+"]amt["+amtBc+"]"); System.out.println("@@@@:AMT:autoReconFilterValue["+autoReconFilterValue+"]amt["+amtBc+"]");
if(!autoReconFilterValue.equalsIgnoreCase(amtBc)) if(!autoReconFilterValue.equalsIgnoreCase(amtBc))
...@@ -1794,7 +1797,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -1794,7 +1797,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
System.out.println("valueXmlString:AMT:"+valueXmlString); System.out.println("valueXmlString:AMT:"+valueXmlString);
return valueXmlString; return valueXmlString;
} }
}*/ }
} }
if("REFNO_DATE_AMT".equalsIgnoreCase(autoReconFilter) && (autoReconFilterValue == null || autoReconFilterValue.trim().length()==0 )) if("REFNO_DATE_AMT".equalsIgnoreCase(autoReconFilter) && (autoReconFilterValue == null || autoReconFilterValue.trim().length()==0 ))
...@@ -1820,8 +1823,16 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -1820,8 +1823,16 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
{ {
//autoReconFilterValue = ""+refNo+amtAdj; //autoReconFilterValue = ""+refNo+amtAdj;
autoReconFilterValue = amtBc; autoReconFilterValue = amtBc;
} } */ //commented by manish mhatre on 17-jun-2019
// if("AMT".equalsIgnoreCase(autoReconFilter) && (autoReconFilterValue == null || autoReconFilterValue.trim().length()==0 ))
if("AMT".equalsIgnoreCase(autoReconFilter))
{
//autoReconFilterValue = ""+refNo+amtAdj;
autoReconFilterValue = amtBc;
System.out.println("autoreconfilter_src:"+autoReconFilter);
System.out.println("autoreconfilterValue_src:"+autoReconFilterValue);
} //added by manish mhatre 17-jun-2019
// end // end
if(tranName.equalsIgnoreCase("bankStatement")) if(tranName.equalsIgnoreCase("bankStatement"))
{ {
......
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