Skip to content

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

Changes updated for taxes to set based on sundry master. 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@183491 ce508802-f39f-4f6c-b175-0d175dae99d5
parent da8455b9
Hide whitespace changes
Inline Side-by-side
Showing with 106 additions and 90 deletions
webitm-fin/ibase/webitm/ejb/fin/RetainerContractIC.java
View file @ cbb1f2f5
......@@ -4,7 +4,6 @@ import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException;
import ibase.webitm.ejb.dis.DistCommon;
import javax.ejb.LocalBean;
import javax.ejb.Stateless;
import org.w3c.dom.Document;
import ibase.utility.E12GenericUtility;
......@@ -15,7 +14,6 @@ import java.sql.SQLException;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import org.w3c.dom.CDATASection;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
......@@ -69,8 +67,9 @@ public class RetainerContractIC extends ValidatorEJB implements RetainerContract
}
catch(Exception e)
{
System.out.println(":::" + getClass().getSimpleName() + "::"+ e.getMessage());
e.getMessage();
System.out.println(":::" + getClass().getSimpleName() + "::"+ e.getMessage());
e.printStackTrace();
throw new ITMException(e);
}
return retString;
}
......@@ -358,12 +357,19 @@ public class RetainerContractIC extends ValidatorEJB implements RetainerContract
validUpto = Timestamp.valueOf(genericUtility.getValidDateString(validUptoStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
//if(validUpto.compareTo(effDate) < 0)
//if(validUptoStr.compareTo(effDateStr) < 0)
if(validUpto.before(effDate))
if(validUpto != null)
{
if(validUpto.before(effDate))
{
//effective date is less than valid date
errList.add("VTDATE6");
errFields.add(childNodeName.toLowerCase());
}
}else
{
//effective date is less than valid date
errList.add("VTDATE6");
errList.add("VLDUPTNUL ");
errFields.add(childNodeName.toLowerCase());
}
}
}
else if (childNodeName.equalsIgnoreCase("curr_code"))
{
......@@ -737,6 +743,8 @@ public class RetainerContractIC extends ValidatorEJB implements RetainerContract
}catch ( Exception e )
{
System.out.println ( "Exception: RetainerContract: wfValData( Document currFormDataDom ): " + e.getMessage() + ":" );
e.printStackTrace();
throw new ITMException(e);
}
return errStringXml.toString();
......@@ -765,6 +773,7 @@ public class RetainerContractIC extends ValidatorEJB implements RetainerContract
} catch (Exception e) {
System.out.println(":::" + this.getClass().getSimpleName() + "::" + e.getMessage());
e.printStackTrace();
throw new ITMException(e);
}
return retString;
}
......@@ -776,6 +785,7 @@ public class RetainerContractIC extends ValidatorEJB implements RetainerContract
String crTerm="", creditPrd="" ,payMode="", empFName="", empLName="", sundryName="",
accountsDescr="", currencyDescr="", currCode="",acctCode="",cctrCode="",acctCodeArAp="",lineNo="",
contractId="",taxClass="",taxChap="",taxEnv="",empCode="",deptCode="", fName="", lName="", mName="";
String stnTo = "", stnFr = "";
PreparedStatement pstmt = null;
ResultSet rs = null;
StringBuffer valueXmlString = new StringBuffer();
......@@ -964,10 +974,9 @@ public class RetainerContractIC extends ValidatorEJB implements RetainerContract
sundryCode = checkNullAndTrim(genericUtility.getColumnValue("sundry_code", dom));
sundryType = checkNull(genericUtility.getColumnValue("sundry_type", dom));
siteCode = checkNull(genericUtility.getColumnValue("site_code", dom));
//String mcrterm="";
if("C".equalsIgnoreCase(sundryType)) //Customer
{
sql = " select cust_name, curr_code, acct_code__ar, cctr_code__ar, cr_term, credit_prd ,rcp_mode " +
sql = " select cust_name, curr_code, acct_code__ar, cctr_code__ar, cr_term, credit_prd ,rcp_mode, tax_class, tax_chap, stan_code " +
" from customer where cust_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, sundryCode);
......@@ -980,16 +989,35 @@ public class RetainerContractIC extends ValidatorEJB implements RetainerContract
cctrCode = checkNull(rs.getString("cctr_code__ar"));
crTerm = checkNull(rs.getString("cr_term"));
creditPrd = checkNull(rs.getString("credit_prd"));
payMode = checkNull(rs.getString("rcp_mode"));
payMode = checkNull(rs.getString("rcp_mode"));
taxClass = checkNull(rs.getString("tax_class"));
taxChap = checkNull(rs.getString("tax_chap"));
stnTo = checkNull(rs.getString("stan_code"));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
pstmt = null;
sql = " select stan_code from site where site_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, siteCode);
rs = pstmt.executeQuery();
if(rs.next())
{
stnFr = checkNull(rs.getString("stan_code"));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
System.out.println("-----Pavan-----stnFr["+stnFr+"]stnTo["+stnTo+"]");
taxEnv = distCommon.getTaxEnv(stnFr, stnTo, taxChap, taxClass, siteCode, conn);
System.out.println("---C--taxClass["+taxClass+"]taxChap["+taxChap+"]taxEnv["+taxEnv+"]");
}
else if("S".equalsIgnoreCase(sundryType)) //Supplier
{
sql = "select supp_name, curr_code, acct_code__ap, cctr_code__ap, pay_mode, cr_term, credit_prd " +
sql = "select supp_name, curr_code, acct_code__ap, cctr_code__ap, pay_mode, cr_term, credit_prd, tax_class, tax_chap, tax_env " +
" from supplier where supp_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, sundryCode);
......@@ -1003,14 +1031,17 @@ public class RetainerContractIC extends ValidatorEJB implements RetainerContract
payMode = checkNull(rs.getString("pay_mode"));
crTerm = checkNull(rs.getString("cr_term"));
creditPrd = checkNull(rs.getString("credit_prd"));
taxClass = checkNull(rs.getString("tax_class"));
taxChap = checkNull(rs.getString("tax_chap"));
taxEnv = checkNull(rs.getString("tax_env"));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
System.out.println("---S--taxClass["+taxClass+"]taxChap["+taxChap+"]taxEnv["+taxEnv+"]");
valueXmlString.append("<pay_mode>").append("<![CDATA[" + payMode + "]]>").append("</pay_mode>");
}
}
else if("E".equalsIgnoreCase(sundryType)) //Employee
{
String msite="";
......@@ -1047,12 +1078,11 @@ public class RetainerContractIC extends ValidatorEJB implements RetainerContract
rs.close();
rs = null;
pstmt.close();
pstmt = null;
pstmt = null;
}else if("P".equalsIgnoreCase(sundryType)) // Sales Person
{
sql = " select sp_name, cr_term, curr_code, acct_code__ap, cctr_code__ap " +
sql = " select sp_name, cr_term, curr_code, acct_code__ap, cctr_code__ap, tax_class, tax_chap, tax_env " +
" from sales_pers where sales_pers = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, sundryCode);
......@@ -1063,12 +1093,16 @@ public class RetainerContractIC extends ValidatorEJB implements RetainerContract
crTerm = checkNull(rs.getString("cr_term"));
currCode = checkNull(rs.getString("curr_code"));
acctCode = checkNull(rs.getString("acct_code__ap"));
cctrCode = checkNull(rs.getString("cctr_code__ap"));
cctrCode = checkNull(rs.getString("cctr_code__ap"));
taxClass = checkNull(rs.getString("tax_class"));
taxChap = checkNull(rs.getString("tax_chap"));
taxEnv = checkNull(rs.getString("tax_env"));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
System.out.println("---P--taxClass["+taxClass+"]taxChap["+taxChap+"]taxEnv["+taxEnv+"]");
if (crTerm != null && crTerm.trim().length() > 0)
{
sql = " Select cr_days from crterm where cr_term = ? ";
......@@ -1087,7 +1121,7 @@ public class RetainerContractIC extends ValidatorEJB implements RetainerContract
}
else if("T".equalsIgnoreCase(sundryType)) // Transporter
{
sql = " select tran_name, cr_term, credit_prd, curr_code, acct_code__fp, cctr_code__fp, pay_mode" +
sql = " select tran_name, cr_term, credit_prd, curr_code, acct_code__fp, cctr_code__fp, pay_mode, tax_class, tax_env " +
" from transporter where tran_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, sundryCode);
......@@ -1100,12 +1134,16 @@ public class RetainerContractIC extends ValidatorEJB implements RetainerContract
currCode = checkNull(rs.getString("curr_code"));
acctCode = checkNull(rs.getString("acct_code__fp"));
cctrCode = checkNull(rs.getString("cctr_code__fp"));
payMode = checkNull(rs.getString("pay_mode"));
payMode = checkNull(rs.getString("pay_mode"));
taxClass = checkNull(rs.getString("tax_class"));
taxEnv = checkNull(rs.getString("tax_env"));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
taxChap = distCommon.getTaxChap("", "", sundryType, sundryCode, siteCode, conn);
System.out.println("---T--taxClass["+taxClass+"]taxChap["+taxChap+"]taxEnv["+taxEnv+"]");
}
else if("X".equalsIgnoreCase(sundryType)) // Tax Authority
{
......@@ -1163,7 +1201,7 @@ public class RetainerContractIC extends ValidatorEJB implements RetainerContract
sql = "select (case when first_name is null then '' else first_name end), " +
" (case when middle_name is null then '' else middle_name end)," +
" (case when last_name is null then '' else last_name end), " +
" a.curr_code, a.acct_code__ar, a.cctr_code__ar,a.cr_term, a.credit_prd " +
" a.curr_code, a.acct_code__ar, a.cctr_code__ar,a.cr_term, a.credit_prd, b.tax_class, b.tax_chap, b.tax_env " +
" from strg_customer b,customer a " +
" where b.cust_code = a.cust_code and b.sc_code = ? ";
pstmt = conn.prepareStatement(sql);
......@@ -1179,18 +1217,25 @@ public class RetainerContractIC extends ValidatorEJB implements RetainerContract
cctrCode = checkNull(rs.getString("cctr_code__ar"));
crTerm = checkNull(rs.getString("cr_term"));
creditPrd = checkNull(rs.getString("credit_prd"));
taxClass = checkNull(rs.getString("tax_class"));
taxChap = checkNull(rs.getString("tax_chap"));
taxEnv = checkNull(rs.getString("tax_env"));
}
rs.close();
rs = null;
pstmt.close();
pstmt.close();
pstmt = null;
System.out.println("---R--taxClass["+taxClass+"]taxChap["+taxChap+"]taxEnv["+taxEnv+"]");
sundryName = fName.trim()+" "+mName.trim()+" "+lName.trim();
}
}
valueXmlString.append("<sundry_name>").append("<![CDATA[" + sundryName + "]]>").append("</sundry_name>");
valueXmlString.append("<acct_code__arap>").append("<![CDATA[" + acctCode + "]]>").append("</acct_code__arap>");
valueXmlString.append("<cctr_code__arap>").append("<![CDATA[" + cctrCode + "]]>").append("</cctr_code__arap>");
//To set Taxes from sundry master
System.out.println("---Pavan--taxClass["+taxClass+"]taxChap["+taxChap+"]taxEnv["+taxEnv+"]");
valueXmlString.append("<tax_class>").append("<![CDATA[" + taxClass + "]]>").append("</tax_class>");
valueXmlString.append("<tax_chap>").append("<![CDATA[" + taxChap + "]]>").append("</tax_chap>");
valueXmlString.append("<tax_env>").append("<![CDATA[" + taxEnv + "]]>").append("</tax_env>");
if(!("J".equalsIgnoreCase(payableReceivable)))
{
......@@ -1247,12 +1292,12 @@ public class RetainerContractIC extends ValidatorEJB implements RetainerContract
valueXmlString.append("<curr_code>").append("<![CDATA[" + currCode + "]]>").append("</curr_code>");
valueXmlString.append("<currency_descr>").append("<![CDATA[" + currencyDescr + "]]>").append("</currency_descr>");
//Pavan R on 10APR18 [to set tax class and tax chapter from sundry Masters.]
taxClass = distCommon.getTaxClass(sundryCode, sundryCode, "", siteCode, conn);
taxChap = distCommon.getTaxChap("", "", sundryCode, sundryCode, siteCode, conn);
System.out.println("taxClass:["+taxClass+"]taxChap:["+taxChap+"]");
//taxClass = distCommon.getTaxClass(sundryCode, sundryCode, "", siteCode, conn);
//taxChap = distCommon.getTaxChap("", "", sundryCode, sundryCode, siteCode, conn);
//System.out.println("taxClass:["+taxClass+"]taxChap:["+taxChap+"]");
valueXmlString.append("<tax_class>").append("<![CDATA[" + taxClass + "]]>").append("</tax_class>");
valueXmlString.append("<tax_chap>").append("<![CDATA[" + taxChap + "]]>").append("</tax_chap>");
//valueXmlString.append("<tax_class>").append("<![CDATA[" + taxClass + "]]>").append("</tax_class>");
//alueXmlString.append("<tax_chap>").append("<![CDATA[" + taxChap + "]]>").append("</tax_chap>");
//valueXmlString.append("<tax_env>").append("<![CDATA[" + taxEnv + "]]>").append("</tax_env>");
//Pavan R on 10APR18 END
......@@ -1277,22 +1322,23 @@ public class RetainerContractIC extends ValidatorEJB implements RetainerContract
}else if(currentColumn.trim().equalsIgnoreCase("payable_receivable"))
{
payableReceivable = checkNull(genericUtility.getColumnValue("payable_receivable", dom));
payableReceivable = checkNull(genericUtility.getColumnValue("payable_receivable", dom));
taxClass = checkNull(genericUtility.getColumnValue("tax_class", dom));
taxChap = checkNull(genericUtility.getColumnValue("tax_chap", dom));
taxEnv = checkNull(genericUtility.getColumnValue("tax_env", dom));
System.out.println("---1319--taxClass["+taxClass+"]taxChap["+taxChap+"]taxEnv["+taxEnv+"]");
if (payableReceivable != null && "R".equalsIgnoreCase(payableReceivable))
{
valueXmlString.append("<tax_class protect = \"1\">").append("<![CDATA[]]>").append("</tax_class>");
valueXmlString.append("<tax_chap protect = \"1\">").append("<![CDATA[]]>").append("</tax_chap>");
valueXmlString.append("<tax_env protect = \"1\">").append("<![CDATA[]]>").append("</tax_env>");
valueXmlString.append("<tax_class protect = \"1\">").append("<![CDATA[" + taxClass + "]]>").append("</tax_class>");
valueXmlString.append("<tax_chap protect = \"1\">").append("<![CDATA[" + taxChap + "]]>").append("</tax_chap>");
valueXmlString.append("<tax_env protect = \"1\">").append("<![CDATA[" + taxEnv + "]]>").append("</tax_env>");
}
else
{
valueXmlString.append("<tax_class protect = \"0\">").append("<![CDATA[]]>").append("</tax_class>");
valueXmlString.append("<tax_chap protect = \"0\">").append("<![CDATA[]]>").append("</tax_chap>");
valueXmlString.append("<tax_env protect = \"0\">").append("<![CDATA[]]>").append("</tax_env>");
valueXmlString.append("<tax_class protect = \"0\">").append("<![CDATA[" + taxClass + "]]>").append("</tax_class>");
valueXmlString.append("<tax_chap protect = \"0\">").append("<![CDATA" + taxChap + "[]]>").append("</tax_chap>");
valueXmlString.append("<tax_env protect = \"0\">").append("<![CDATA[" + taxEnv + "]]>").append("</tax_env>");
}
//
//valueXmlString.append("<>").append("<![CDATA[" + + "]]>").append("</>");
}
else if(currentColumn.trim().equalsIgnoreCase("cr_term"))
{
......@@ -1394,26 +1440,25 @@ public class RetainerContractIC extends ValidatorEJB implements RetainerContract
{
allowDetEditable = "N";
}
contractId = checkNull(genericUtility.getColumnValue("contract_id", dom));
valueXmlString.append("<contract_id>").append("<![CDATA[" + contractId + "]]>").append("</contract_id>");
taxClass = checkNull(genericUtility.getColumnValue("tax_class", dom1));
taxChap = checkNull(genericUtility.getColumnValue("tax_chap", dom1));
taxEnv = checkNull(genericUtility.getColumnValue("tax_env", dom1));
System.out.println("---Detail--taxClass["+taxClass+"]taxChap["+taxChap+"]taxEnv["+taxEnv+"]");
if("Y".equalsIgnoreCase(allowDetEditable))
{
valueXmlString.append("<tax_class protect = \"0\">").append("<![CDATA[]]>").append("</tax_class>");
valueXmlString.append("<tax_chap protect = \"0\">").append("<![CDATA[]]>").append("</tax_chap>");
valueXmlString.append("<tax_env protect = \"0\">").append("<![CDATA[]]>").append("</tax_env>");
valueXmlString.append("<tax_class protect = \"0\">").append("<![CDATA[" + taxClass + "]]>").append("</tax_class>");
valueXmlString.append("<tax_chap protect = \"0\">").append("<![CDATA[" + taxChap + "]]>").append("</tax_chap>");
valueXmlString.append("<tax_env protect = \"0\">").append("<![CDATA[" + taxEnv + "]]>").append("</tax_env>");
}
else
{
valueXmlString.append("<tax_class protect = \"1\">").append("<![CDATA[]]>").append("</tax_class>");
valueXmlString.append("<tax_chap protect = \"1\">").append("<![CDATA[]]>").append("</tax_chap>");
valueXmlString.append("<tax_env protect = \"1\">").append("<![CDATA[]]>").append("</tax_env>");
}
contractId = checkNull(genericUtility.getColumnValue("contract_id", dom));
taxClass = checkNull(genericUtility.getColumnValue("tax_class", dom));
taxChap = checkNull(genericUtility.getColumnValue("tax_chap", dom));
taxEnv = checkNull(genericUtility.getColumnValue("tax_env", dom));
valueXmlString.append("<contract_id>").append("<![CDATA[" + contractId + "]]>").append("</contract_id>");
valueXmlString.append("<tax_class>").append("<![CDATA[" + taxClass + "]]>").append("</tax_class>");
valueXmlString.append("<tax_chap>").append("<![CDATA[" + taxChap + "]]>").append("</tax_chap>");
valueXmlString.append("<tax_env>").append("<![CDATA[" + taxEnv + "]]>").append("</tax_env>");
valueXmlString.append("<tax_class protect = \"1\">").append("<![CDATA[" + taxClass + "]]>").append("</tax_class>");
valueXmlString.append("<tax_chap protect = \"1\">").append("<![CDATA[" + taxChap + "]]>").append("</tax_chap>");
valueXmlString.append("<tax_env protect = \"1\">").append("<![CDATA[" + taxEnv + "]]>").append("</tax_env>");
}
}
else if (currentColumn.equalsIgnoreCase("acct_code"))
{
......
webitm-fin/ibase/webitm/ejb/fin/RetainerContractReleasePrc.java
View file @ cbb1f2f5
......@@ -484,7 +484,7 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
taxEnv = rs.getString("tax_env");
currCode = rs.getString("curr_code");
autoPay = rs.getString("auto_pay");
projCode = rs.getString("proj_code");
projCode = checkNull(rs.getString("proj_code"));
payMode = rs.getString("pay_mode");
bankCode = rs.getString("bank_code");
processUptillDate = rs.getTimestamp("to_date");
......@@ -1122,9 +1122,7 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
{
return errString;
}
System.out.println("1053 :: errString ["+errString+"]");
return errString;
}
}catch (Exception e)
{
e.printStackTrace();
......@@ -1556,15 +1554,7 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
errString = saveData(loginSite, stringxmlInvString, xtraParams, conn);
System.out.println("After Saving record errorString--->>["+errString+"]");
if (errString.indexOf("Success") > -1)
{
conn.commit();
}else
{
conn.rollback();
return errString;
}
if (errString.indexOf("Success") > -1)
{
String[] arrayForTranIdIssue = errString.split("<TranID>");
......@@ -1983,14 +1973,6 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
errString = saveData(loginSite, stringxmlInvString, xtraParams, conn);
System.out.println("After Saving record errorString--->>["+errString+"]");
if (errString.indexOf("Success") > -1)
{
conn.commit();
}else
{
conn.rollback();
return errString;
}
if (errString.indexOf("Success") > -1)
{
......@@ -2255,16 +2237,7 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
loginSite=genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
errString = saveData(loginSite, xmlBuff.toString(), xtraParams, conn);
System.out.println("After Saving record errorString--->>["+errString+"]");
if (errString.indexOf("Success") > -1)
{
conn.commit();
System.out.println("Journal Voucher saved Successfully12......");
}else{
conn.rollback();
return errString;
}
System.out.println("After Saving record errorString--->>["+errString+"]");
}catch (ITMException e)
{
......@@ -2296,9 +2269,7 @@ public class RetainerContractReleasePrc extends ProcessEJB implements RetainerCo
d.printStackTrace();
throw new ITMException(d);
}
}
}
return errString;
}
......
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