add remarks

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

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

@@ -173,6 +173,8 @@ public class POMilestoneCnf
 
 		String chgTerm   = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"CHG_TERM");
 		String  chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"CHG_USER");
+		String suppName="",taskDescr="";
+		
 		
 		sql = " select tran_id,tran_date,purc_order,line_no__ord,tran_type,site_code,supp_code,acct_code,cctr_code," +
 				" tax_class,tax_chap,tax_env, task_code, amount,due_date,task_status,payment_opt,remarks,tran_id__vch," +
@@ -200,7 +202,7 @@ public class POMilestoneCnf
 			dueDate=rs.getDate("due_date");
 			taskStatus=checkNull(rs.getString("task_status"));
 			paymentOpt=checkNull(rs.getString("payment_opt"));
-			remarks=checkNull(rs.getString("remarks"));
+			//remarks=checkNull(rs.getString("remarks"));
 			tranIdVch=checkNull(rs.getString("tran_id__vch"));
 			confDate=rs.getTimestamp("conf_date");
 			complDate=rs.getTimestamp("compl_date");
@@ -359,6 +361,36 @@ public class POMilestoneCnf
 
 			double penalatyAmount = penalatyAmount(xmlDataAllDom,purcOrder,amountStr,timeDiff,taskCode,conn );
 
+		 	sql = "  select supp_name from supplier where supp_code = ? ";
+			
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1, suppCode );
+			rs = pstmt.executeQuery();
+			if (rs.next())
+			{
+				suppName= checkNull(rs.getString("supp_name"));
+			}	
+			rs.close();
+			rs = null;
+			pstmt.close();
+			pstmt = null;
+			
+			//fn_gencode_desc('TASK_CODE__DELAY','W_PUR_MILSTN', rtrim(PUR_MILSTN_RESCH.TASK_CODE__DELAY),'D') as task_descr
+			sql = " select fn_gencode_desc('TASK_CODE','W_PORDER', rtrim(?),'D') as task_descr from dual ";
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1, taskCode );
+			rs = pstmt.executeQuery();
+			if (rs.next())
+			{
+				taskDescr= checkNull(rs.getString(1));
+			}	
+			rs.close();
+			rs = null;
+			pstmt.close();
+			pstmt = null;
+			
+			remarks = "Penalty for "+taskCode+"("+taskDescr+") delayed by "+timeDiff+" days.";
+			
 			xmlBuff = new StringBuffer();
 			System.out.println("--XML CREATION !!!!!--");
 			xmlBuff.append("<?xml version='1.0' encoding='ISO-8859-1'?>\n");
@@ -390,6 +422,7 @@ public class POMilestoneCnf
 			xmlBuff.append(	"<tran_type><![CDATA[D]]></tran_type>");
 			xmlBuff.append(	"<site_code><![CDATA["+siteCode+"]]></site_code>");
 			xmlBuff.append(	"<supp_code><![CDATA["+suppCode+"]]></supp_code>");
+			xmlBuff.append(	"<supp_name><![CDATA["+suppName+"]]></supp_name>");
 			xmlBuff.append(	"<acct_code><![CDATA["+acctCode+"]]></acct_code>");
 			xmlBuff.append(	"<cctr_code><![CDATA["+cctrCode+"]]></cctr_code>");
 			xmlBuff.append(	"<tax_class><![CDATA["+taxClass+"]]></tax_class>");

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

@@ -353,6 +353,8 @@ public class GenPurcMilestoneSch extends ValidatorEJB implements Schedule  {
 		Timestamp processDate =null;
 		Timestamp currDate =new java.sql.Timestamp(System.currentTimeMillis()) ;
 		Timestamp systemDate=null;
+		String taskDescr="",suppName="";
+		
 		try
 		{
 			System.out.println("insertHdMstn method called......");
@@ -583,6 +585,35 @@ public class GenPurcMilestoneSch extends ValidatorEJB implements Schedule  {
 	System.out.println("isSavedMilstn :"+isSavedMilstn);
 	if(isSavedMilstn  && (relAgainst.equalsIgnoreCase("05") || relAgainst.equalsIgnoreCase("06")))
 	{
+		sql = "  select supp_name from supplier where supp_code = ? ";
+		
+		pstmt = conn.prepareStatement(sql);
+		pstmt.setString(1, suppCode );
+		rs = pstmt.executeQuery();
+		if (rs.next())
+		{
+			suppName= checkNull(rs.getString("supp_name"));
+		}	
+		rs.close();
+		rs = null;
+		pstmt.close();
+		pstmt = null;
+		
+		sql = " select fn_gencode_desc('TASK_CODE','W_PORDER', rtrim(?),'D') as task_descr from dual ";
+		pstmt = conn.prepareStatement(sql);
+		pstmt.setString(1, taskCode );
+		rs = pstmt.executeQuery();
+		if (rs.next())
+		{
+			taskDescr= checkNull(rs.getString(1));
+		}	
+		rs.close();
+		rs = null;
+		pstmt.close();
+		pstmt = null;
+		
+		remarks = "Voucher generated for "+taskCode+"("+taskDescr+").";
+		
 	   
 		xmlBuff = new StringBuffer();
 		System.out.println("--XML CREATION !!!!!--");
@@ -615,6 +646,7 @@ public class GenPurcMilestoneSch extends ValidatorEJB implements Schedule  {
 		xmlBuff.append(	"<tran_type><![CDATA[P]]></tran_type>");
 		xmlBuff.append(	"<site_code><![CDATA["+siteCodeAdv+"]]></site_code>");
 		xmlBuff.append(	"<supp_code><![CDATA["+suppCode+"]]></supp_code>");
+		xmlBuff.append(	"<supp_name><![CDATA["+suppName+"]]></supp_name>");
 		xmlBuff.append(	"<acct_code><![CDATA["+acctCode+"]]></acct_code>");
 		xmlBuff.append(	"<cctr_code><![CDATA["+cctrCode+"]]></cctr_code>");
 		xmlBuff.append(	"<tax_class><![CDATA["+taxClass+"]]></tax_class>");