changes done for pop help query,confirm purc_order shows

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

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

@@ -518,9 +518,10 @@ public class MilestonePayGenPrc extends ValidatorEJB implements MilestonePayGenP
 					getDataSql = "SELECT  PURC_ORDER, LINE_NO , TYPE ,REL_AGNST ,AMT_TYPE ,REL_AMT , " +
 							" REL_AFTER ,VOUCH_CREATED ,TASK_CODE ,DUE_DATE , ADJ_METHOD ,ACCT_CODE ,CCTR_CODE ,TAX_CLASS ," +
 							" TAX_CHAP , TAX_ENV ,RETENTION_PERC ,SITE_CODE__ADV ,ADJ_PERC " +
-							" FROM PORD_PAY_TERM  WHERE PURC_ORDER = ? AND  VOUCH_CREATED = 'N'  and rel_agnst in ('05','06')  ";
+							" FROM PORD_PAY_TERM  WHERE PURC_ORDER = ? AND  VOUCH_CREATED = 'N'  and rel_agnst=?  ";
 					pstmt = conn.prepareStatement(getDataSql);
 					pstmt.setString(1,purcOrderList.get(ListCtr));
+					pstmt.setString(2,releaseAgainst);
 					rs = pstmt.executeQuery();
 					
 					while(rs.next())
@@ -734,9 +735,13 @@ public class MilestonePayGenPrc extends ValidatorEJB implements MilestonePayGenP
 			
 			//sql = "select purc_order,line_no,rel_agnst,rel_amt,vouch_created from pord_pay_term where vouch_created='N' ";
 			
-			sql = " select purc_order,line_no,rel_agnst,rel_amt,vouch_created from pord_pay_term where " +
+		/*	sql = " select purc_order,line_no,rel_agnst,rel_amt,vouch_created from pord_pay_term where " +
 					" vouch_created='N' and rel_agnst in ('05','06') and task_code is not null order by purc_order desc  ";
+			*/
 			
+			sql =" select distinct(pterm.purc_order) from pord_pay_term pterm, porder po where " +
+					" pterm.purc_order = po.purc_order and po.confirmed='Y' and pterm.vouch_created='N'" +
+					" and pterm.rel_agnst in ('05','06') and pterm.task_code is not null ";
 			System.out.println(" selectteam sql [" + sql + "]");
 			pstmt = connectionObject.prepareStatement(sql);
 			rs = pstmt.executeQuery();
@@ -759,11 +764,11 @@ public class MilestonePayGenPrc extends ValidatorEJB implements MilestonePayGenP
 				}
 
 				valueXmlString.append("<purc_order><![CDATA[").append(rs.getString("purc_order")).append("]]></purc_order>\r\n");
-				valueXmlString.append("<line_no><![CDATA[").append(rs.getString("line_no")).append("]]></line_no>\r\n");
+			/*	valueXmlString.append("<line_no><![CDATA[").append(rs.getString("line_no")).append("]]></line_no>\r\n");
 				valueXmlString.append("<rel_agnst><![CDATA[").append(rs.getString("rel_agnst")).append("]]></rel_agnst>\r\n");
 				valueXmlString.append("<rel_amt><![CDATA[").append(rs.getString("rel_amt")).append("]]></rel_amt>\r\n");
 				valueXmlString.append("<vouch_created><![CDATA[").append(rs.getString("vouch_created")).append("]]></vouch_created>\r\n");
-				valueXmlString.append("</ACTIVITY>\r\n");
+			*/	valueXmlString.append("</ACTIVITY>\r\n");
 				num++;
 			}
 		}