Skip to content

B
business-java
Commit 0f279b36 authored by prane's avatar prane
Browse files
Options

checked for null value before formatting and setting for date columns 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@182903 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 4eb7340f
Show whitespace changes
Inline Side-by-side
Showing with 141 additions and 73 deletions
webitm-fin/ibase/webitm/ejb/fin/RetainerContractReleasePrc.java
View file @ 0f279b36
......@@ -103,10 +103,15 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
System.out.println("DOM format:toDateStr["+toDateStr+"]");
//reqdate = genericUtility.getValidDateString(toDateStr, genericUtility.getDBDateFormat(),genericUtility.getApplDateFormat());
if(fromDateStr != null)
{
fromDate = Timestamp.valueOf(genericUtility.getValidDateString(fromDateStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
}
System.out.println("Timestamp format: fromDate["+fromDate+"]");
if(toDateStr != null)
{
toDate = Timestamp.valueOf(genericUtility.getValidDateString(toDateStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
}
siteFr = checkNull(genericUtility.getColumnValue("site_code__fr", dom));
siteTo = checkNull(genericUtility.getColumnValue("site_code__to", dom));
payRec = checkNull(genericUtility.getColumnValue("pr_type", dom));
......@@ -491,6 +496,8 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
billDate = rs.getTimestamp("bill_date");
}
else
{
if(sundryType != null && sundryCode != null)
{
sql1 = "select FN_RSUNDRY_NAME ('?','?','N') as sundry_name from retainer_contract";
pstmt1 = conn.prepareStatement(sql1);
......@@ -505,7 +512,7 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
rs1.close();
pstmt1 = null;
rs1 = null;
}
}
if(String.valueOf(amount) == null)
{
......@@ -521,7 +528,7 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
//System.out.println("dateLastProc.equals(01/01/1900"+dateLastProc.equals(01/01/1900));
if(dateLastProc == null || dateLastProc.equals(01/01/1900))
if(dateLastProc == null)
{
System.out.println("effDtDate"+effDtDate+"]fromDate["+fromDate);
if(effDtDate.equals(fromDate))
......@@ -530,9 +537,11 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
xmlBuff.append("<Detail2>");
xmlBuff.append("<contract_id>").append("<![CDATA[" + contractId + "]]>").append("</contract_id>");
String temp1 = sdf.format(contractDate);
System.out.println("sdf"+temp1);
xmlBuff.append("<contract_date>").append("<![CDATA[" + temp1 + "]]>").append("</contract_date>");
System.out.println("sdf contract_date::"+contractDate);
if(contractDate != null)
{
xmlBuff.append("<contract_date>").append("<![CDATA[" + sdf.format(contractDate) + "]]>").append("</contract_date>");
}
xmlBuff.append("<contract_type>").append("<![CDATA[" + contractType + "]]>").append("</contract_type>");
xmlBuff.append("<descr>").append("<![CDATA[" + descr + "]]>").append("</descr>");
xmlBuff.append("<site_code>").append("<![CDATA[" + siteCode + "]]>").append("</site_code>");
......@@ -540,20 +549,24 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
xmlBuff.append("<sundry_code>").append("<![CDATA[" + sundryCode + "]]>").append("</sundry_code>");
xmlBuff.append("<payable_receivable>").append("<![CDATA[" + payableReceivable + "]]>").append("</payable_receivable>");
xmlBuff.append("<credit_days>").append("<![CDATA[" + creditDays + "]]>").append("</credit_days>");
if(effDtDate != null) {
xmlBuff.append("<eff_date>").append("<![CDATA[" + sdf.format(effDtDate) + "]]>").append("</eff_date>");
}
if(validDateUpto != null) {
xmlBuff.append("<valid_upto>").append("<![CDATA[" + sdf.format(validDateUpto) + "]]>").append("</valid_upto>");
}
xmlBuff.append("<cycle_time>").append("<![CDATA[" + cycleTime + "]]>").append("</cycle_time>");//cycleTime == null ?(0.00):cycleTime
xmlBuff.append("<amount>").append("<![CDATA[" + amount + "]]>").append("</amount>");
xmlBuff.append("<acct_code__arap>").append("<![CDATA[" + acctCodeArAp + "]]>").append("</acct_code__arap>");
xmlBuff.append("<cctr_code__arap>").append("<![CDATA[" + cctrCodeArAp + "]]>").append("</cctr_code__arap>");
xmlBuff.append("<date__last_proc>").append("<![CDATA[" + sdf.format(dateLastProc) + "]]>").append("</date__last_proc>");
//xmlBuff.append("<date__last_proc>").append("<![CDATA[" + sdf.format(dateLastProc) + "]]>").append("</date__last_proc>");
xmlBuff.append("<status>").append("<![CDATA[" +status + "]]>").append("</status>");
xmlBuff.append("<chg_user>").append("<![CDATA[" + chgUser + "]]>").append("</chg_user>");
/*xmlBuff.append("<chg_user>").append("<![CDATA[" + chgUser + "]]>").append("</chg_user>");
xmlBuff.append("<chg_date>").append("<![CDATA[" + sdf.format(chgDate) + "]]>").append("</chg_date>");
xmlBuff.append("<chg_term>").append("<![CDATA[" + chgTerm + "]]>").append("</chg_term>");
xmlBuff.append("<add_date>").append("<![CDATA[" + (sdf.format(addDate))+ "]]>").append("</add_date>");
xmlBuff.append("<add_user>").append("<![CDATA[" + addUser + "]]>").append("</add_user>");
xmlBuff.append("<add_term>").append("<![CDATA[" + addTerm + "]]>").append("</add_term>");
xmlBuff.append("<add_term>").append("<![CDATA[" + addTerm + "]]>").append("</add_term>");*/
xmlBuff.append("<cr_term>").append("<![CDATA[" + crTerm + "]]>").append("</cr_term>");
xmlBuff.append("<tax_class>").append("<![CDATA[" + taxClass + "]]>").append("</tax_class>");
xmlBuff.append("<tax_chap>").append("<![CDATA[" + taxChap + "]]>").append("</tax_chap>");
......@@ -565,7 +578,10 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
xmlBuff.append("<bank_code>").append("<![CDATA[" + bankCode + "]]>").append("</bank_code>");
xmlBuff.append("<bill_no>").append("<![CDATA[" + "" + "]]>").append("</bill_no>");
xmlBuff.append("<bill_date>").append("<![CDATA[" + "" + "]]>").append("</bill_date>");
if(processUptillDate != null)
{
xmlBuff.append("<to_date>").append("<![CDATA[" + (sdf.format(processUptillDate)) + "]]>").append("</to_date>");
}
xmlBuff.append("<sundry_name>").append("<![CDATA[" + mdeScr + "]]>").append("</sundry_name>");
System.out.println("appended:"+xmlBuff);
}
......@@ -581,7 +597,9 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
xmlBuff.append("<Detail2>");
System.out.println("contractDate::["+contractDate+"]");
xmlBuff.append("<contract_id>").append("<![CDATA[" + contractId + "]]>").append("</contract_id>");
if(contractDate != null){
xmlBuff.append("<contract_date>").append("<![CDATA[" + (sdf.format(contractDate))+ "]]>").append("</contract_date>");
}
xmlBuff.append("<contract_type>").append("<![CDATA[" + contractType + "]]>").append("</contract_type>");
xmlBuff.append("<descr>").append("<![CDATA[" + descr + "]]>").append("</descr>");
xmlBuff.append("<site_code>").append("<![CDATA[" + siteCode + "]]>").append("</site_code>");
......@@ -589,20 +607,27 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
xmlBuff.append("<sundry_code>").append("<![CDATA[" + sundryCode + "]]>").append("</sundry_code>");
xmlBuff.append("<payable_receivable>").append("<![CDATA[" + payableReceivable + "]]>").append("</payable_receivable>");
xmlBuff.append("<credit_days>").append("<![CDATA[" + creditDays + "]]>").append("</credit_days>");
if(effDtDate != null) {
xmlBuff.append("<eff_date>").append("<![CDATA[" + (sdf.format(effDtDate)) + "]]>").append("</eff_date>");
}
if(validDateUpto != null)
{
xmlBuff.append("<valid_upto>").append("<![CDATA[" + (sdf.format(validDateUpto)) + "]]>").append("</valid_upto>");
}
xmlBuff.append("<cycle_time>").append("<![CDATA[" + cycleTime + "]]>").append("</cycle_time>");//cycleTime == null ?(0.00):cycleTime
xmlBuff.append("<amount>").append("<![CDATA[" + amount + "]]>").append("</amount>");
xmlBuff.append("<acct_code__arap>").append("<![CDATA[" + acctCodeArAp + "]]>").append("</acct_code__arap>");
xmlBuff.append("<cctr_code__arap>").append("<![CDATA[" + cctrCodeArAp + "]]>").append("</cctr_code__arap>");
if(dateLastProc != null){
xmlBuff.append("<date__last_proc>").append("<![CDATA[" + (sdf.format(dateLastProc)) + "]]>").append("</date__last_proc>");
}
xmlBuff.append("<status>").append("<![CDATA[" +status + "]]>").append("</status>");
xmlBuff.append("<chg_user>").append("<![CDATA[" + chgUser + "]]>").append("</chg_user>");
/*xmlBuff.append("<chg_user>").append("<![CDATA[" + chgUser + "]]>").append("</chg_user>");
xmlBuff.append("<chg_date>").append("<![CDATA[" + (sdf.format(chgDate)) + "]]>").append("</chg_date>");
xmlBuff.append("<chg_term>").append("<![CDATA[" + chgTerm + "]]>").append("</chg_term>");
xmlBuff.append("<add_date>").append("<![CDATA[" + (sdf.format(addDate)) + "]]>").append("</add_date>");
xmlBuff.append("<add_user>").append("<![CDATA[" + addUser + "]]>").append("</add_user>");
xmlBuff.append("<add_term>").append("<![CDATA[" + addTerm + "]]>").append("</add_term>");
xmlBuff.append("<add_term>").append("<![CDATA[" + addTerm + "]]>").append("</add_term>");*/
xmlBuff.append("<cr_term>").append("<![CDATA[" + crTerm + "]]>").append("</cr_term>");
xmlBuff.append("<tax_class>").append("<![CDATA[" + taxClass + "]]>").append("</tax_class>");
xmlBuff.append("<tax_chap>").append("<![CDATA[" + taxChap + "]]>").append("</tax_chap>");
......@@ -614,7 +639,10 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
xmlBuff.append("<bank_code>").append("<![CDATA[" + bankCode + "]]>").append("</bank_code>");
xmlBuff.append("<bill_no>").append("<![CDATA[" + "" + "]]>").append("</bill_no>");
xmlBuff.append("<bill_date>").append("<![CDATA[" + "" + "]]>").append("</bill_date>");
if(processUptillDate != null)
{
xmlBuff.append("<to_date>").append("<![CDATA[" + (sdf.format(processUptillDate)) + "]]>").append("</to_date>");
}
xmlBuff.append("<sundry_name>").append("<![CDATA[" + "" + "]]>").append("</sundry_name>");
xmlBuff.append("</Detail2>");
......@@ -753,10 +781,16 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
System.out.println("contract_id:["+contractId+"]");
ContList.add(contractId);
lastDateStr = genericUtility.getColumnValueFromNode("date__last_proc", parentNode);
if(lastDateStr != null)
{
lastDate = Timestamp.valueOf(genericUtility.getValidDateString(lastDateStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
}
System.out.println("lastDateStr["+lastDateStr+"] lastDate["+lastDate+"]");
validDateStr = genericUtility.getColumnValueFromNode("valid_upto", parentNode);
if(validDateStr != null)
{
validDate = Timestamp.valueOf(genericUtility.getValidDateString(validDateStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
}
System.out.println("validDateStr["+validDateStr+"] validDate["+validDate+"");
//takes value from detail dom to insert in header of each transaction
......@@ -809,7 +843,10 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
if(lastDate == null)
{
lastDate1Str = genericUtility.getColumnValueFromNode("eff_date", parentNode);
if(lastDate1Str != null)
{
lastDate1 = Timestamp.valueOf(genericUtility.getValidDateString(lastDate1Str, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
}
System.out.println("[lastDate1Str]::["+lastDate1Str+"] [lastDate1]::["+lastDate1+"]");
}
else
......@@ -876,7 +913,7 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
pstmt.close();
pstmt = null;
sql ="update retainer_contract set date__last_proc = ? where contract_id = '';";
sql ="update retainer_contract set date__last_proc = ? where contract_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setTimestamp(1, lastDate1);
pstmt.setString(2, contractId);
......@@ -1130,9 +1167,13 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
System.out.println("empCodedet["+empCodedet+"]");
relDateStr = genericUtility.getColumnValue("rel_date", headerDom);
System.out.println("relDateStr is ["+relDateStr+"]");
if(relDateStr != null){
relDate = Timestamp.valueOf(genericUtility.getValidDateString(relDateStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
}
String effDate1Str = genericUtility.getColumnValue("eff_date", headerDom);
if(effDate1Str != null){
effDate1 = Timestamp.valueOf(genericUtility.getValidDateString(effDate1Str, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
}
System.out.println("effDate1Str is["+effDate1Str+"]");
chgTerm = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "chgTerm" );
chgUser = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" );
......@@ -1283,10 +1324,15 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
xmlBuff.append("<misc_voucher/>");
xmlBuff.append("<tran_id/>");
if(relDate != null){
xmlBuff.append("<tran_date>").append("<![CDATA[" + sdf.format(relDate) + "]]>").append("</tran_date>");
}
xmlBuff.append("<vouch_type>").append("<![CDATA[" +vouchType + "]]>").append("</vouch_type>");
xmlBuff.append("<tran_type>").append("<![CDATA[" + tranType + "]]>").append("</tran_type>");
if(ldtoDate != null){
xmlBuff.append("<eff_date>").append("<![CDATA[" + sdf.format(ldtoDate) + "]]>").append("</eff_date>");
}
xmlBuff.append("<sundry_type>").append("<![CDATA[" + sundryType + "]]>").append("</sundry_type>");
xmlBuff.append("<sundry_code>").append("<![CDATA[" + sundryCode + "]]>").append("</sundry_code>");
xmlBuff.append("<bill_no>").append("<![CDATA[" + billNo1 + "]]>").append("</bill_no>");
......@@ -1303,10 +1349,12 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
xmlBuff.append("<auto_pay>").append("<![CDATA[" + autoPay + "]]>").append("</auto_pay>");
xmlBuff.append("<adv_amt>").append("<![CDATA[" + advAmt + "]]>").append("</adv_amt>");
xmlBuff.append("<cr_term>").append("<![CDATA[" + crTerm + "]]>").append("</cr_term>");
if(dueDate != null){
xmlBuff.append("<due_date>").append("<![CDATA[" + sdf.format(dueDate) + "]]>").append("</due_date>");
xmlBuff.append("<chg_date>").append("<![CDATA[" + sdf.format(chgDate) + "]]>").append("</chg_date>");
xmlBuff.append("<chg_user>").append("<![CDATA[" + chgUser + "]]>").append("</chg_user>");
xmlBuff.append("<chg_term>").append("<![CDATA[" + chgTerm + "]]>").append("</chg_term>");
}
//xmlBuff.append("<chg_date>").append("<![CDATA[" + sdf.format(chgDate) + "]]>").append("</chg_date>");
//xmlBuff.append("<chg_user>").append("<![CDATA[" + chgUser + "]]>").append("</chg_user>");
//xmlBuff.append("<chg_term>").append("<![CDATA[" + chgTerm + "]]>").append("</chg_term>");
xmlBuff.append("<site_code>").append("<![CDATA[" + siteCode + "]]>").append("</site_code>");
xmlBuff.append("<fin_entity>").append("<![CDATA[" + finEntity + "]]>").append("</fin_entity>");
xmlBuff.append("<net_amt>").append("<![CDATA[" + netAmt + "]]>").append("</net_amt>");
......@@ -1316,7 +1364,9 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
xmlBuff.append("<tax_class>").append("<![CDATA[" + taxClass + "]]>").append("</tax_class>");
xmlBuff.append("<tax_chap>").append("<![CDATA[" + taxChap + "]]>").append("</tax_chap>");
xmlBuff.append("<tax_env>").append("<![CDATA[" + taxEnv + "]]>").append("</tax_env>");
if(relDate != null){
xmlBuff.append("<tax_date>").append("<![CDATA[" + sdf.format(relDate) + "]]>").append("</tax_date>");
}
xmlBuff.append("<anal_code>").append("<![CDATA[" + analCode + "]]>").append("</anal_code>");
xmlBuff.append("<proj_code>").append("<![CDATA[" + projCode + "]]>").append("</proj_code>");
xmlBuff.append("<confirmed>").append("<![CDATA[" + "N" + "]]>").append("</confirmed>");
......@@ -1414,7 +1464,9 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
xmlBuff.append("<dept_code>").append("<![CDATA[" + rs.getString("dept_code") + "]]>").append("</dept_code>");
xmlBuff.append("<remarks>").append("<![CDATA[" + rs.getString("remarks") + "]]>").append("</remarks>");
xmlBuff.append("<bill_no>").append("<![CDATA[" + billNo1 + "]]>").append("</bill_no>");
if(billDateStr != null){
xmlBuff.append("<bill_date>").append("<![CDATA[" + billDateStr + "]]>").append("</bill_date>");
}
xmlBuff.append("</Detail3>");
xmlBuff.append("\n");
......@@ -1560,9 +1612,13 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId");
System.out.println("[today:"+today+"][chgUser"+chgUser+"][chgTerm"+chgTerm+"]");
String relDateStr = genericUtility.getColumnValue("rel_date", headerDom);
if(relDateStr != null){
relDate = Timestamp.valueOf(genericUtility.getValidDateString(relDateStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
}
String effDate1Str = genericUtility.getColumnValue("eff_date", headerDom);
if(effDate1Str != null){
effDate1 = Timestamp.valueOf(genericUtility.getValidDateString(effDate1Str, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
}
System.out.println("[relDateStr:"+relDateStr+"][relDate"+relDate+"][effDate1Str:"+effDate1Str+"]");
System.out.println("----miscVouchAR---hdrMap["+hdrMap+"]");
......@@ -1587,7 +1643,7 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
"[13]"+crDays+"[16]"+projCode);
tranDate = lastDate1;
effDate = lastDate1;
System.out.println("tranDate::["+tranDate+"]effDate["+effDate+"]");
System.out.println("dueDate before relativeDate:["+dueDate+"]");
dueDate = utilMethods.RelativeDate(chgDate, crDays);
System.out.println("dueDate after relativeDate:["+dueDate+"]");
......@@ -1600,7 +1656,7 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
dueDate = chgDate;
}
taxDate = lastDate1;
System.out.println("[taxDate-"+taxDate+"][lastDate1-"+lastDate1+"]");
System.out.println("[taxDate-"+taxDate+"][lastDate1-"+lastDate1+"]dueDate["+dueDate+"]");
sql = "select fin_entity from site where site_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, siteCode);
......@@ -1664,7 +1720,7 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
relDate=tranDate;
}
System.out.println("simpleDateFormat.format(releaseToDt)::"+simpleDateFormat.format(releaseToDt));
System.out.println("releaseToDt::"+releaseToDt);
StringBuffer xmlBuff = new StringBuffer();
xmlBuff.append("<?xml version='1.0' encoding='ISO-8859-1'?><DocumentRoot>");
......@@ -1691,8 +1747,12 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
xmlBuff.append("<misc_drcr_rcp_dr/>");
xmlBuff.append("<tran_id/>");
xmlBuff.append("<tran_ser>").append("<![CDATA[" + refSer + "]]>").append("</tran_ser>");
if(relDate != null){
xmlBuff.append("<tran_date>").append("<![CDATA[" + simpleDateFormat.format(relDate) + "]]>").append("</tran_date>");
}
if(releaseToDt != null) {
xmlBuff.append("<eff_date>").append("<![CDATA[" + simpleDateFormat.format(releaseToDt) + "]]>").append("</eff_date>");
}
xmlBuff.append("<fin_entity>").append("<![CDATA[" + finEntity + "]]>").append("</fin_entity>");
xmlBuff.append("<site_code>").append("<![CDATA[" + siteCode + "]]>").append("</site_code>");
xmlBuff.append("<sundry_type>").append("<![CDATA[" + sundryType + "]]>").append("</sundry_type>");
......@@ -1706,10 +1766,12 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
xmlBuff.append("<drcr_flag>").append("<![CDATA[" + drCrFlag + "]]>").append("</drcr_flag>");
xmlBuff.append("<tran_id__rcv>").append("<![CDATA[" + tranIdRcv + "]]>").append("</tran_id__rcv>");
xmlBuff.append("<confirmed>").append("<![CDATA[" + confirmed + "]]>").append("</confirmed>");
xmlBuff.append("<chg_user>").append("<![CDATA[" + chgUser + "]]>").append("</chg_user>");
/*xmlBuff.append("<chg_user>").append("<![CDATA[" + chgUser + "]]>").append("</chg_user>");
xmlBuff.append("<chg_date>").append("<![CDATA[" + today + "]]>").append("</chg_date>");
xmlBuff.append("<chg_term>").append("<![CDATA[" + chgTerm + "]]>").append("</chg_term>");
xmlBuff.append("<chg_term>").append("<![CDATA[" + chgTerm + "]]>").append("</chg_term>");*/
if(dueDate != null){
xmlBuff.append("<due_date>").append("<![CDATA[" + simpleDateFormat.format(dueDate) + "]]>").append("</due_date>");
}
xmlBuff.append("<tran_type>").append("<![CDATA[" + tranType + "]]>").append("</tran_type>");
xmlBuff.append("<amount__bc>").append("<![CDATA[" + amtBase + "]]>").append("</amount__bc>");
xmlBuff.append("<rnd_off>").append("<![CDATA[" + rndOff + "]]>").append("</rnd_off>");
......@@ -1917,9 +1979,13 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
today = simpleDateFormat.format(cal.getTime());
System.out.println("today:"+today);
String relDateStr = genericUtility.getColumnValue("rel_date", headerDom);
if(relDateStr != null){
relDate = Timestamp.valueOf(genericUtility.getValidDateString(relDateStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
}
String effDate1Str = genericUtility.getColumnValue("eff_date", headerDom);
if(effDate1Str != null) {
effDate1 = Timestamp.valueOf(genericUtility.getValidDateString(effDate1Str, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
}
siteCode = hdrMap.get("site_code");
acctCode = hdrMap.get("acct_code");
......@@ -1978,8 +2044,10 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
xmlBuff.append("<journal/>");
xmlBuff.append("<tran_id/>");
xmlBuff.append("<tran_date>").append("<![CDATA[" + sdf.format(relDate) + "]]>").append("</tran_date>");
xmlBuff.append("<eff_date>").append("<![CDATA[" + sdf.format(relDate) + "]]>").append("</eff_date>");
if(today != null){
xmlBuff.append("<tran_date>").append("<![CDATA[" + today + "]]>").append("</tran_date>");
xmlBuff.append("<eff_date>").append("<![CDATA[" + today + "]]>").append("</eff_date>");
}
xmlBuff.append("<fin_entity>").append("<![CDATA[" + finEntity + "]]>").append("</fin_entity>");
xmlBuff.append("<curr_code>").append("<![CDATA[" + currCode + "]]>").append("</curr_code>");
xmlBuff.append("<exch_rate>").append("<![CDATA[" + exchRate + "]]>").append("</exch_rate>");
......@@ -1988,9 +2056,9 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
xmlBuff.append("<remarks>").append("<![CDATA[" +"#" +contractId + ", Autogenerated" + "]]>").append("</remarks>");
xmlBuff.append("<reversible>").append("<![CDATA[" + "N" + "]]>").append("</reversible>");
xmlBuff.append("<site_code>").append("<![CDATA[" + siteCode + "]]>").append("</site_code>");
xmlBuff.append("<chg_date>").append("<![CDATA[" + today + "]]>").append("</chg_date>");
/*xmlBuff.append("<chg_date>").append("<![CDATA[" + today + "]]>").append("</chg_date>");
xmlBuff.append("<chg_user>").append("<![CDATA[" + chgUser + "]]>").append("</chg_user>");
xmlBuff.append("<chg_term>").append("<![CDATA[" + chgTerm + "]]>").append("</chg_term>");
xmlBuff.append("<chg_term>").append("<![CDATA[" + chgTerm + "]]>").append("</chg_term>");*/
xmlBuff.append("<site_code__rev>").append("<![CDATA[" + siteCode + "]]>").append("</site_code__rev>");
xmlBuff.append("<site_code__for>").append("<![CDATA[" + siteCode + "]]>").append("</site_code__for>");
xmlBuff.append("<tran_type>").append("<![CDATA[" + contractType + "]]>").append("</tran_type>");
......
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