Skip to content

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

bug fix 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@182985 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 979d3d48
Expand all Show whitespace changes
Inline Side-by-side
Showing with 186 additions and 119 deletions
webitm-fin/ibase/webitm/ejb/fin/RetainerContractIC.java
View file @ e6657a88
......@@ -127,6 +127,7 @@ public class RetainerContractIC extends ValidatorEJB implements RetainerContract
String analCode2 = "";
String deptCode = "";
String projCodes = "";
String payableReceivable = "";
double amount = 0.0;
Timestamp contractDate = null;
FinCommon finCommon = null;
......@@ -158,6 +159,8 @@ public class RetainerContractIC extends ValidatorEJB implements RetainerContract
{
childNode = childNodeList.item(ctr);
childNodeName = childNode.getNodeName();
payableReceivable = checkNull(genericUtility.getColumnValue("payable_receivable", dom));
System.out.println(">>>>>>payableReceivable in Val::["+payableReceivable+"]");
if (childNodeName.equalsIgnoreCase("site_code"))
{
siteCode = checkNull(genericUtility.getColumnValue("site_code", dom));
......@@ -252,11 +255,15 @@ public class RetainerContractIC extends ValidatorEJB implements RetainerContract
{
sundryCode = checkNull(genericUtility.getColumnValue("sundry_code", dom));
if ( sundryCode == null || sundryCode.trim().length() == 0)
{
if(!("J".equalsIgnoreCase(payableReceivable)))
{
errList.add("VTACCTCD1");
errFields.add(childNodeName.toLowerCase());
//goto hdr_error
}
}else
{
sundryType = checkNull(genericUtility.getColumnValue("sundry_type", dom));
if("C".equalsIgnoreCase(sundryType))
{
......@@ -341,6 +348,7 @@ public class RetainerContractIC extends ValidatorEJB implements RetainerContract
}
}
}
}//else end
}
else if (childNodeName.equalsIgnoreCase("eff_date"))
{
......@@ -510,6 +518,8 @@ public class RetainerContractIC extends ValidatorEJB implements RetainerContract
}
}
else if (childNodeName.equalsIgnoreCase("cr_term"))
{
if(!("J".equalsIgnoreCase(payableReceivable)))
{
crTerm = checkNull(genericUtility.getColumnValue("cr_term", dom));
sql = " select count(*) as cnt from crterm where cr_term = ?";
......@@ -531,6 +541,7 @@ public class RetainerContractIC extends ValidatorEJB implements RetainerContract
errFields.add(childNodeName.toLowerCase());
}
}
}
else if (childNodeName.equalsIgnoreCase("bank_code"))
{
bankCode = checkNull(genericUtility.getColumnValue("bank_code", dom));
......@@ -760,7 +771,7 @@ public class RetainerContractIC extends ValidatorEJB implements RetainerContract
{
Connection conn = null;
String sql = "", descr = "", sundryCode="", sundryType="", payableReceivable="", description="",description1="",description2="",description3="",
dateNow="", rndStr="", rndOff="", tranSer="", siteCode="",SiteDescr="",bankCode="",bankName="";
dateNow="", rndStr="", rndOff="", tranSer="", siteCode="",SiteDescr="",bankCode="",bankName="", projCode="";
String crTerm="", creditPrd="" ,payMode="", empFName="", empLName="", sundryName="",
accountsDescr="", currencyDescr="", currCode="",acctCode="",cctrCode="",acctCodeArAp="",lineNo="",
contractId="",taxClass="",taxChap="",taxEnv="",empCode="",deptCode="", fName="", lName="", mName="";
......@@ -937,6 +948,14 @@ public class RetainerContractIC extends ValidatorEJB implements RetainerContract
valueXmlString.append("<bank_bank_name>").append("<![CDATA[" + bankName + "]]>").append("</bank_bank_name>");
}
projCode = checkNull(genericUtility.getColumnValue("proj_code", dom));
if(projCode != null && projCode.trim().length() > 0)
{
valueXmlString.append("<proj_code>").append("<![CDATA[" + " " + "]]>").append("</proj_code>");
}else
{
valueXmlString.append("<proj_code>").append("<![CDATA[" + projCode + "]]>").append("</proj_code>");
}
}else if(currentColumn.trim().equalsIgnoreCase("sundry_code"))
{
sundryCode = checkNullAndTrim(genericUtility.getColumnValue("sundry_code", dom));
......@@ -1233,9 +1252,12 @@ public class RetainerContractIC extends ValidatorEJB implements RetainerContract
}
else if(sundryType != null && "O".equalsIgnoreCase(sundryType))
{
valueXmlString.append("<sundry_code>").append("<![CDATA[" + " " + "]]>").append("</sundry_code>");
valueXmlString.append("<payable_receivable>").append("<![CDATA[" + "J" + "]]>").append("</payable_receivable>");
valueXmlString.append("<cr_term>").append("<![CDATA[" + "0" + "]]>").append("</cr_term>");
}else
{
valueXmlString.append("<sundry_code>").append("<![CDATA[" + sundryCode + "]]>").append("</sundry_code>");
valueXmlString.append("<payable_receivable>").append("<![CDATA[" + "R" + "]]>").append("</payable_receivable>");
}
......@@ -1327,6 +1349,7 @@ public class RetainerContractIC extends ValidatorEJB implements RetainerContract
pstmt = null;
valueXmlString.append("<bank_bank_name>").append("<![CDATA[" + bankName + "]]>").append("</bank_bank_name>");
}
valueXmlString.append("</Detail1>");
break;
case 2:
......
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