Changes made for amd confirm

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

webitm-dis/ibase/webitm/ejb/dis/POrderAmdConf.java

@@ -621,27 +621,28 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
 				rs2 = null;
 				pstmt2.close();
 				pstmt2 = null; 
-				sql2 ="select sum(a.tot_amt) from porddet a,porder b " +
+				sql3 ="select sum(a.tot_amt) from porddet a,porder b " +
 						"where (a.purc_order = b.purc_order) and" +
 						" b.confirmed = 'Y' and a.proj_code = ? and b.purc_order = ? and " +
-						" a.line_no NOT IN (select line_no__ord from poamd_det where amd_no = ? and proj_code = ?) ";
-				pstmt2 = conn.prepareStatement(sql2);
-				pstmt2.setString(1,projCode);
-				pstmt2.setString(2,purcOrder);
-				pstmt2.setString(3, amdNo);
-				pstmt2.setString(4,projCode);
+						" a.line_no NOT IN (select line_no__ord from poamd_det where amd_no = ? " +
+						"and proj_code = ? and line_no__ord is not null) ";
+				pstmt3 = conn.prepareStatement(sql3);
+				pstmt3.setString(1,projCode);
+				pstmt3.setString(2,purcOrder);
+				pstmt3.setString(3,amdNo);
+				pstmt3.setString(4,projCode);
 				System.out.println("Project code is for poamdvalidation....."+ projCode);
-				rs2 = pstmt2.executeQuery();
-				if(rs2.next())
+				rs3 = pstmt3.executeQuery();
+				if(rs3.next())
 				{
-					totAmtnotcurr = rs2.getDouble(1) ;
+					totAmtnotcurr = rs3.getDouble(1) ;
 					
 				}
 				System.out.println("totAmtnotcurr>>>>"+totAmtnotcurr);
-				rs2.close();
-				rs2 = null;
-				pstmt2.close();
-				pstmt2 = null; 
+				rs3.close();
+				rs3 = null;
+				pstmt3.close();
+				pstmt3 = null; 
 				
 				sql1 = "select sum( a.tot_amt ) from porddet a, porder b"
 						+ " where ( a.purc_order = b.purc_order ) and b.confirmed = 'Y'"
@@ -685,7 +686,7 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
 					
 					String value = " ;    Amount Exceeded  Project Code :      " + projCode  
 							+" ;   Project Aprroved Amount :    "+ BigDecimal.valueOf(approxCost).toPlainString()
-							+" ;   Consumed Amount :    "+ BigDecimal.valueOf(totAmtDetpordertot).toPlainString()
+							+" ;   Consumed Amount :    "+ BigDecimal.valueOf(totAmtDetpordertot + totAmtnotcurr).toPlainString()
 							+" ;   Current Purchase Order Amendment Amount :   "+ BigDecimal.valueOf(totAmtpoamdtemp).toPlainString()
 							+" ;   Exceeded Amount :   "+ BigDecimal.valueOf(totAmtPoamd - approxCost).toPlainString();