Skip to content

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

fixing the bug 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@183929 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 234ffaf1
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 23 deletions
webitm-fin/ibase/webitm/ejb/fin/RetainerContractIC.java
View file @ c3c25b12
...@@ -785,7 +785,7 @@ public class RetainerContractIC extends ValidatorEJB implements RetainerContract ...@@ -785,7 +785,7 @@ public class RetainerContractIC extends ValidatorEJB implements RetainerContract
String crTerm="", creditPrd="" ,payMode="", empFName="", empLName="", sundryName="", String crTerm="", creditPrd="" ,payMode="", empFName="", empLName="", sundryName="",
accountsDescr="", currencyDescr="", currCode="",acctCode="",cctrCode="",acctCodeArAp="",lineNo="", accountsDescr="", currencyDescr="", currCode="",acctCode="",cctrCode="",acctCodeArAp="",lineNo="",
contractId="",taxClass="",taxChap="",taxEnv="",empCode="",deptCode="", fName="", lName="", mName=""; contractId="",taxClass="",taxChap="",taxEnv="",empCode="",deptCode="", fName="", lName="", mName="";
String stnTo = "", stnFr = ""; String stnTo = "", stnFr = "",contractDateStr="";
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null; ResultSet rs = null;
StringBuffer valueXmlString = new StringBuffer(); StringBuffer valueXmlString = new StringBuffer();
...@@ -883,13 +883,14 @@ public class RetainerContractIC extends ValidatorEJB implements RetainerContract ...@@ -883,13 +883,14 @@ public class RetainerContractIC extends ValidatorEJB implements RetainerContract
//setNodeValue(dom, "sundry_name", description); //setNodeValue(dom, "sundry_name", description);
String dateLastProcStr = checkNull(genericUtility.getColumnValue("date__last_proc", dom)); String dateLastProcStr = checkNull(genericUtility.getColumnValue("date__last_proc", dom));
contractDateStr = checkNull(genericUtility.getColumnValue("contract_date", dom));
if (dateLastProcStr != null && dateLastProcStr.trim().length() > 0) if (dateLastProcStr != null && dateLastProcStr.trim().length() > 0)
{ {
valueXmlString.append("<eff_date protect = \"1\">").append("<![CDATA[]]>").append("</eff_date>"); valueXmlString.append("<eff_date protect = \"1\">").append("<![CDATA[]]>").append("</eff_date>");
}else }else
{ {
valueXmlString.append("<eff_date protect = \"0\">").append("<![CDATA[]]>").append("</eff_date>"); valueXmlString.append("<eff_date protect = \"0\">").append("<![CDATA[" + contractDateStr + "]]>").append("</eff_date>");
} }
}else if(currentColumn.trim().equalsIgnoreCase("itm_default")) }else if(currentColumn.trim().equalsIgnoreCase("itm_default"))
{ {
......
webitm-fin/ibase/webitm/ejb/fin/RetainerContractReleasePrc.java
View file @ c3c25b12
...@@ -1182,7 +1182,7 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo ...@@ -1182,7 +1182,7 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
ResultSet rs = null, rs1 = null, rs2 = null; ResultSet rs = null, rs1 = null, rs2 = null;
String sql = "", sql1 = ""; String sql = "", sql1 = "";
ITMDBAccessEJB itmDBAccessEJB = null; ITMDBAccessEJB itmDBAccessEJB = null;
String chgTerm = "", chgUser = "",stringxmlInvString= "",relDateStr=""; String chgTerm = "", chgUser = "",stringxmlInvString= "",relDateStr="",acctCodeDet = "", cctrCodeDet="", analCodeDet="", analCodeDet1="", analCodeDet2="";
Timestamp currDate = null; Timestamp currDate = null;
try{ try{
...@@ -1456,6 +1456,16 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo ...@@ -1456,6 +1456,16 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
lsType = rs.getString("amt_type"); lsType = rs.getString("amt_type");
lcamt = rs.getDouble("amount"); lcamt = rs.getDouble("amount");
apply = rs.getString("apply_tax"); apply = rs.getString("apply_tax");
//added By Pavan R on 20APR2018
acctCodeDet = checkNull(rs.getString("acct_code"));
cctrCodeDet = checkNull(rs.getString("cctr_code"));
empCode = checkNull(rs.getString("emp_code"));
analCodeDet = checkNull(rs.getString("anal_code"));
analCodeDet1 = checkNull(rs.getString("anal_code__1"));
analCodeDet2 = checkNull(rs.getString("anal_code__2"));
deptCode = checkNull(rs.getString("dept_code"));
remarksDet = checkNull(rs.getString("remarks"));
//END added B?y Pavan R on 20APR2018
if(lsType != null && "F".equalsIgnoreCase(lsType.trim())) if(lsType != null && "F".equalsIgnoreCase(lsType.trim()))
{ {
amount = lcamt; amount = lcamt;
...@@ -1468,7 +1478,7 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo ...@@ -1468,7 +1478,7 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
{ {
taxClassDet = rs.getString("tax_class"); taxClassDet = rs.getString("tax_class");
taxChapDet = rs.getString("tax_class"); taxChapDet = rs.getString("tax_chap");
taxEnvDet = rs.getString("tax_env"); taxEnvDet = rs.getString("tax_env");
anKeyCol = rs.getString("contract_id"); anKeyCol = rs.getString("contract_id");
...@@ -1510,20 +1520,20 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo ...@@ -1510,20 +1520,20 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
xmlBuff.append("<misc_voucher/>"); xmlBuff.append("<misc_voucher/>");
xmlBuff.append("<tran_id/>"); xmlBuff.append("<tran_id/>");
xmlBuff.append("<line_no>").append("<![CDATA[" + lineNoCount+ "]]>").append("</line_no>"); xmlBuff.append("<line_no>").append("<![CDATA[" + lineNoCount+ "]]>").append("</line_no>");
xmlBuff.append("<acct_code>").append("<![CDATA[" + rs.getString("acct_code") + "]]>").append("</acct_code>"); xmlBuff.append("<acct_code>").append("<![CDATA[" + acctCodeDet + "]]>").append("</acct_code>");
xmlBuff.append("<cctr_code>").append("<![CDATA[" + rs.getString("cctr_code") + "]]>").append("</cctr_code>"); xmlBuff.append("<cctr_code>").append("<![CDATA[" + cctrCodeDet + "]]>").append("</cctr_code>");
xmlBuff.append("<amount>").append("<![CDATA[" + amount + "]]>").append("</amount>"); xmlBuff.append("<amount>").append("<![CDATA[" + amount + "]]>").append("</amount>");
xmlBuff.append("<emp_code>").append("<![CDATA[" + rs.getString("emp_code") + "]]>").append("</emp_code>"); xmlBuff.append("<emp_code>").append("<![CDATA[" + empCode + "]]>").append("</emp_code>");
xmlBuff.append("<anal_code>").append("<![CDATA[" + rs.getString("anal_code") + "]]>").append("</anal_code>"); xmlBuff.append("<anal_code>").append("<![CDATA[" +analCodeDet + "]]>").append("</anal_code>");
xmlBuff.append("<apply_tax>").append("<![CDATA[" + apply + "]]>").append("</apply_tax>"); xmlBuff.append("<apply_tax>").append("<![CDATA[" + apply + "]]>").append("</apply_tax>");
xmlBuff.append("<tax_amt>").append("<![CDATA[" + taxDet + "]]>").append("</tax_amt>"); xmlBuff.append("<tax_amt>").append("<![CDATA[" + taxDet + "]]>").append("</tax_amt>");
xmlBuff.append("<tax_class>").append("<![CDATA[" + taxClassDet + "]]>").append("</tax_class>"); xmlBuff.append("<tax_class>").append("<![CDATA[" + taxClassDet + "]]>").append("</tax_class>");
xmlBuff.append("<tax_chap>").append("<![CDATA[" + taxChapDet + "]]>").append("</tax_chap>"); xmlBuff.append("<tax_chap>").append("<![CDATA[" + taxChapDet + "]]>").append("</tax_chap>");
xmlBuff.append("<tax_env>").append("<![CDATA[" + taxEnvDet + "]]>").append("</tax_env>"); xmlBuff.append("<tax_env>").append("<![CDATA[" + taxEnvDet + "]]>").append("</tax_env>");
xmlBuff.append("<anal_code__1>").append("<![CDATA[" + rs.getString("anal_code__1") + "]]>").append("</anal_code__1>"); xmlBuff.append("<anal_code__1>").append("<![CDATA[" + analCodeDet1 + "]]>").append("</anal_code__1>");
xmlBuff.append("<anal_code__2>").append("<![CDATA[" + rs.getString("anal_code__2") + "]]>").append("</anal_code__2>"); xmlBuff.append("<anal_code__2>").append("<![CDATA[" + analCodeDet2 + "]]>").append("</anal_code__2>");
xmlBuff.append("<dept_code>").append("<![CDATA[" + rs.getString("dept_code") + "]]>").append("</dept_code>"); xmlBuff.append("<dept_code>").append("<![CDATA[" + deptCode + "]]>").append("</dept_code>");
xmlBuff.append("<remarks>").append("<![CDATA[" + rs.getString("remarks") + "]]>").append("</remarks>"); xmlBuff.append("<remarks>").append("<![CDATA[" + remarksDet + "]]>").append("</remarks>");
xmlBuff.append("<bill_no>").append("<![CDATA[" + billNo1 + "]]>").append("</bill_no>"); xmlBuff.append("<bill_no>").append("<![CDATA[" + billNo1 + "]]>").append("</bill_no>");
if(billDateStr != null){ if(billDateStr != null){
xmlBuff.append("<bill_date>").append("<![CDATA[" + billDateStr + "]]>").append("</bill_date>"); xmlBuff.append("<bill_date>").append("<![CDATA[" + billDateStr + "]]>").append("</bill_date>");
...@@ -1864,10 +1874,10 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo ...@@ -1864,10 +1874,10 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while(rs.next()) while(rs.next())
{ {
lineNo = rs.getString("line_no"); lineNo = checkNull(rs.getString("line_no"));
acctCodeDet = rs.getString("acct_code"); acctCodeDet = checkNull(rs.getString("acct_code"));
cctrCodedet = rs.getString("cctr_code"); cctrCodedet = checkNull(rs.getString("cctr_code"));
type = rs.getString("amt_type"); type = checkNull(rs.getString("amt_type"));
amt = rs.getDouble("amount"); amt = rs.getDouble("amount");
if(type != null && "F".equalsIgnoreCase(type)) if(type != null && "F".equalsIgnoreCase(type))
...@@ -1876,13 +1886,13 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo ...@@ -1876,13 +1886,13 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
}else { }else {
amountDet = amount * ( amt / 100 ); amountDet = amount * ( amt / 100 );
} }
analCode = rs.getString("anal_code"); analCode = checkNull(rs.getString("anal_code"));
analCode1 = rs.getString("anal_code__1"); analCode1 = checkNull(rs.getString("anal_code__1"));
analCode2 = rs.getString("anal_code__2"); analCode2 = checkNull(rs.getString("anal_code__2"));
deptCode = rs.getString("dept_code"); deptCode = checkNull(rs.getString("dept_code"));
projCode = rs.getString("proj_code"); projCode = checkNull(rs.getString("proj_code"));
empCode = rs.getString("emp_code"); empCode = checkNull(rs.getString("emp_code"));
apply = rs.getString("apply_tax"); apply = checkNull(rs.getString("apply_tax"));
if(apply != null && "Y".equalsIgnoreCase(apply)) if(apply != null && "Y".equalsIgnoreCase(apply))
{ {
......
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