receipt adv

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

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

@@ -20,8 +20,7 @@ import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 @Stateless
-public class ReceiptAdv extends ValidatorEJB
-implements ReceiptAdvLocal, ReceiptAdvRemote
+public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, ReceiptAdvRemote
 {
 	GenericUtility genericUtility = GenericUtility.getInstance();
 	String winName = null;
@@ -768,7 +767,6 @@ implements ReceiptAdvLocal, ReceiptAdvRemote
 							errFields.add(childNodeName.toLowerCase());
 						}
 					}
-
 					else if (childNodeName.equalsIgnoreCase("ref_date"))
 					{
 						refDateS = this.genericUtility.getColumnValue("ref_date", dom);
@@ -892,7 +890,7 @@ implements ReceiptAdvLocal, ReceiptAdvRemote
 						if (billDiscAmt > 0) 
 						{
 							rcpAmt1 = doublevalue(this.genericUtility.getColumnValue("rcp_amt", dom));
-							if(billDiscAmt < rcpAmt1)
+							if(billDiscAmt > rcpAmt1)
 							{
 								errCode = "VTBDAMT";
 								errList.add(errCode);

webitm-fin/ibase/webitm/ejb/fin/adv/ReceiptAdvConf.java

@@ -3,7 +3,7 @@
  * @Version : 1.0
  * Date : 05/02/13
  */
-package ibase.webitm.ejb.fin.adv;
+package ibase.webitm.ejb.fin;
 
 import ibase.system.config.ConnDriver;
 import ibase.utility.CommonConstants;
@@ -70,7 +70,6 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 			rs = null;
 			pstmt.close();
 			pstmt = null;
-
 			if(confirm != null  && confirm.equalsIgnoreCase("N"))
 			{
 				errString = gbfRetrieveReceipt(tranId,siteCode,xtraParams,conn);
@@ -435,10 +434,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 				DetMap.put("amount", rs.getDouble("amount"));
 				DetMap.put("party_doc_ref", rs.getString("party_doc_ref"));
 				DetList.add(DetMap);
-
 				System.out.println(" receipt Acct Map..........");
 				System.out.println(DetList.toString());
-
 			}
 			rs.close();
 			rs = null;
@@ -464,7 +461,6 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 				System.out.println(" receipt Adv Map..........");
 				System.out.println(ADetMap.toString());
 			}
-
 			rs.close();
 			rs = null;
 			pstmt.close();
@@ -656,10 +652,11 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 					pstmt.close();
 					pstmt = null;
 
-					rcpAmt = (Double)RcpDetMap.get( "rcp_amt");
+			//		rcpAmt = (Double)RcpDetMap.get( "rcp_amt");
+					rcpAmt = (Double)RcpDetMap.get( "bill_disc_amt");               //added by ritesh on 15/05/13 as per discussion with pravin
 					totbdDiff 	= totbdDiff + (rcpAmt * hExchRate ) - (rcpAmt * exch );						
-					rcpAmt  		= 0 - (Double)RcpDetMap.get( "rcp_amt");
-
+			//		rcpAmt  		= 0 - (Double)RcpDetMap.get( "rcp_amt");
+					rcpAmt  		= 0 - (Double)RcpDetMap.get( "bill_disc_amt");  // //added by ritesh on 15/05/13 as per discussion with pravin
 					finChg 	        = 0 - (Double)RcpDetMap.get( "fin_chg");
 
 					total = total + rcpAmt;

webitm-fin/ibase/webitm/ejb/fin/adv/ReceiptAdvConfLocal.java

@@ -4,7 +4,7 @@
  * Date : 01/02/13
  */
 
-package ibase.webitm.ejb.fin.adv;
+package ibase.webitm.ejb.fin;
 import ibase.webitm.utility.ITMException;
 import ibase.webitm.ejb.*;
 import java.rmi.RemoteException;

webitm-fin/ibase/webitm/ejb/fin/adv/ReceiptAdvConfRemote.java

@@ -4,7 +4,7 @@
  * Date : 01/02/13
  */
 
-package ibase.webitm.ejb.fin.adv;
+package ibase.webitm.ejb.fin;
 import ibase.webitm.utility.ITMException;
 import ibase.webitm.ejb.*;
 import java.rmi.RemoteException;