to set supplier bill amount with tax amount for misc voucher

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

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

@@ -1187,7 +1187,7 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
 				realeaseFrDate = null, realeaseToDate = null, billDate1 = null, relDate = null, effDate1 = null, ldtoDate= null;
 		double advAmt = 0.0, billAmt = 0.0, taxAmt = 0.0, totAmt = 0.0, amtHdr = 0.0, 
 				lcamt = 0.0, taxDet = 0.0, netAmtBc = 0.0, netAmt = 0.0, totTax = 0.0, amount = 0.0;
-        double exchRate = 0.0, rndTo = 0.0;
+        double exchRate = 0.0, rndTo = 0.0, vTaxAmt = 0.0;
         int crDays = 0, detRows = 0, cnt = 0, taxRc = 0;
         String analCode1 = "", analCode2 = "", deptCode = "", remarksDet = "", billNo1 = "", billDateStr = "", temp = "", chqName = "",today="";
         String errString = "", tranIDSer = "",xmlString="",loginSite="", fromDateStr="", toDateStr="";
@@ -1593,11 +1593,26 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
 				//analCode = "";
 				//empCode = "";
 				System.out.println("[1]"+netAmt+"[2]"+netAmtBc+"[3]"+billAmt+"[4]"+totTax+"[5]"+totAmt+"[6]"+totTax+"[7]"+billAmt+"[8]"+tranId);				
-				sql = "update misc_voucher set  bill_amt = ?, supp_bill_amt = ? where tran_id = ? ";
+				//added and changed Pavan R on 22aug18 [to set supplier bill amount with tax]
+				sql = "select tax_amt from misc_voucher where tran_id = ? ";
 				pstmt = conn.prepareStatement(sql);				
-				pstmt.setDouble(1, billAmt);
-				pstmt.setDouble(2, billAmt);
-				pstmt.setString(3, tranId);
+				pstmt.setString(1, tranId);
+				ResultSet cntRs = pstmt.executeQuery();
+				if(cntRs.next())
+				{										
+					vTaxAmt = cntRs.getDouble("tax_amt");
+				}
+				cntRs.close();
+				cntRs = null;
+				pstmt.close();
+				pstmt = null;
+				
+				//sql = "update misc_voucher set  bill_amt = ?, supp_bill_amt = ? where tran_id = ? ";
+				sql = "update misc_voucher set supp_bill_amt = ? where tran_id = ? ";
+				pstmt = conn.prepareStatement(sql);				
+				pstmt.setDouble(1, billAmt + vTaxAmt);
+				//pstmt.setDouble(2, billAmt);			
+				pstmt.setString(2, tranId);
 				cnt = pstmt.executeUpdate();
 				pstmt.close();
 				pstmt = null;