Added porddet status is c in tran_ser=P-RET Sql.

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

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

@@ -592,7 +592,7 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
 			
 				System.out.println("Project Code>>>> [" + projCode);
 
-			sql ="select a.proj_code, sum(a.tot_amt)" +
+			sql ="select a.proj_code, sum(a.tot_amt * b.exch_rate)" +//a.net_amt * b.exch_rate
 					" from poamd_det a,poamd_hdr b " +
 					"where a.amd_no = b.amd_no " +
 					"and a.amd_no  = ? group by a.proj_code";
@@ -621,7 +621,7 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
 				rs2 = null;
 				pstmt2.close();
 				pstmt2 = null; 
-				sql3 ="select sum(a.tot_amt) from porddet a,porder b " +
+				sql3 ="select sum(a.tot_amt * b.exch_rate) 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 = ? " +
@@ -711,7 +711,7 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
 					   " where ( a.purc_order = c.purc_order )" +
 					   "and (a.tran_id = b.tran_id )" +
 					   "and b.confirmed = 'Y' and a.line_no__ord = c.line_no and  c.proj_code = ?" +
-					   " and b.status ! = 'X'and b.tran_ser= 'P-RET'";
+					   " and b.status ! = 'X'and c.status = 'C' and  b.tran_ser= 'P-RET'";
 				  pstmt = conn.prepareStatement(sql);
 				  pstmt.setString(1, projCode);
 					     //  pstmt.setString(2, pordNo);

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

-package ibase.webitm.ejb.dis;
+               package ibase.webitm.ejb.dis;
 
 import ibase.system.config.ConnDriver;
 import ibase.webitm.ejb.ITMDBAccessEJB;
@@ -1420,7 +1420,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
 										    " where ( a.purc_order = c.purc_order )" +
 											"and (a.tran_id = b.tran_id )" +
 											"and b.confirmed = 'Y' and a.line_no__ord = c.line_no and  c.proj_code = ?" +
-											" and b.status ! = 'X'and b.tran_ser= 'P-RET'";
+											" and b.status ! = 'X'and c.status = 'C' and b.tran_ser= 'P-RET'";
 										   projCode = checkNull(genericUtility.getColumnValue("proj_code", dom));
 									       pstmt = conn.prepareStatement(sql);
 									       pstmt.setString(1, projCode);
@@ -1567,7 +1567,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
 								}
 								System.out.println("line1 before sql:- ["+line1+"]");
 								line1=line1.substring(0, line1.length()-1);
-								sql1 = "select sum( a.tot_amt ) " +
+								sql1 = "select sum( a.tot_amt * b.exch_rate) " +
 										"from porddet a, porder b"
 										+ " where ( a.purc_order = b.purc_order ) and b.confirmed = 'Y'"
 										+ " and a.proj_code = ? and a.purc_order = ? and line_no NOT IN ( "+ line1 +")";