Skip to content

B
business-java
Commit 55d92fb9 authored by mjadhav's avatar mjadhav
Browse files
Options

changes done for release amt 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@97874 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 9b32d548
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 13 deletions
webitm-fin/ibase/webitm/ejb/fin/MilestonePayGen.java
View file @ 55d92fb9
......@@ -76,7 +76,8 @@ public class MilestonePayGen
String vouchCreated ="",taskCode ="",dueDate ="",adjMethod ="",acctCode ="",cctrCode ="",taxClass ="";
String taxChap ="",taxEnv ="",retentionPerc ="",siteCodeAdv ="",adjPerc ="",processDate="",resultString="",chgUser="",chgTerm="";
boolean issError = false;
ResultSet rs = null;
double odtAmt=0.0,totAmt=0.0,calRelAmt=0.0;
String task[] = null;
//ArrayList<String> taskList = new ArrayList<String>();
//ArrayList<String> relAginstList = new ArrayList<String>();
......@@ -218,6 +219,51 @@ public class MilestonePayGen
} //end of IF for
/*----------release amt based on amt_type---------------*/
sql = "select ord_amt,tot_amt from porder where purc_order= ? " ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, purcOrder);
rs = pstmt.executeQuery();
if (rs.next())
{
odtAmt = rs.getDouble("ord_amt");
totAmt = rs.getDouble("tot_amt");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
System.out.println("odtAmt :"+odtAmt);
System.out.println("tot_amt :"+totAmt);
/*
amount=Double.parseDouble(relAmt);
pentlyAmt=(finChrge * amount)/100;
System.out.println("Calculated pentlyAmt :"+pentlyAmt);*/
System.out.println("amtType :"+amtType);
if(amtType.equalsIgnoreCase("01"))
{
calRelAmt=(odtAmt * Double.parseDouble(relAmt))/100;
}
else if(amtType.equalsIgnoreCase("02"))
{
calRelAmt=(totAmt * Double.parseDouble(relAmt))/100;
}
else
{
calRelAmt=Double.parseDouble(relAmt);
}
System.out.println("calRelAmt :"+calRelAmt);
/*---------------changes done 10-APR-2015------------------------------*/
java.sql.Timestamp today = null;
......@@ -257,9 +303,6 @@ public class MilestonePayGen
errString = createVouc11.createPoVoucher(purcOrder,xtraParams,conn,"PR", 0,today ,taskCode,relAgnst,lineNo);
......@@ -277,7 +320,7 @@ public class MilestonePayGen
taskCode=taskCode==null ? "" : taskCode.trim();
dueDate=dueDate==null ? "" : dueDate.trim();
processDate=processDate==null ? "" : processDate.trim();
relAmt=relAmt==null ? "0.00" : relAmt.trim();
// relAmt=relAmt==null ? "0.00" : relAmt.trim();
retString1 = confirmTranscation("voucher_adv",tranIdForVoucher,xtraParams,conn);
......@@ -320,7 +363,7 @@ public class MilestonePayGen
drcrMap.put("task_code", taskCode);
drcrMap.put("due_date", dueDate);
drcrMap.put("process_date", processDate);
drcrMap.put("rel_amt", relAmt);
drcrMap.put("rel_amt", String.valueOf(calRelAmt));
drcrMap.put("date_diff", String.valueOf(datediff));
resultString = createDebitNote(drcrMap,conn);
......@@ -543,12 +586,16 @@ public class MilestonePayGen
if(fchgType.equalsIgnoreCase("P"))
{
amount=Double.parseDouble(relAmt);
pentlyAmt=(finChrge * amount)/100;
pentlyAmt=(finChrge * amount)/100;//finChrge conside as percentage
System.out.println("Calculated pentlyAmt :"+pentlyAmt);
}
else if(fchgType.equalsIgnoreCase("Q"))
{
pentlyAmt=finChrge * amount;//finChrge conside as Quantity
}
else
{
pentlyAmt=finChrge;
pentlyAmt=finChrge;//finChrge conside as fixed amount
}
......
webitm-fin/ibase/webitm/ejb/fin/MilestonePayGenPrc.java
View file @ 55d92fb9
......@@ -157,7 +157,7 @@ public class MilestonePayGenPrc extends ValidatorEJB implements MilestonePayGenP
{
//sql = "SELECT COUNT(*) FROM PORD_PAY_TERM WHERE PURC_ORDER = ? AND VOUCH_CREATED = 'N'";
sql = "SELECT COUNT(*) FROM PORD_PAY_TERM WHERE PURC_ORDER = ? AND " +
" CASE WHEN VOUCH_CREATED IS NULL THEN 'N' ELSE VOUCH_CREATED END='N' and rel_agnst=? ";
" CASE WHEN VOUCH_CREATED IS NULL THEN 'N' ELSE VOUCH_CREATED END='N' and rel_agnst=? and task_code is not null ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, purcOrder.trim());
pstmt.setString(2, relAgnst);
......@@ -373,7 +373,7 @@ public class MilestonePayGenPrc extends ValidatorEJB implements MilestonePayGenP
SimpleDateFormat simpleDateFormat = null;
SimpleDateFormat sdf = null;
String projCode="",purcOrder="",releaseAgainst="",processDate="",resultString="",getDataSql="",processDt="";
String projCode="",purcOrder="",releaseAgainst="",sysDate="",processDate="",resultString="",getDataSql="",processDt="";
//Timestamp processDate1 = new Timestamp();
java.sql.Timestamp processDate1 = null ;
ArrayList<String> purcOrderList = new ArrayList<String>();
......@@ -418,13 +418,17 @@ public class MilestonePayGenPrc extends ValidatorEJB implements MilestonePayGenP
System.out.println("currentColumn in case 1===="+currentColumn);
if(currentColumn.trim().equals("itm_default"))
{
Calendar cal = Calendar.getInstance();
/*Calendar cal = Calendar.getInstance();
Date d = new Date();
cal.setTime(d);
cal.set(Calendar.DATE,1);
d = cal.getTime();
String sysDate = simpleDateFormat.format(d);
System.out.println("sysDate[" + sysDate + "]");
System.out.println("sysDate[" + sysDate + "]");*/
Date d = new Date();
sysDate = simpleDateFormat.format(d);
System.out.println("sysDate:" + sysDate + "]");
valueXmlString.append("<proj_code>").append("").append("</proj_code>");
valueXmlString.append("<purc_order>").append("").append("</purc_order>");
......@@ -699,7 +703,10 @@ public class MilestonePayGenPrc extends ValidatorEJB implements MilestonePayGenP
ConnDriver connDriver = new ConnDriver();
connectionObject = connDriver.getConnectDB("DriverITM");
sql = "select purc_order,line_no,rel_agnst,rel_amt,vouch_created from pord_pay_term where vouch_created='N' ";
//sql = "select purc_order,line_no,rel_agnst,rel_amt,vouch_created from pord_pay_term where vouch_created='N' ";
sql = " select purc_order,line_no,rel_agnst,rel_amt,vouch_created from pord_pay_term where " +
" vouch_created='N' and rel_agnst in ('05','06') and task_code is not null order by purc_order desc ";
System.out.println(" selectteam sql [" + sql + "]");
pstmt = connectionObject.prepareStatement(sql);
......
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