Gimatex: Fin charge not pickingin bank receipt

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@215110 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-fin/src/ibase/webitm/ejb/fin/ReceiptAdv.java

@@ -4404,10 +4404,13 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
 								pstmt = null;
 
 								tranDate = dateFormat1.parse(genericUtility.getColumnValue("tran_date", dom1));
-								if (dueDate.before(tranDate))
+								//System.out.println("Due date ["+dueDate+"]tran date "+"] tran date ["+tranDate);
+
+								if (dueDate.after(tranDate))
 								{
 								//	days = (int)(dueDate.getTime() - tranDate.getTime()) / 361440000;//COMMENETED BY MONIKA ON 09 JAN 2019-TO SET DAYS DIFFERENCE THROUGH DaysAfterMETHOD
-									days=utl.DaysAfter(dueDate,tranDate);
+									days=utl.DaysAfter(tranDate,dueDate);
+									//System.out.println("Days difference1 ["+days);
 									if (days > 0)
 									{
 										sql = "select fchg_type,case when fin_chg is null then 0 else fin_chg end as fin_chg from crtermfc where (min_day <= ? and max_day >= ? ) and cr_term = ?";
@@ -4437,7 +4440,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
 											if("P".equals(fchgType))
 											{
 												discountLc = rcpAmt * (finChg / 36500.0D) * days;
-												//System.out.println("discount lc "+discountLc);
+											//	System.out.println("discount lc ["+discountLc+"] discount method ["+rcpAmt * (finChg / 36500.0D) * days);
 												
 											}
 											else
@@ -4623,11 +4626,12 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
 							//	tranDate = dateFormat1.parse(genericUtility.getColumnValue("tran_date", dom));//COMMENETD BY MONIKA 0N 09 JAN 2020-TO TAKE VALUE FROM DOM1 
 							tranDate = dateFormat1.parse(genericUtility.getColumnValue("tran_date", dom1));//ADDED BY MONIKA 0N 09 JAN 2020-
 
-							//System.out.println("tran_date ["+tranDate+"]duedate["+dueDate);//END
-							if (dueDate.before(tranDate))
+						//	System.out.println("tran_date ["+tranDate+"]duedate["+dueDate);//END
+							if (dueDate.after(tranDate))
 							{
 								//days = (int)(dueDate.getTime() - tranDate.getTime()) / 361440000;//COMMENETD BY MONIKA 0N 09 JAN 2020- DAYS CALCULATED WRONGLY IT SHOULD BE CALCULATED BY USING DaysAfter METHOD
-								days=utl.DaysAfter(dueDate,tranDate);
+								days=utl.DaysAfter(tranDate,dueDate);
+							//	System.out.println("daYS IN EXCH RATE"+days);
 								if (days > 0)
 								{
 									sql = "select fchg_type,case when fin_chg is null then 0 else fin_chg end as fin_chg from crtermfc where (min_day <= ? and max_day >= ? ) and cr_term = ?";
@@ -4660,7 +4664,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
 									//if (fchgType == "P")
 									//commeneted by monika-30 july-19
 									//added bt monika 30 july-19
-								//	System.out.println("indise p2fchgtype ["+fchgType+"] rcpAMOUNT ["+rcpAmt+"]  finChg ["+finChg+"] DAYS["+days+"]");
+									//System.out.println("indise p2fchgtype ["+fchgType+"] rcpAMOUNT ["+rcpAmt+"]  finChg ["+finChg+"] DAYS["+days+"]");
 
 									if("P".equals(fchgType))
 									{
@@ -4672,7 +4676,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
 									else
 									{
 									
-										//System.out.println("indise else 1 fchgtype"+finChg);
+									//	System.out.println("indise else 1 fchgtype"+finChg);
 										discountLc = finChg;
 										//System.out.println("indise else 13 fchgtype"+discountLc);
 									}