Skip to content

B
business-java
Commit 8c2c49d4 authored by smane's avatar smane
Browse files
Options

Code changes for Purchase Milestone Workflow 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@99267 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 1c712185
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 419 additions and 32 deletions
webitm-dis/ibase/webitm/ejb/dis/adv/CreatePoVoucherAdvance.java
View file @ 8c2c49d4
......@@ -77,22 +77,22 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
String lsrndto = "", invacct = "", acctcodecr = "", cctrcodecr = "";
String relagnst = "", SITECODEDLV = "", SITECODEORD = "", link = "", findlv = "", finord = "";
String poid = "", sitecodeadv = "",refSer="";
String sql = "";
String code = "";
String sql = "",sql2="";
String code = "",aprvLeadTime="";
String userId = "SYSTEM", termid = "SYSTEM";
boolean edilink;
int row = 0, cnt = 0, lineno = 0, relafter = 0, rndto = 0;
int row = 0, cnt = 0, lineno = 0, relafter = 0, rndto = 0,aprvLeadTimeInt=0;
int updCnt = 0;
TransIDGenerator generator = null;
double amount = 0, tax = 0, netamt = 0, netamtbase = 0, advperc = 0, lcordamt = 0, vouchadvamt = 0,calRelAmt=0.0;
double advance = 0, vouchamt = 0, ordamt = 0, taxamt = 0, totalpoamt = 0, retperc = 0, retamt = 0;
double exch = 0,ordAmt=0.0;
double exch = 0,ordAmt=0.0,ordAmtPord=0.0;
porcpid = tranId;
SimpleDateFormat sdf = null;
String tran_Date =null;
String tran_Date =null,tranDateApp="";
java.sql.Timestamp tranDate = null ,today = null, chgdate = null, milestonedt = null, orddate = null,sysDate=null,sysDate1=null;
PreparedStatement pstmt = null, pstmtUp = null,pstmt1 = null;
ResultSet rs = null, rs1 =null;
PreparedStatement pstmt = null, pstmtUp = null,pstmt1 = null,pstmt2=null;
ResultSet rs = null, rs1 =null,rs2=null;
MasterStatefulLocal masterStatefulLocal = null;
StringBuffer xmlBuff = new StringBuffer();
......@@ -104,6 +104,7 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
tran_Date = sdf.format(cal.getTime());
System.out.println("tran_Date :"+tran_Date);
SimpleDateFormat sdfApp = new SimpleDateFormat(genericUtility.getApplDateFormat());
/*
SimpleDateFormat sdf1 = new SimpleDateFormat(genericUtility.getDBDateFormat());
......@@ -367,14 +368,16 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
System.out.println("do while");
if( mileStoneId != null && mileStoneId.trim().length() > 0)
{
sql = " Select line_no,rel_agnst,amt_type, rel_amt, rel_after,retention_perc,tax_class,tax_chap,tax_env, site_code__adv " +
// apprv_lead_time column added by Sagar on 27/11/15
sql = " Select line_no,rel_agnst,amt_type, rel_amt, rel_after,retention_perc,tax_class,tax_chap,tax_env, site_code__adv, apprv_lead_time " +
" from pord_pay_term where purc_order = ? " +
" and case when vouch_created is null then 'N' else vouch_created end = 'N' " +
" and task_code = ? " ;
}
else
{
sql = " Select line_no,rel_agnst,amt_type, rel_amt, rel_after,retention_perc,tax_class,tax_chap,tax_env, site_code__adv " +
// apprv_lead_time column added by Sagar on 27/11/15
sql = " Select line_no,rel_agnst,amt_type, rel_amt, rel_after,retention_perc,tax_class,tax_chap,tax_env, site_code__adv, apprv_lead_time " +
" from pord_pay_term where purc_order =? and case when vouch_created is null then 'N' else vouch_created end = 'N' ";
}
pstmt = conn.prepareStatement(sql);
......@@ -396,6 +399,19 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
taxchap = rs.getString("tax_chap");
taxenv = rs.getString("tax_env");
sitecodeadv = rs.getString("site_code__adv");
aprvLeadTime = rs.getString("apprv_lead_time"); // Code added by Sagar on 27/11/15
System.out.println(">>>aprvLeadTime:"+aprvLeadTime);
if(aprvLeadTime== null || aprvLeadTime.trim().length()==0)
{
aprvLeadTime="0";
}
if(aprvLeadTime!=null && aprvLeadTime.trim().length() > 0)
{
aprvLeadTime=aprvLeadTime.trim();
aprvLeadTimeInt=Integer.parseInt(aprvLeadTime);
}
if (sitecodeadv.length() > 0)
{
if (sitecodeadv != SITECODEORD)
......@@ -425,6 +441,19 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
taxchap = rs.getString("tax_chap");
taxenv = rs.getString("tax_env");
sitecodeadv = rs.getString("site_code__adv");
aprvLeadTime = rs.getString("apprv_lead_time"); // Code added by Sagar on 27/11/15
System.out.println(">>>aprvLeadTime:"+aprvLeadTime);
if(aprvLeadTime== null || aprvLeadTime.trim().length()==0)
{
aprvLeadTime="0";
}
if(aprvLeadTime!=null && aprvLeadTime.trim().length() > 0)
{
aprvLeadTime=aprvLeadTime.trim();
aprvLeadTimeInt=Integer.parseInt(aprvLeadTime);
}
if (sitecodeadv.length() > 0)
{
if (sitecodeadv != SITECODEORD)
......@@ -1181,13 +1210,14 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
//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 " +
// apprv_lead_time column added by Sagar on 27/11/15
sql = "Select line_no,rel_agnst,amt_type, rel_amt, rel_after,retention_perc,tax_class,tax_chap,tax_env, site_code__adv, apprv_lead_time 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=? ";
}
else
{
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'";
// apprv_lead_time column added by Sagar on 27/11/15
sql = "Select line_no,rel_agnst,amt_type, rel_amt, rel_after,retention_perc,tax_class,tax_chap,tax_env, site_code__adv, apprv_lead_time from pord_pay_term where purc_order =? and case when vouch_created is null then 'N' else vouch_created end = 'N'";
}
......@@ -1215,6 +1245,18 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
taxenv = checkNull(rs.getString("tax_env"));
System.out.println("taxenv>>>>>>>>>>" + taxenv);
sitecodeadv = checkNull(rs.getString("site_code__adv"));
aprvLeadTime = rs.getString("apprv_lead_time"); // Code added by Sagar on 27/11/15
System.out.println(">>>aprvLeadTime:"+aprvLeadTime);
if(aprvLeadTime== null || aprvLeadTime.trim().length()==0)
{
aprvLeadTime="0";
}
if(aprvLeadTime!=null && aprvLeadTime.trim().length() > 0)
{
aprvLeadTime=aprvLeadTime.trim();
aprvLeadTimeInt=Integer.parseInt(aprvLeadTime);
}
System.out.println("lineno :"+lineno);
System.out.println("sitecodeadv :"+sitecodeadv);
......@@ -1365,9 +1407,33 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
System.out.println("vouchid : "+vouchid);
refSer="P-ADV";
remark = "PO:" + tranId +"Date:" + tranDate+" Adv. Amt"+ calRelAmt; // Code added by Sagar on 20/11/15
if(tranDate!= null) // Code added by Sagar on 26/11/15
{
tranDateApp = sdfApp.format(tranDate);
}
System.out.println(">>>tranDateApp:"+tranDateApp);
remark = "PO: " + tranId +" Date: " + tranDateApp +" Adv. Amt: "+ calRelAmt; // Code added by Sagar on 20/11/15
System.out.println(">>>Set remark:"+remark);
//PO:006PPG0011Date:19/11/2015 Adv. Amt:10000.000
// Code added by Sagar on 27/11/15 Start
sql2 = "select ord_amt from porder where purc_order = ? "; // Comment added by Sagar on 27/11/15
pstmt2 = conn.prepareStatement(sql2);
pstmt2.setString(1, tranId);
rs2 = pstmt2.executeQuery();
if (rs2.next())
{
ordAmtPord = rs2.getDouble("ord_amt");
}
rs2.close();
rs2 = null;
pstmt2.close();
pstmt2 = null;
System.out.println(">>>voucher_adv ordAmtPord:"+ ordAmtPord);
// Code added by Sagar on 27/11/15 End
String[] authencate = new String[2];
authencate[0] = "";
......@@ -1417,9 +1483,18 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
xmlBuff.append("<bank_code><![CDATA["+ (bankcode == null ? "" : bankcode)+ "]]></bank_code>");
xmlBuff.append("<pay_mode><![CDATA["+ (paymode == null ? "" : paymode) + "]]></pay_mode>");
xmlBuff.append("<cr_term><![CDATA["+ (crterm == null ? "" : crterm) + "]]></cr_term>");
xmlBuff.append("<due_date><![CDATA["+ sdf.format(utilMethods.RelativeDate((new java.util.Date()), relafter)).toString() +"]]></due_date>");
//xmlBuff.append("<due_date><![CDATA["+ sdf.format(utilMethods.RelativeDate((new java.util.Date()), relafter)).toString() +"]]></due_date>"); // Comment added by Sagar on 27/11/15
if( mileStoneId != null && mileStoneId.trim().length() > 0) // Condition Added by Sagar on 27/11/15
{
xmlBuff.append("<due_date><![CDATA["+ sdf.format(utilMethods.RelativeDate((new java.util.Date()), aprvLeadTimeInt)).toString() +"]]></due_date>");
}
else
{
xmlBuff.append("<due_date><![CDATA["+ sdf.format(utilMethods.RelativeDate((new java.util.Date()), relafter)).toString() +"]]></due_date>");
}
//xmlBuff.append("<bill_amt><![CDATA[" + 0 + "]]></bill_amt>"); // Comment added by Sagar on 20/Nov/15
xmlBuff.append("<bill_amt><![CDATA[" + lcordamt + "]]></bill_amt>");// Code added by Sagar on 20/Nov/15
xmlBuff.append("<bill_amt><![CDATA[" + ordAmtPord + "]]></bill_amt>");// Code added by Sagar on 20/Nov/15
xmlBuff.append("<tax_date><![CDATA["+ sdf.format(new java.util.Date()).toString() +"]]></tax_date>");
xmlBuff.append("<tax_amt><![CDATA[" + tax + "]]></tax_amt>");
xmlBuff.append("<adv_amt><![CDATA[" + String.valueOf(calRelAmt)+ "]]></adv_amt>");
......
webitm-fin/ibase/webitm/ejb/fin/GenPurcMilestoneSch.java
View file @ 8c2c49d4
......@@ -354,6 +354,10 @@ public class GenPurcMilestoneSch extends ValidatorEJB implements Schedule {
Timestamp currDate =new java.sql.Timestamp(System.currentTimeMillis()) ;
Timestamp systemDate=null;
String taskDescr="",suppName="";
String amtTypePayTerm="",amtTypeDescr="",taskCodeDescr="";
double relAmtPayTerm=0.0;
double ordAmtPord=0.0, taxAmtPord=0.0, totAmtPord=0.0;
try
{
......@@ -615,8 +619,100 @@ public class GenPurcMilestoneSch extends ValidatorEJB implements Schedule {
pstmt = null;
//remarks = "Voucher generated for "+taskCode+"("+taskDescr+")."; // Comment added by Sagar on 24/11/15
remarks = "Request generated for "+taskCode+"("+taskDescr+")."; // Code added by Sagar on 24/11/15
//remarks = "Request generated for "+taskCode+"("+taskDescr+")."; // Comment added by Sagar on 26/11/15
// Code added by Sagar on 26/11/15 Start.
sql = " select amt_type, rel_amt from pord_pay_term where purc_order= ? and line_no= ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, purcOrder );
pstmt.setString(2, lineNoOrd );
rs = pstmt.executeQuery();
if (rs.next())
{
amtTypePayTerm= checkNull(rs.getString("amt_type"));
relAmtPayTerm= rs.getDouble("rel_amt");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
System.out.println(">>>amtTypePayTerm:"+amtTypePayTerm);
System.out.println(">>>relAmtPayTerm:"+relAmtPayTerm);
if(taskCode!=null && taskCode.trim().length() > 0)
{
taskCode= taskCode.trim();
}
if(amtTypePayTerm!=null && amtTypePayTerm.trim().length() > 0)
{
amtTypePayTerm= amtTypePayTerm.trim();
if("01".equals(amtTypePayTerm))
{
amtTypeDescr="% of base";
}
else if("02".equals(amtTypePayTerm))
{
amtTypeDescr="% of net";
}
else if("03".equals(amtTypePayTerm))
{
amtTypeDescr="Fixed Amount";
}
else if("04".equals(amtTypePayTerm))
{
amtTypeDescr="% of base + Full Tax";
}
}
System.out.println(">>>amtTypeDescr:"+amtTypeDescr);
//remarks="Request Generated for Task: (POADV), Release Type: (% of net), Amt/perc: (10)";
remarks="Request Generated for Task: ("+taskCode +"), Release Type: ("+amtTypeDescr+"), Amt/perc: ("+relAmtPayTerm+")";
// Code added by Sagar on 26/11/15 End.
// Code added by Sagar on 27/11/15 Start.
sql = " select ord_amt, tax_amt, tot_amt from porder where purc_order= ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, purcOrder);
rs = pstmt.executeQuery();
if (rs.next())
{
ordAmtPord= rs.getDouble("ord_amt");
taxAmtPord= rs.getDouble("tax_amt");
totAmtPord= rs.getDouble("tot_amt");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
System.out.println(">>>ordAmtPord:"+ ordAmtPord);
System.out.println(">>>taxAmtPord:"+ taxAmtPord);
System.out.println(">>>totAmtPord:"+ totAmtPord);
sql = " select descr from gencodes where fld_name='TASK_CODE' and mod_name='W_PORDER' and fld_value= ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, taskCode);
rs = pstmt.executeQuery();
if (rs.next())
{
taskCodeDescr= checkNull(rs.getString("descr"));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
System.out.println(">>>taskCodeDescr:"+ taskCodeDescr);
// Code added by Sagar on 27/11/15 End.
xmlBuff = new StringBuffer();
System.out.println("--XML CREATION !!!!!--");
xmlBuff.append("<?xml version='1.0' encoding='ISO-8859-1'?>\n");
......@@ -655,6 +751,7 @@ public class GenPurcMilestoneSch extends ValidatorEJB implements Schedule {
xmlBuff.append( "<tax_chap><![CDATA["+taxChap+"]]></tax_chap>");
xmlBuff.append( "<tax_env><![CDATA["+taxEnv+"]]></tax_env>");
xmlBuff.append( "<task_code><![CDATA["+taskCode+"]]></task_code>");
xmlBuff.append( "<task_descr><![CDATA["+taskCodeDescr+"]]></task_descr>");// Code added by Sagar on 27/11/15
xmlBuff.append( "<amount><![CDATA["+calAmt+"]]></amount>");
//xmlBuff.append( "<due_date><![CDATA["+sdf.format(dueDate).toString()+"]]></due_date>");
xmlBuff.append( "<due_date><![CDATA["+sdf.format(dueDateUpd).toString()+"]]></due_date>");
......@@ -677,8 +774,10 @@ public class GenPurcMilestoneSch extends ValidatorEJB implements Schedule {
xmlBuff.append( "<chg_user><![CDATA["+chgUser+"]]></chg_user>");
xmlBuff.append( "<chg_date><![CDATA["+ sdf.format(currentDate).toString() +"]]></chg_date>");
xmlBuff.append( "<chg_term><![CDATA["+chgTerm+"]]></chg_term>");*/
xmlBuff.append( "<ord_amt><![CDATA["+ordAmtPord+"]]></ord_amt>"); // Code added by Sagar on 27/11/15 Start.
xmlBuff.append( "<tax_amt><![CDATA["+taxAmtPord+"]]></tax_amt>");
xmlBuff.append( "<tot_amt><![CDATA["+totAmtPord+"]]></tot_amt>"); // Code added by Sagar on 27/11/15 End.
xmlBuff.append("</Detail1>");
xmlBuff.append("</Header0>");
xmlBuff.append("</group0>");
xmlBuff.append("</DocumentRoot>");
......
webitm-fin/ibase/webitm/ejb/fin/MilestonePayGen.java
View file @ 8c2c49d4
......@@ -77,8 +77,8 @@ public class MilestonePayGen
String taskCodePrv="",relAgainst="",result="";
String wfStatus ="",tranIdMilestn="",detailsResult="",tranIdCurr="";
String lineNoOrd="";
String retString="";
String sql = "",errString="",xtraParams="",siteCode="";
String retString="",taskCodeDescr="";
String sql = "",errString="",xtraParams="",siteCode="",sql2="";
boolean isSavedMilstn=true;
double odtAmt=0.0,totAmt=0.0,calRelAmt=0.0,taxAmt=0.0;
double relAmtPass=0.0;
......@@ -87,8 +87,8 @@ public class MilestonePayGen
int relAfterInt= 0;
Date dueDateUpd=null;
Timestamp tsDueDate = null,confDate = null;
PreparedStatement pstmt = null;
ResultSet rs = null;
PreparedStatement pstmt = null,pstmt2=null;
ResultSet rs = null,rs2=null;
GenericUtility genericUtility = GenericUtility.getInstance();
Connection conn = null;
ConnDriver connDriver = new ConnDriver();
......@@ -285,6 +285,21 @@ public class MilestonePayGen
System.out.println("tsDueDate>>>>>>" + tsDueDate);
dueDateUpd = utilmethod.RelativeDate(tsDueDate, totdelayDays);
System.out.println("dueDateUpd :" + dueDateUpd);*/
sql2 = " select descr from gencodes where fld_name='TASK_CODE' and mod_name='W_PORDER' and fld_value= ? ";
pstmt2 = conn.prepareStatement(sql2);
pstmt2.setString(1, taskCode);
rs2 = pstmt2.executeQuery();
if (rs2.next())
{
taskCodeDescr= checkNull(rs2.getString("descr"));
}
rs2.close();
rs2 = null;
pstmt2.close();
pstmt2 = null;
System.out.println(">>>taskCodeDescr:"+ taskCodeDescr);
StringBuffer xmlBuff = new StringBuffer();
......@@ -324,6 +339,7 @@ public class MilestonePayGen
xmlBuff.append("<tax_chap><![CDATA[" + taxChap + "]]></tax_chap>");
xmlBuff.append("<tax_env><![CDATA[" + taxEnv + "]]></tax_env>");
xmlBuff.append("<task_code><![CDATA[" + taskCode + "]]></task_code>");
xmlBuff.append( "<task_descr><![CDATA["+taskCodeDescr+"]]></task_descr>");// Code added by Sagar on 27/11/15
xmlBuff.append("<amount><![CDATA[" + calRelAmt + "]]></amount>");
xmlBuff.append("<due_date><![CDATA[" + dueDate + "]]></due_date>");
//xmlBuff.append("<due_date><![CDATA[" + sdf1.format(dueDateUpd).toString() + "]]></due_date>");
......@@ -346,6 +362,9 @@ public class MilestonePayGen
xmlBuff.append("<chg_date><![CDATA[" + tranDate + "]]></chg_date>");
xmlBuff.append("<chg_term><![CDATA[" + chgTerm + "]]></chg_term>");
xmlBuff.append("<date_format><![CDATA["+e12GenericUtility.getApplDateFormat()+"]]></date_format>");
xmlBuff.append( "<ord_amt><![CDATA["+odtAmt+"]]></ord_amt>"); // Code added by Sagar on 27/11/15 Start.
xmlBuff.append( "<tax_amt><![CDATA["+taxAmt+"]]></tax_amt>");
xmlBuff.append( "<tot_amt><![CDATA["+totAmt+"]]></tot_amt>"); // Code added by Sagar on 27/11/15 End.
xmlBuff.append("</Detail1>");
xmlBuff.append("</Header0>");
......
webitm-fin/ibase/webitm/ejb/fin/MilestonePayGenPrc.java
View file @ 8c2c49d4
......@@ -431,9 +431,10 @@ public class MilestonePayGenPrc extends ValidatorEJB implements MilestonePayGenP
ConnDriver connDriver = new ConnDriver();
SimpleDateFormat simpleDateFormat = null;
SimpleDateFormat sdf = null;
String projCode="",purcOrder="",releaseAgainst="",sysDate="",processDate="",resultString="",getDataSql="",processDt="";
String acctCode="",cctrCode = "";
double taxAmt=0.0, totAmt=0.0;
//Timestamp processDate1 = new Timestamp();
java.sql.Timestamp processDate1 = null ;
ArrayList<String> purcOrderList = new ArrayList<String>();
......@@ -656,7 +657,7 @@ public class MilestonePayGenPrc extends ValidatorEJB implements MilestonePayGenP
"pterm.AMT_TYPE ,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.allow_override, pterm.line_no__prev,pterm.remarks,po.SUPP_CODE " +
"pterm.ADJ_PERC,pterm.allow_override, pterm.line_no__prev,pterm.remarks,po.SUPP_CODE, po.ord_amt, po.tax_amt, po.tot_amt" +
"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' " +
......@@ -737,6 +738,12 @@ public class MilestonePayGenPrc extends ValidatorEJB implements MilestonePayGenP
valueXmlString.append("<compl_date>").append("<![CDATA[]]>").append("</compl_date>\r\n");
//LINE_NO__PREV
valueXmlString.append("<line_no__prev>").append("<![CDATA[" + checkNull(rs.getString("line_no__prev")) + "]]>").append("</line_no__prev>\r\n");
//Code added by Sagar on 27/11/15 Start
valueXmlString.append("<ord_amt>").append("<![CDATA[" + rs.getDouble("ord_amt") + "]]>").append("</ord_amt>\r\n");
valueXmlString.append("<tax_amt>").append("<![CDATA[" + rs.getDouble("tax_amt") + "]]>").append("</tax_amt>\r\n");
valueXmlString.append("<tot_amt>").append("<![CDATA[" + rs.getDouble("tot_amt") + "]]>").append("</tot_amt>\r\n");
//Code added by Sagar on 27/11/15 End
valueXmlString.append("</Detail2>\r\n");
}
rs.close();
......@@ -760,18 +767,24 @@ public class MilestonePayGenPrc extends ValidatorEJB implements MilestonePayGenP
pstmt.close();
pstmt = null;
sql = "select ord_amt from porder where purc_order = ? ";
//sql = "select ord_amt from porder where purc_order = ? "; // Comment added by Sagar on 27/11/15
sql = "select ord_amt, tax_amt, tot_amt from porder where purc_order = ? "; // Comment added by Sagar on 27/11/15
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, purcOrder);
rs = pstmt.executeQuery();
if (rs.next())
{
oderAmt = rs.getDouble("ord_amt");
taxAmt = rs.getDouble("tax_amt");
totAmt = rs.getDouble("tot_amt");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
System.out.println(">>>Adhoc oderAmt:"+oderAmt);
System.out.println(">>>Adhoct axAmt:"+taxAmt);
System.out.println(">>>Adhoc totAmt:"+totAmt);
sql = " select sum(amount) as amount from pur_milstn where purc_order = ? and wf_status = 'S' ";
pstmt = conn.prepareStatement(sql);
......@@ -861,6 +874,8 @@ public class MilestonePayGenPrc extends ValidatorEJB implements MilestonePayGenP
valueXmlString.append("<ord_amt>").append("<![CDATA["+oderAmt+" ]]>").append("</ord_amt>\r\n");
valueXmlString.append("<vocher_amt>").append("<![CDATA["+vocherAmt+" ]]>").append("</vocher_amt>\r\n");
valueXmlString.append("<milestone_amt>").append("<![CDATA["+milestonePendingAmt+" ]]>").append("</milestone_amt>\r\n");
valueXmlString.append("<tax_amt>").append("<![CDATA["+taxAmt+" ]]>").append("</tax_amt>\r\n"); // Code added by Sagar on 27/11/15 Start.
valueXmlString.append("<tot_amt>").append("<![CDATA["+totAmt+" ]]>").append("</tot_amt>\r\n"); // Code added by Sagar on 27/11/15 End.
valueXmlString.append("</Detail2>\r\n");
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment