acct_code set from acct_code_ap_adv from porddet

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

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

@@ -2,6 +2,7 @@ package ibase.webitm.ejb.dis.adv;
 
 import ibase.system.config.AppConnectParm;
 import ibase.utility.CommonConstants;
+import ibase.utility.UserInfoBean;
 import ibase.webitm.ejb.ITMDBAccessEJB;
 import ibase.webitm.ejb.MasterStatefulLocal;
 import ibase.webitm.ejb.ValidatorEJB;
@@ -29,15 +30,17 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
 	UtilMethods utilMethods = UtilMethods.getInstance();
 	FinCommon finCommon = new FinCommon();
 	ITMDBAccessEJB itmDBAccessLocal = new ITMDBAccessEJB();
+	ibase.utility.UserInfoBean userInfo = new ibase.utility.UserInfoBean();
 
 	public String createPoVoucherAdv(String tranId, String xtraParams,Connection conn, String as_flag, int ad_advperc, Date day)throws ITMException 
 	{
-		String errcode="",mileStoneId="";
+		String errcode="",mileStoneId="",relAgnstTerm="",lineNoTerm="";
 
 		try
 		{
 			System.out.println("-----in gbf_porder_advances------");
-			errcode =  createPoVoucherAdv(tranId, xtraParams, conn, as_flag, ad_advperc, day, mileStoneId);
+		//	errcode =  createPoVoucherAdv(tranId, xtraParams, conn, as_flag, ad_advperc, day, mileStoneId);
+			errcode =  createPoVoucher(tranId, xtraParams, conn, as_flag, ad_advperc, day, mileStoneId,relAgnstTerm,lineNoTerm);
 			System.out.println("@@@@@@@@@@@39 errcode["+errcode+"]");
 		}
 		catch(Exception e)
@@ -52,7 +55,7 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
 
 
 
-	public String createPoVoucherAdv(String tranId, String xtraParams,Connection conn, String as_flag, int ad_advperc, Date day, String mileStoneId)throws ITMException 
+	/*public String createPoVoucherAdv(String tranId, String xtraParams,Connection conn, String as_flag, int ad_advperc, Date day, String mileStoneId)throws ITMException 
 	{
 		System.out.println("-----@@in createPoVoucherAdv -----as_flag["+as_flag+"]mileStoneId["+mileStoneId+"]");
 		String site = "", paymode = "", supp = "", curr = "", errcode = "",loginSiteCode="";
@@ -1160,7 +1163,7 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
 		return errcode;
 
 
-	}
+	}*/
 
 
 	/*@Override
@@ -1212,10 +1215,13 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
 			AppConnectParm appConnect = new AppConnectParm();
 			Properties p = appConnect.getProperty();
 			InitialContext ctx = new InitialContext(p);
-			userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams,
-					"loginCode");
-			loginSiteCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams,
-					"loginSiteCode");
+			System.out.println("xtraParams :"+xtraParams);
+			userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode");
+			loginSiteCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginSiteCode");
+			
+			
+			System.out.println("userId :"+userId);
+			System.out.println("loginSiteCode :"+loginSiteCode);
 			xmlBuff = new StringBuffer("<?xml version = \"1.0\"?> <Root> <header> <editFlag>");
 			xmlBuff.append("<![CDATA[No]]></editFlag> </header>");
 			xmlBuff.append("<Detail0>");
@@ -2108,6 +2114,11 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
 						
 						if( mileStoneId != null &&  mileStoneId.trim().length() > 0)
 						{
+							
+							//userId=userInfo.getLoginCode();
+							//System.out.println("userId is :"+userId);
+							
+							
 							sql = "Select line_no,rel_agnst,amt_type, rel_amt, rel_after,retention_perc,tax_class,tax_chap,tax_env, site_code__adv from pord_pay_term where  purc_order =? and    case when " +
 									"vouch_created is null then 'N' else vouch_created end = 'N' and task_code =?  and REL_AGNST=? and LINE_NO=? ";	
 						}
@@ -2284,8 +2295,10 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
 								xmlBuff.append("<confirmed><![CDATA[N]]></confirmed>");
 								xmlBuff.append("<conf_date><![CDATA["+ sdf.format(new java.util.Date()).toString() +"]]></conf_date>");
 								xmlBuff.append("<paid><![CDATA[]]></paid>");
-								xmlBuff.append("<acct_code><![CDATA["+ (acctcodecr == null ? "" : acctcodecr)+ "]]></acct_code>");
-								xmlBuff.append("<cctr_code><![CDATA[" + cctrcodecr+ "]]></cctr_code>");
+								//xmlBuff.append("<acct_code><![CDATA["+ (acctcodecr == null ? "" : acctcodecr)+ "]]></acct_code>");
+								//xmlBuff.append("<cctr_code><![CDATA[" + cctrcodecr+ "]]></cctr_code>");
+								xmlBuff.append("<acct_code><![CDATA["+ (acctapadv == null ? "" : acctapadv)+ "]]></acct_code>");
+								xmlBuff.append("<cctr_code><![CDATA[" + cctrapadv+ "]]></cctr_code>");
 								xmlBuff.append("<emp_code><![CDATA["+null+ "]]></emp_code>");
 								xmlBuff.append("<net_amt><![CDATA[" + netamt + "]]></net_amt>");
 								xmlBuff.append("<chg_date><![CDATA[" + today+ "]]></chg_date>");
@@ -2293,7 +2306,7 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
 								xmlBuff.append("<chg_term><![CDATA["+ (termid == null ? "BASE" : termid)+ "]]></chg_term>");
 								xmlBuff.append("<net_amt__bc><![CDATA[" + netamtbase+ "]]></net_amt__bc>");
 								xmlBuff.append("<diff_amt__exch><![CDATA["+ 0 +"]]></diff_amt__exch>");
-								xmlBuff.append("<cctr_code__cf><![CDATA["+ (cctrcodecr == null ? "" : cctrcodecr)+ "]]></cctr_code__cf>");
+								xmlBuff.append("<cctr_code__adv><![CDATA["+ (cctrcodecr == null ? "" : cctrcodecr)+ "]]></cctr_code__adv>");
 								xmlBuff.append("<acct_code__adv><![CDATA["+ (acctcodecr == null ? "" : acctcodecr)+ "]]></acct_code__adv>");
 								xmlBuff.append("<supp_bill_amt><![CDATA[" + netamt+ "]]></supp_bill_amt>");
 								xmlBuff.append("<exch_rate><![CDATA[" + exch+ "]]></exch_rate>");