Updated the changes for create PovoucherAdv

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

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

@@ -651,6 +651,15 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
 						+ " porder.tot_amt 			, porder.advance	 , porder.pord_type	  , porder.provi_tran_id,"
 						+ " porder.purc_order,(case when porcp.tax is null then 0 else porcp.tax end) tax From   porder , porcp Where  porder.purc_order = porcp.purc_order " 
 						+ " And porder.confirmed ='Y'  And porcp.tran_id = ? ";
+
+				if( mileStoneId != null && mileStoneId.trim().length() > 0 )
+				{
+				sql1 = "Select porder.ord_date , porder.supp_code , porder.tot_amt,porder.ord_amt,"
+						+ "porder.curr_code,porder.exch_rate,porder.cr_term,porder.proj_code,"
+						+ "porder.site_code__bill,porder.item_ser,(case when porder.vouch_adv_amt is null then 0 else porder.vouch_adv_amt end)vouch_adv_amt, "
+						+ "porder.tot_amt as amount ,porder.tot_amt, porder.advance, porder.pord_type, porder.provi_tran_id   From porder"
+						+ " Where purc_order = ? And confirmed ='Y'";
+				}
 				pstmt1=conn.prepareStatement(sql1);
 				pstmt1.setString(1, porcpid);
 				rs1 = pstmt1.executeQuery();
@@ -709,7 +718,7 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
 				}
 				
 			
-				if( mileStoneId != null && mileStoneId.trim().length() > 0 )
+				/*if( mileStoneId != null && mileStoneId.trim().length() > 0 )
 				{
 				sql = "Select porder.ord_date , porder.supp_code , porder.tot_amt,porder.ord_amt,"
 						+ "porder.curr_code,porder.exch_rate,porder.cr_term,porder.proj_code,"
@@ -727,8 +736,8 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
 					System.out.println("supp :"+supp);
 					amount = rs.getDouble("amount");
 					System.out.println("amount :"+amount);
-					/*ordamt = rs.getDouble(4);
-					System.out.println("lcordamt :"+ordamt);*/
+					ordamt = rs.getDouble(4);
+					System.out.println("lcordamt :"+ordamt);
 					curr = rs.getString("curr_code");
 					System.out.println("curr :"+curr);
 					exch = rs.getDouble("exch_rate");
@@ -751,8 +760,8 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
 					System.out.println("type :"+type);
 					provpo = rs.getString("provi_tran_id");
 					System.out.println("provpo :"+provpo);
-					/*poid = rs.getString("purc_order");
-					System.out.println("poid :"+poid);*/
+					poid = rs.getString("purc_order");
+					System.out.println("poid :"+poid);
 					poid=porcpid;
 					tranDate = rs.getTimestamp("ord_date");
 					System.out.println("tranDate :"+tranDate);
@@ -785,7 +794,7 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
 				{
 				pstmt.close();
 				pstmt = null;
-				}
+				}*/
 				if(rs1 != null)
 				{
 				rs1.close();