Commit 1160fb6a authored by ngadkari's avatar ngadkari

allowed difference in reco amount

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@204928 ce508802-f39f-4f6c-b175-0d175dae99d5
parent b4ee9288
......@@ -64,7 +64,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
NumberFormat nf = null;
boolean isError=false;
ITMDBAccessLocal itmDBAccessLocal = new ITMDBAccessEJB();
FinCommon fincommon = new FinCommon(); //added by nandkumar gadkari on 08/08/19
public BankRecoWizIC() {
System.out.println("Constructor Calling of BankRecoWizIC......");
}
......@@ -751,7 +751,8 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
//cpatil 09/03/16 start
String autoReconFilterValue="",refNo="",refDate="",amtAdj="",amtBc="";
double totalBSAmount=0,totalBTAmount=0;
double bRecoDiffAmtLimit=0;//added by nandkumar gadkari on 08/08/19
String diffAmt="";
HashMap<String,ArrayList<String>> RefBSHashMapAuto = new HashMap<String,ArrayList<String>>();
HashMap<String,ArrayList<String>> RefBTHashMapAuto = new HashMap<String,ArrayList<String>>();
......@@ -1851,10 +1852,14 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
}
}
System.out.println("@@@@@@@@@ totalBSAmount["+totalBSAmount+"]:::::totalBTAmount["+totalBTAmount+"]");
if(totalBSAmount != totalBTAmount)
// ADDED BY NANDKUMAR GADKARI ON 08/08/19 ---------------start-----------------
diffAmt =fincommon.getFinparams("999999", "BRECO_DIFF_AMT_LIMIT", conn);
diffAmt = diffAmt == null || diffAmt.trim().length() == 0 || diffAmt.equalsIgnoreCase("NULLFOUND") ? "1" : diffAmt.trim();
bRecoDiffAmtLimit=checkDoubleNull(diffAmt);
System.out.println("@@@@@@@@@ totalBSAmount["+totalBSAmount+"]:::::totalBTAmount["+totalBTAmount+"]:::::DiffernaceAmount["+Math.abs((totalBSAmount - totalBTAmount))+"]" );
System.out.println("@@@@@@@@@ BANK_RECO_DIFF_AMT["+bRecoDiffAmtLimit+"]");
// ADDED BY NANDKUMAR GADKARI ON 08/08/19 ---------------end-----------------
if(totalBSAmount != totalBTAmount && (Math.abs(totalBSAmount - totalBTAmount) > bRecoDiffAmtLimit ))// or condition added by nandkumar gadkari on 08/08/19
{
valueXmlString = valueXmlString.append("<?xml version='1.0'?><Root>");
valueXmlString = valueXmlString.append("<message>AMTNTMATCH</message>");
......@@ -1995,7 +2000,8 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
System.out.println("calAmt :"+calAmt);
System.out.println("tempAmtBS :"+tempAmtBS);
if(calAmt == tempAmtBS && currSet.size() == 1)
//if(calAmt == tempAmtBS && currSet.size() == 1)// commented and new condition by nandkumar gadkari on 08/08/19
if((calAmt == tempAmtBS || Math.abs(calAmt - tempAmtBS) < bRecoDiffAmtLimit ) && currSet.size() == 1)
{
isReconcile = true;
System.out.println(isReconcile);
......@@ -2101,7 +2107,8 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
System.out.println("tempAmtBT :"+tempAmtBT);
System.out.println("currSet size :"+currSet.size());
if(calAmt == tempAmtBT && calAmt != 0 && currSet.size() == 1)
// if(calAmt == tempAmtBT && calAmt != 0 && currSet.size() == 1)// commented and new condition by nandkumar gadkari on 08/08/19
if((calAmt == tempAmtBT || Math.abs(calAmt - tempAmtBT) < bRecoDiffAmtLimit ) && calAmt != 0 && currSet.size() == 1)
{
isReconcile = true;
System.out.println(isReconcile);
......@@ -2185,7 +2192,8 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
System.out.println("tempAmtBT :"+tempAmtBT);
System.out.println("tempAmtBS :"+tempAmtBS);
if(tempAmtBT == tempAmtBS && currSet.size() == 1)
// if(tempAmtBT == tempAmtBS && currSet.size() == 1)// commented and new condition by nandkumar gadkari on 08/08/19
if((tempAmtBT == tempAmtBS || Math.abs(tempAmtBT - tempAmtBS) < bRecoDiffAmtLimit) && currSet.size() == 1)
{
isReconcile = true;
}
......@@ -2347,7 +2355,8 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
System.out.println("calAmtBS["+calAmtBS+"]calAmtBT["+calAmtBT+"]");
if( calAmtBS == calAmtBT )
//if( calAmtBS == calAmtBT )// commented and new condition by nandkumar gadkari on 08/08/19
if( calAmtBS == calAmtBT || Math.abs(calAmtBS - calAmtBT) < bRecoDiffAmtLimit)
{
isReconcile = true;
System.out.println("isReconcile["+isReconcile+"]");
......@@ -4568,7 +4577,13 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
return null;
}
}
public double checkDoubleNull(String str) {
if (str == null || str.trim().length() == 0) {
return 0.0;
} else {
return Double.parseDouble(str);
}
}
//
/*@Override
......
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