change tot_amt to net_amt

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

webitm-dis/ibase/webitm/ejb/dis/adv/POMilestoneCnf.java

@@ -346,8 +346,9 @@ public class POMilestoneCnf
 			else
 			{
 				System.out.println("paymentOpt is 'N' ...rollback()...");
-				conn.rollback();
-				return returnStr;
+				//conn.rollback();
+				//return returnStr;
+				returnStr = "Success";
 			}
 
 
@@ -763,7 +764,7 @@ public class POMilestoneCnf
 		double vouchTotAmt=0;
 		double ordAmt=0 ;
 
-		sql = " select sum(tot_amt)  from voucher where purc_order = ? " ;
+		sql = " select sum(net_amt)  from voucher where purc_order = ? " ;
 		// "and confirmed = 'Y' " ;
 		pstmt = conn.prepareStatement(sql);
 		pstmt.setString(1, purcOrder);
@@ -790,22 +791,10 @@ public class POMilestoneCnf
 		pstmt.close();
 		pstmt = null;
 
-		/*sql = " select tot_amt from voucher where tran_id = ? " ;
-		pstmt = conn.prepareStatement(sql);
-		pstmt.setString(1, tranIdForVoucher);
-		rs = pstmt.executeQuery();
-		if (rs.next())
-		{
-			vouchAmt = rs.getDouble(1);
-		}	
-		rs.close();
-		rs = null;
-		pstmt.close();
-		pstmt = null;*/
 
 		double differenceAmt = ordAmt - vouchTotAmt ;
 
-		System.out.println("ordAmt["+ordAmt+"]-vouchTotAmt["+vouchTotAmt+"]=vouchAmt["+vouchAmt+"]>differenceAmt["+differenceAmt+"]");
+		System.out.println("ordAmt["+ordAmt+"]-vouchNetAmt["+vouchTotAmt+"]=vouchAmt["+vouchAmt+"]>differenceAmt["+differenceAmt+"]");
 
 		if(vouchAmt > differenceAmt)
 		{

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

@@ -786,7 +786,7 @@ public class MilestonePayGenPrc extends ValidatorEJB implements MilestonePayGenP
 						pstmt.close();
 						pstmt = null;
 						
-						sql = "select sum(tot_amt) as tot_amt from voucher where purc_order = ? ";
+						sql = "select sum(net_amt) as tot_amt from voucher where purc_order = ? ";
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1, purcOrder);
 						rs = pstmt.executeQuery();
@@ -1057,7 +1057,7 @@ public class MilestonePayGenPrc extends ValidatorEJB implements MilestonePayGenP
 				pstmt1.close();
 				pstmt1 = null;
 				
-				sql3 = "select sum(tot_amt) as tot_amt from voucher where purc_order = ? ";
+				sql3 = "select sum(net_amt) as tot_amt from voucher where purc_order = ? ";
 				pstmt1 = connectionObject.prepareStatement(sql3);
 				pstmt1.setString(1, actCode);
 				rs1 = pstmt1.executeQuery();