Skip to content

B
business-java
Commit ef876c07 authored by smanohar's avatar smanohar
Browse files
Options

"null" set in various column corrected 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@183028 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 5c659826
Show whitespace changes
Inline Side-by-side
Showing with 51 additions and 6 deletions
webitm-fin/ibase/webitm/ejb/fin/RetainerContractReleasePrc.java
View file @ ef876c07
......@@ -1763,7 +1763,6 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
{
relDate=tranDate;
}
System.out.println("releaseToDt::"+releaseToDt);
StringBuffer xmlBuff = new StringBuffer();
......@@ -1790,6 +1789,22 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
xmlBuff.append("<attribute pkNames=\"\" selected=\"N\" status=\"N\" updateFlag=\"A\"/>");
xmlBuff.append("<misc_drcr_rcp_dr/>");
xmlBuff.append("<tran_id/>");
// 04-apr-18 manoharan initialise all string variables
refSer = checkNull(refSer);
finEntity = checkNull(finEntity);
siteCode = checkNull(siteCode);
sundryType = checkNull(sundryType);
sundryCode = checkNull(sundryCode);
acctCode = checkNull(refSer);
cctrCode = checkNull(cctrCode);
currCode = checkNull(currCode);
remarks = checkNull(remarks);
tranType = checkNull(tranType);
bankCode = checkNull(bankCode);
// end 04-apr-18 manoharan initialise all string variables
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>");
......@@ -1889,7 +1904,7 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
}
if(projCode == null || projCode.trim().length() == 0 || "null".equals(projCode))
{
projCode = " ";
projCode = "";
}
System.out.println("amountDet:"+amountDet);
netAmt = amountDet + taxDet;
......@@ -1897,6 +1912,16 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
xmlBuff.append("<Detail2 dbID=\"\" domID=\""+lineNoCount+"\" objContext=\"2\" objName=\"misc_drcr_rcp_dr\">");
xmlBuff.append("<attribute pkNames=\"\" selected=\"N\" status=\"N\" updateFlag=\"A\"/>");
xmlBuff.append("<misc_drcr_rcp_dr/>");
// 04-apr-18 manoharan initialise all string variables
acctCodeDet = checkNull(acctCodeDet);
cctrCodedet = checkNull(cctrCodedet);
analCode = checkNull(analCode);
empCode = checkNull(empCode);
analCode1 = checkNull(analCode1);
analCode2 = checkNull(analCode2);
deptCode = checkNull(deptCode);
remarks = checkNull(remarks);
// end 04-apr-18 manoharan initialise all string variables
xmlBuff.append("<tran_id/>");
xmlBuff.append("<line_no>").append("<![CDATA[" + lineNoCount + "]]>").append("</line_no>");
......@@ -1905,7 +1930,7 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
xmlBuff.append("<amount>").append("<![CDATA[" + amountDet + "]]>").append("</amount>");
xmlBuff.append("<anal_code>").append("<![CDATA[" + analCode + "]]>").append("</anal_code>");
xmlBuff.append("<emp_code>").append("<![CDATA[" + empCode + "]]>").append("</emp_code>");
xmlBuff.append("<tax_amt>").append("<![CDATA[" + taxDet + "]]>").append("</tax_amt>");
xmlBuff.append("<tax_amt>").append("<![CDATA[0]]>").append("</tax_amt>");
xmlBuff.append("<net_amt>").append("<![CDATA[" + netAmt + "]]>").append("</net_amt>");
xmlBuff.append("<tax_class>").append("<![CDATA[" + taxClassDet + "]]>").append("</tax_class>");
......@@ -2108,6 +2133,18 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
xmlBuff.append("<tran_date>").append("<![CDATA[" + today + "]]>").append("</tran_date>");
xmlBuff.append("<eff_date>").append("<![CDATA[" + today + "]]>").append("</eff_date>");
}
// 04-apr-18 manoharan initialise all string variables
finEntity = checkNull(finEntity);
currCode = checkNull(currCode);
contractId = checkNull(contractId);
siteCode = checkNull(siteCode);
contractType = checkNull(contractType);
refSer = checkNull(refSer);
projCode = checkNull(projCode);
// end 04-apr-18 manoharan initialise all string variables
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>");
......@@ -2153,6 +2190,14 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
xmlBuff.append("<attribute pkNames=\"\" selected=\"N\" status=\"N\" updateFlag=\"A\"/>");
xmlBuff.append("<journal/>");
xmlBuff.append("<tran_id/>");
// 04-apr-18 manoharan initialise all string variables
acctCode = checkNull(acctCode);
cctrCode = checkNull(cctrCode);
acctCodeDet = checkNull(acctCodeDet);
cctrCodeDet = checkNull(cctrCodeDet);
// end 04-apr-18 manoharan initialise all string variables
xmlBuff.append("<line_no>").append("<![CDATA[" + lineNo + "]]>").append("</line_no>");
xmlBuff.append("<acct_code>").append("<![CDATA[" + acctCode + "]]>").append("</acct_code>");
xmlBuff.append("<cctr_code>").append("<![CDATA[" + cctrCode + "]]>").append("</cctr_code>");
......@@ -2318,7 +2363,7 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
private String checkNullAndTrim(String inputVal)
{
if ( inputVal == null )
if ( inputVal == null || "null".equals(input))
{
inputVal = "";
}
......@@ -2330,7 +2375,7 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
}
private String checkNull(String input)
{
if (input == null)
if (input == null || "null".equals(input))
{
input = "";
}
......
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