ACCOUNT CODE CCTR CODE sql changed

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

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

@@ -432,6 +432,7 @@ public class MilestonePayGenPrc extends ValidatorEJB implements MilestonePayGenP
 		SimpleDateFormat sdf = null;
 
 		String projCode="",purcOrder="",releaseAgainst="",sysDate="",processDate="",resultString="",getDataSql="",processDt="";
+		String acctCode="",cctrCode = "";
 		//Timestamp processDate1 = new Timestamp();
 		java.sql.Timestamp processDate1 =  null ;
 		ArrayList<String> purcOrderList = new ArrayList<String>();
@@ -630,17 +631,33 @@ public class MilestonePayGenPrc extends ValidatorEJB implements MilestonePayGenP
 						}
 					}*/if("false".equalsIgnoreCase(adhocvalue))
 					{
+						sql= "  select ACCT_CODE__AP_ADV as acct_code ,CCTR_CODE__AP_ADV as cctr_code " +
+								" from porddet where purc_order =? ";
+						pstmt = conn.prepareStatement(sql);
+						pstmt.setString(1, purcOrder);
+						rs = pstmt.executeQuery();
+						if(rs.next())
+						{
+							acctCode=checkNull(rs.getString("acct_code"));
+							cctrCode=rs.getString("cctr_code");
+						}
+						rs.close();
+						rs = null;
+						pstmt.close();
+						pstmt = null;
+						
 						if(projCode !=null && projCode.trim().length()>0)
 						{
 							appendsql=" and po.proj_code = ? ";
 						}
+												
 						getDataSql = "SELECT  pterm.PURC_ORDER, pterm.LINE_NO , pterm.TYPE ,pterm.REL_AGNST,pterm.line_no__prev ," +
 								"pterm.AMT_TYPE ,pterm.REL_AMT ,pterm.REL_AFTER ,pterm.VOUCH_CREATED ,pterm.TASK_CODE ," +
-								"pterm.DUE_DATE , pterm.ADJ_METHOD , pdet.acct_code__ap_adv AS ACCT_CODE ,pdet.cctr_code__ap_adv as CCTR_CODE ,pterm.TAX_CLASS ," +
+								"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.allow_override, pterm.line_no__prev,pterm.remarks,po.SUPP_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 = ? " +
+								"FROM PORD_PAY_TERM pterm,porder po  " +
+								"WHERE PTERM.PURC_ORDER = PO.PURC_ORDER and  pterm.PURC_ORDER = ? " +
 								"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')" +
@@ -688,9 +705,9 @@ public class MilestonePayGenPrc extends ValidatorEJB implements MilestonePayGenP
 							// ADJ_METHOD
 							valueXmlString.append("<adj_method>").append("<![CDATA[" + checkNull(rs.getString("ADJ_METHOD")) + "]]>").append("</adj_method>\r\n");
 							// ACCT_CODE
-							valueXmlString.append("<acct_code>").append("<![CDATA[" + checkNull(rs.getString("ACCT_CODE")) + "]]>").append("</acct_code>\r\n");
+							valueXmlString.append("<acct_code>").append("<![CDATA[" + acctCode+ "]]>").append("</acct_code>\r\n");
 							// CCTR_CODE
-							valueXmlString.append("<cctr_code>").append("<![CDATA[" + checkNull(rs.getString("CCTR_CODE")) + "]]>").append("</cctr_code>\r\n");
+							valueXmlString.append("<cctr_code>").append("<![CDATA[" + cctrCode + "]]>").append("</cctr_code>\r\n");
 							// TAX_CLASS
 							valueXmlString.append("<tax_class>").append("<![CDATA[" + checkNull(rs.getString("TAX_CLASS")) + "]]>").append("</tax_class>\r\n");
 							// TAX_CHAP