Added Changes for receipt Amount

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

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

@@ -86,7 +86,7 @@ public class CreatePoRcpVoucher
 		String acctCodePH = "", ccrtCodePH = "", taxVar = "", acctCodePPV = "", cctrCodePPV = "", returnId = "", sql = "";
 		double rcpDiscAmt = 0, rcpAmount = 0, vouchQuantity = 0, vouchAmount = 0, taxMultiplier = 1, totAmount = 0, purcRateStd = 0;
 		String chgDate = null, acctCodeAP = "", ccrtCodeAP = "", msgType = "", taxVar1 = "", taxVar2 = "";
-		
+		double receiptAmount = 0.0;
 		MasterStatefulLocal masterStatefulLocal = null;
 		try
 		{
@@ -1049,10 +1049,15 @@ public class CreatePoRcpVoucher
 					pstmt1 = null;
 				}
 
-				rcpDiscAmt = (rcpQtyStd * rcpRateStd * rcpDiscount)/100;
+				rcpAmount = (rcpQtyStd * rcpRateStd * rcpDiscount)/100;
+				System.out.println("rcpAmount+++++"+rcpAmount +"   rcpQtyStd+++"+rcpQtyStd+"  rcpRateStd+++"+rcpRateStd+"  rcpDiscount++++"+rcpDiscount);
 				rcpAmount = ((rcpQtyStd * rcpRateStd) - rcpDiscAmt);
+				
+				System.out.println("rcpAmount**********"+rcpAmount);
 				vouchQuantity = rcpQuantity;
 				vouchAmount   = rcpQtyStd * rcpRateStd ;
+				System.out.println("vOUCHER qUANTITY+++"+vouchQuantity);
+				System.out.println("vouchAmount+++++++++"+vouchAmount);
 				taxMultiplier = 1;
 				if ("P-RET".equals(tranSer))
 				{
@@ -1243,7 +1248,7 @@ public class CreatePoRcpVoucher
 				// In below select-acct_code__prov_dr,cctr_code__prov_dr,acct_code__prov_cr,cctr_code__prov_cr-Added By fatema - 04/04/2007 - DI7SUN0018
 				//Converted nvl to case when by Archiman 12/08/08
 				//Commented nvl(porcpdet.discount,0) by Archiman 12/08/08
-				sql = "select porcpdet.tran_id,line_no,porcpdet.purc_order,line_no__ord,item_code,quantity, "
+				sql = "select porcp.amount,porcpdet.tran_id,line_no,porcpdet.purc_order,line_no__ord,item_code,quantity, "
 					+ " unit,rate,(case when porcpdet.discount is null then 0 else porcpdet.discount end) as discount, "
 					+ " porcpdet.tax_amt,net_amt,quantity__stduom,rate__stduom, "
 					+ "	acct_code__dr,cctr_code__dr,ret_opt,dept_code, acct_code__cr,cctr_code__cr,	"
@@ -1283,7 +1288,7 @@ public class CreatePoRcpVoucher
 					cctrCodeProvDR = rs.getString("cctr_code__prov_dr");
 					acctCodeProvCR = rs.getString("acct_code__prov_cr");
 					cctrCodeProvCR = rs.getString("cctr_code__prov_cr");
-
+                     receiptAmount = rs.getDouble("amount");
 					if ("R".equals(retOpt))
 					{
 						continue;
@@ -1497,12 +1502,12 @@ public class CreatePoRcpVoucher
 					xmlBuff.append("<item_code><![CDATA[" + (rcpItemCode==null?"":rcpItemCode) + "]]></item_code>");
 					xmlBuff.append("<unit><![CDATA[" + (rcpUnit==null?"":rcpUnit) + "]]></unit>");
 					xmlBuff.append("<rcp_qty><![CDATA[" + rcpQuantity + "]]></rcp_qty>");
-					xmlBuff.append("<vouch_qty><![CDATA[" + vouchQuantity + "]]></vouch_qty>");
+					xmlBuff.append("<vouch_qty><![CDATA[" + rcpQuantity + "]]></vouch_qty>");
 					xmlBuff.append("<rcp_rate><![CDATA[" + rcpRate + "]]></rcp_rate>");
 					xmlBuff.append("<vouch_rate><![CDATA[" + rcpRate + "]]></vouch_rate>");
 					xmlBuff.append("<purc_order><![CDATA[" + (purcOrderDet==null?"":purcOrderDet) + "]]></purc_order>");
 					xmlBuff.append("<line_no__pord><![CDATA[" + (lineNoOrd==null?"":lineNoOrd) + "]]></line_no__pord>");
-					xmlBuff.append("<vouch_amt><![CDATA[" + vouchAmount + "]]></vouch_amt>");
+					xmlBuff.append("<vouch_amt><![CDATA[" + rcpAmount + "]]></vouch_amt>");
 					xmlBuff.append("<rcp_amt><![CDATA[" + rcpAmount + "]]></rcp_amt>");
 					xmlBuff.append("<tax_class><![CDATA[" + (taxClass==null?"":taxClass) + "]]></tax_class>");
 					xmlBuff.append("<tax_chap><![CDATA[" + (taxChap==null?"":taxChap) + "]]></tax_chap>");
@@ -1573,7 +1578,7 @@ public class CreatePoRcpVoucher
 				
 				
 				
-				sql = "select porcpdet.tran_id,line_no,porcpdet.purc_order,line_no__ord,item_code,quantity, "
+				sql = "select porcp.amount,porcpdet.tran_id,line_no,porcpdet.purc_order,line_no__ord,item_code,quantity, "
 					+ " unit,rate,(case when porcpdet.discount is null then 0 else porcpdet.discount end) as discount, "
 					+ " porcpdet.tax_amt,net_amt,quantity__stduom,rate__stduom, "
 					+ "	acct_code__dr,cctr_code__dr,ret_opt,dept_code, acct_code__cr,cctr_code__cr,	"
@@ -1613,7 +1618,8 @@ public class CreatePoRcpVoucher
 					cctrCodeProvDR = rs.getString("cctr_code__prov_dr");
 					acctCodeProvCR = rs.getString("acct_code__prov_cr");
 					cctrCodeProvCR = rs.getString("cctr_code__prov_cr");
-
+					receiptAmount = rs.getDouble("amount");
+					System.out.println("Final Receipt amount fetched from table"+receiptAmount);
 					if ("R".equals(retOpt))
 					{
 						continue;
@@ -1670,7 +1676,7 @@ public class CreatePoRcpVoucher
 					xmlBuff.append("<purc_order><![CDATA[" + (purcOrderDet==null?"":purcOrderDet) + "]]></purc_order>");
 					xmlBuff.append("<line_no__pord><![CDATA[" + (lineNoOrd==null?"":lineNoOrd) + "]]></line_no__pord>");
 					xmlBuff.append("<vouch_amt><![CDATA[" + rcpAmount + "]]></vouch_amt>");
-					xmlBuff.append("<rcp_amt><![CDATA[" + rcpNetAmount + "]]></rcp_amt>");
+					xmlBuff.append("<rcp_amt><![CDATA[" + receiptAmount + "]]></rcp_amt>");
 					xmlBuff.append("<tax_class><![CDATA[" + (taxClass==null?"":taxClass) + "]]></tax_class>");
 					xmlBuff.append("<tax_chap><![CDATA[" + (taxChap==null?"":taxChap) + "]]></tax_chap>");
 					xmlBuff.append("<tax_env><![CDATA[" + (taxEnv==null?"":taxEnv) + "]]></tax_env>");