add poconfirmation date and rel date condition

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

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

@@ -134,9 +134,9 @@ public class GenPurcMilestoneSch extends ValidatorEJB implements Schedule  {
 					" AND  case when pterm.VOUCH_CREATED is null then 'N' else pterm.VOUCH_CREATED  end = 'N' " +
 					" and pterm.rel_agnst in ('05','06') and po.confirmed='Y' and po.status not in ('C','X') " +
 					//" and not exists (select 1 from PUR_MILSTN i where i.purc_order = po.purc_order and i.line_no__ord = pterm.line_no) " +
-					" and pterm.task_code is not null " 
-					+ " and po.conf_date + pterm.rel_after  <= sysdate";
-			       //+ " and po.conf_date + pterm.rel_after  >= sysdate";//testing purpose
+					" and pterm.task_code is not null " ;
+				//	+ " and po.conf_date + pterm.rel_after  <= sysdate";
+			      // + " and po.conf_date + pterm.rel_after  >= sysdate";//testing purpose
 			
 			pstmt = conn.prepareStatement(sql);
 			rs = pstmt.executeQuery();
@@ -227,12 +227,13 @@ public class GenPurcMilestoneSch extends ValidatorEJB implements Schedule  {
 		StringBuffer xmlBuff = null;
 		Date currentDate = new Date();
 		SimpleDateFormat sdf;
-		String type="",amtType="",relAfter="",acctCode="",cctrCode="",taxClass="",lineNoOrd="",allowOverride="",lineNoPrev="";
+		String type="",amtType="",acctCode="",cctrCode="",taxClass="",lineNoOrd="",allowOverride="",lineNoPrev="";
 		String taxChap="",taxEnv="",siteCodeAdv="",taskCode="",sql="",xmlString="",retString="",remarks="",suppCode="",relAgainst="";
 		String taskCodePrv="",detailsXml="",tranIdMilestn="",detailsResult="",tranIdCurr="",relAgainstPrv="";
 		double odtAmt=0.0,totAmt=0.0,calAmt=0.0,relAmt=0.0,taxAmt=0.0;
 		Date dueDate=null;
-		int cnt=0;
+		Timestamp confDate = null;
+		int cnt=0,relAfter=0;
 		
 		
 		
@@ -245,7 +246,7 @@ public class GenPurcMilestoneSch extends ValidatorEJB implements Schedule  {
 						" pterm.rel_amt ,pterm.rel_after ,pterm.vouch_created ,pterm.task_code ,pterm.due_date ," +
 						" pterm.adj_method ,pterm.tax_class ,pterm.tax_chap , " +
 						" pterm.tax_env ,pterm.retention_perc ,pterm.site_code__adv , pterm.adj_perc,pterm.remarks,pterm.allow_override " +
-						" , po.supp_code,po.ord_amt,po.tot_amt,po.tax_amt,pdet.acct_code__ap_adv as acct_code ,pdet.cctr_code__ap_adv as cctr_code " +
+						" ,po.conf_date, po.supp_code,po.ord_amt,po.tot_amt,po.tax_amt,pdet.acct_code__ap_adv as acct_code ,pdet.cctr_code__ap_adv as cctr_code " +
 						" FROM PORD_PAY_TERM pterm,PORDER po,porddet pdet   " +
 						" WHERE PTERM.PURC_ORDER = PO.PURC_ORDER and po.PURC_ORDER = pdet.PURC_ORDER and pterm.PURC_ORDER = ?" +
 						" AND  case when pterm.VOUCH_CREATED is null then 'N' else pterm.VOUCH_CREATED  end = 'N'" +
@@ -266,7 +267,7 @@ public class GenPurcMilestoneSch extends ValidatorEJB implements Schedule  {
 						amtType=checkNull(rs.getString("amt_type"));
 						relAgainst=checkNull(rs.getString("rel_agnst"));
 						relAmt=rs.getDouble("rel_amt");
-						//relAfter=checkNull(rs.getString("rel_after"));
+						relAfter=rs.getInt("rel_after");
 						acctCode=checkNull(rs.getString("acct_code"));
 						cctrCode=rs.getString("cctr_code");
 						taxClass=checkNull(rs.getString("tax_class"));
@@ -278,6 +279,7 @@ public class GenPurcMilestoneSch extends ValidatorEJB implements Schedule  {
 						remarks=checkNull(rs.getString("remarks"));
 						allowOverride=checkNull(rs.getString("allow_override"));
 						suppCode=checkNull(rs.getString("supp_code"));
+						confDate=rs.getTimestamp("conf_date");
 						odtAmt = rs.getDouble("ord_amt");
 						totAmt = rs.getDouble("tot_amt");
 						taxAmt = rs.getDouble("tax_amt");
@@ -286,7 +288,7 @@ public class GenPurcMilestoneSch extends ValidatorEJB implements Schedule  {
 						System.out.println("dueDate :"+dueDate + " @taskCode :"+taskCode);
 						System.out.println("odtAmt :"+odtAmt+" @totAmt: "+totAmt+" @taxAmt :"+taxAmt);
 						
-						retString=insertHdMstn(purcOrder,lineNoOrd,lineNoPrev,siteCodeAdv,amtType,relAgainst,relAmt,acctCode,cctrCode,taxClass,taxChap,taxEnv,taskCode,dueDate,remarks,allowOverride,suppCode,odtAmt,totAmt,taxAmt,xtraParams,conn);	
+						retString=insertHdMstn(purcOrder,lineNoOrd,lineNoPrev,siteCodeAdv,amtType,relAgainst,relAmt,acctCode,cctrCode,taxClass,taxChap,taxEnv,taskCode,dueDate,remarks,allowOverride,suppCode,odtAmt,totAmt,taxAmt,confDate,relAfter,xtraParams,conn);	
 						System.out.println("retString [insertPurMilestone ():Final resultString ]"+retString);
 				}//end of while loop 
 			rs.close();
@@ -312,7 +314,7 @@ public class GenPurcMilestoneSch extends ValidatorEJB implements Schedule  {
 	/*------------insert data into purchase milestone header screen----------------------------------*/
 	
 	
-	public String insertHdMstn(String purcOrder,String lineNoOrd,String lineNoPrev,String siteCodeAdv,String amtType,String relAgainst,double relAmt,String acctCode,String cctrCode,String taxClass,String taxChap,String taxEnv,String taskCode,Date dueDate,String remarks,String allowOverride,String suppCode,double odtAmt,double totAmt,double taxAmt,String xtraParams,Connection conn)
+	public String insertHdMstn(String purcOrder,String lineNoOrd,String lineNoPrev,String siteCodeAdv,String amtType,String relAgainst,double relAmt,String acctCode,String cctrCode,String taxClass,String taxChap,String taxEnv,String taskCode,Date dueDate,String remarks,String allowOverride,String suppCode,double odtAmt,double totAmt,double taxAmt,Timestamp confDate ,int relAfter,String xtraParams,Connection conn)
 	{
 		String retString="";
 		double calAmt=0.0;
@@ -328,10 +330,24 @@ public class GenPurcMilestoneSch extends ValidatorEJB implements Schedule  {
 		String taskDelay="",sql="",tranIdMilestn="",wfStatus="",taskCodePrv="",relAgainstPrv="",xmlString="",tranIdCurr="";
 		Date dueDateUpd=null;
 		Date mistnDueDate=null,mistnComplDate=null;
+		Timestamp processDate =null;
+		Timestamp currDate =new java.sql.Timestamp(System.currentTimeMillis()) ;
+		Timestamp systemDate=null;
 		try
 		{
 			System.out.println("insertHdMstn method called......");
 			sdf = new SimpleDateFormat(e12GenericUtility.getApplDateFormat());
+			System.out.println("confDate :"+confDate);
+			System.out.println("relAfter :"+relAfter);
+			processDate = utilmethod.RelativeDate(confDate, relAfter);
+			System.out.println("currDate :"+currDate);
+		//	systemDate = utilmethod.RelativeDate(currDate, 1);
+		//	System.out.println("systemDate :"+systemDate);
+			System.out.println("processDate :"+processDate);
+			
+		if(processDate.before(currDate))//if POConfirmation date + rel after <= System date
+		{
+			
 			if(amtType.equalsIgnoreCase("01")) // % of base
 			{
 				System.out.println(" % of base amount =(odtAmt * relAmt)/100;");
@@ -496,7 +512,7 @@ public class GenPurcMilestoneSch extends ValidatorEJB implements Schedule  {
 				}
 					
 					
-						
+		}				
 		
 
 	//taskCodePrv=taskCode; //set previous task code