ReceiptAdv

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

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

@@ -113,6 +113,8 @@ implements ReceiptAdvLocal, ReceiptAdvRemote
 		double balAmt = 0.0D;
 		double amountBc = 0.0D;
 		double rcpAmt = 0.0D;
+		double rcpAmt1 = 0.0D;
+		double billDiscAmt = 0.0D;
 		double advAmt = 0.0D;
 		double Amt = 0.0D;
 		double totAmt = 0.0D;
@@ -884,6 +886,20 @@ implements ReceiptAdvLocal, ReceiptAdvRemote
 							pstmt = null;
 						}
 					}
+					else if(childNodeName.equalsIgnoreCase("bill_disc_amt")) 			//added by ritesh as per discusion with pravin on 14/05/13 start
+					{
+						billDiscAmt = Double.parseDouble(this.genericUtility.getColumnValue("bill_disc_amt", dom));
+						if (billDiscAmt > 0) 
+						{
+							rcpAmt1 = doublevalue(this.genericUtility.getColumnValue("rcp_amt", dom));
+							if(billDiscAmt < rcpAmt1)
+							{
+								errCode = "VTBDAMT";
+								errList.add(errCode);
+								errFields.add(childNodeName.toLowerCase());
+							}
+						}															
+					}																	//added by ritesh as per discusion with pravin on 14/05/13 end
 					else if(childNodeName.equalsIgnoreCase("rcp_amt"))
 					{
 						rcpAmt = doublevalue(this.genericUtility.getColumnValue("rcp_amt", dom));
@@ -2613,7 +2629,7 @@ implements ReceiptAdvLocal, ReceiptAdvRemote
 							billDisc = "N";
 						if (billDisc.trim().equalsIgnoreCase("Y"))
 						{													//added by ritesh  start
-							sql = "select export_fund.exch_rate,lc_billdisc_amt from export_fund, export_fundet where ( export_fund.tran_id = export_fundet.tran_id ) and ( export_fund.confirmed = 'Y' ) and ( ( export_fundet.ref_ser = ? ) and ( export_fundet.ref_no = ? ) )";
+							sql = "select export_fund.exch_rate,export_fundet.bill_disc_amt from export_fund, export_fundet where ( export_fund.tran_id = export_fundet.tran_id ) and ( export_fund.confirmed = 'Y' ) and ( ( export_fundet.ref_ser = ? ) and ( export_fundet.ref_no = ? ) )";
 							
 							pstmt = conn.prepareStatement(sql);
 							pstmt.setString(1, refSer);
@@ -2637,7 +2653,7 @@ implements ReceiptAdvLocal, ReceiptAdvRemote
 						valueXmlString.append("<tax_amt>").append("<![CDATA[" + taxAmt + "]]>").append("</tax_amt>");
 						valueXmlString.append("<net_amt>").append("<![CDATA[" + totAmt + "]]>").append("</net_amt>");
 						valueXmlString.append("<bad_debt_amt>").append("<![CDATA[" + badDebtAmt + "]]>").append("</bad_debt_amt>");
-						advAmt = doublevalue(genericUtility.getColumnValue("adv_amt", dom1));
+						advAmt = doublevalue(genericUtility.getColumnValue("adv_amt", dom1)); 
 						Double diffvalue = Double.valueOf(totAmt - adjAmt);
 						if((advAmt < diffvalue.doubleValue()) && (advAmt != 0.0) && (Sing(advAmt) == Sing(diffvalue.doubleValue())))
 						{