Skip to content

B
business-java
Commit 8ff42be2 authored by jshaikh's avatar jshaikh
Browse files
Options 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@185228 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c78a5822
Show whitespace changes
Inline Side-by-side
Showing with 172 additions and 70 deletions
webitm-fin/ibase/webitm/ejb/fin/MiscVoucherIC.java
View file @ 8ff42be2
......@@ -22,6 +22,8 @@ import java.rmi.RemoteException;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import org.w3c.dom.CDATASection;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
......@@ -1319,12 +1321,17 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
errFields.add(childNodeName.toLowerCase());
}
}
else if(childNodeName.equalsIgnoreCase("site_code__pay")) //Added by Abhijit Gaikwad
{
//Added by sarita on 28FEB2018
cnt = 0;
String siteCodePay="";
siteCodePay = genericUtility.getColumnValue("site_code__pay", dom);
// Modified by Jaffar on 21/05/2018 [To allow empty site code as requested from GTPL].Start
if (siteCodePay != null && siteCodePay.length() > 0)
{
// Modified by Jaffar on 21/05/2018 [To allow empty site code as requested from GTPL].End
if(siteCodePay == null || (siteCodePay.length() == 0))
{
errList.add("VMSITECOD");
......@@ -1403,7 +1410,10 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
errFields.add(childNodeName.toLowerCase());
}
}
}
}//end by Abhijit
//End of Comment
}
break;
......@@ -2978,6 +2988,10 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
siteCode = genericUtility.getColumnValue("site_code", dom);
valueXmlString.append("<sundry_type__pay>").append("<![CDATA[" + sundryType + "]]>").append("</sundry_type__pay>");
valueXmlString.append("<sundry_code__pay>").append("<![CDATA[" + sundryCode + "]]>").append("</sundry_code__pay>");
//Added by Jaffar S. on 21-05-18
setNodeValue(dom, "sundry_type__pay", sundryType);
setNodeValue(dom, "sundry_code__pay", sundryCode);
//End
chequeOrName = "";
if(sundryType != null && sundryCode!= null && chequeOrName !=null && sundryType.trim().length() > 0 && sundryCode.trim().length() > 0 )
{
......@@ -3065,10 +3079,19 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
fldName = "CUST_TYPE";
lcCode = getCode(conn, "fn_strg_customer_det('R',sundryCode,'L')", "dual");
valueXmlString.append("<locality_code>").append("<![CDATA[" + lcCode + "]]>").append("</locality_code>");
//Added by Jaffar S. on 21-05-18
setNodeValue(dom, "locality_code", lcCode);
suppCode = getCode(conn, "fn_strg_customer_det('R',sundryCode,'S')", "dual");
valueXmlString.append("<spl_code>").append("<![CDATA[" + suppCode + "]]>").append("</spl_code>");
//Added by Jaffar S. on 21-05-18
setNodeValue(dom, "spl_code", suppCode);
stanCode = getCode(conn, "fn_strg_customer_det('R',sundryCode,'T')", "dual");
valueXmlString.append("<stan_code>").append("<![CDATA[" + stanCode + "]]>").append("</stan_code>");
//Added by Jaffar S. on 21-05-18
setNodeValue(dom, "stan_code", stanCode);
lsSiteCodePay=findValue(conn, "site_code__pay" , "site_strg_customer", "site_code","sc_code", siteCode,sundryCode);
if(lsSiteCodePay== null || lsSiteCodePay.trim().length() == 0)
{
......@@ -3123,13 +3146,17 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
}
descName = mFname + "" + mLname;
//currCode = findValue(conn, "curr_code", "site", "finent", "site.fin_entity", "site_code", "finent.fin_entity", siteCode);
//Start--- Commented and changed by Jaffar S. on 17th May 18
currCode = findValue(conn, "curr_code" , "site,finent", "site.fin_entity = finent.fin_entity and site_code", siteCode);
//End
valueXmlString.append("<pay_mode>").append("<![CDATA[" + payMode + "]]>").append("</pay_mode>");
//Added by Jaffar S. on 21-05-18
setNodeValue(dom, "pay_mode", payMode);
if(bankCode != null && (bankCode.trim().length() > 0 ))
{
valueXmlString.append("<bank_code>").append("<![CDATA[" + bankCode + "]]>").append("</bank_code>");
//Added by Jaffar S. on 21-05-18
setNodeValue(dom, "bank_code", bankCode);
bankName = findValue(conn, "bank_name", "bank", "bank_code", bankCode);
acctCodeCf = findValue(conn, "acct_code__cf", "bank", "bank_code", bankCode);
cctrCodeCf = findValue(conn, "cctr_code__cf", "bank", "bank_code", bankCode);
......@@ -3146,6 +3173,9 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
valueXmlString.append("<bank_bank_name>").append("<![CDATA[" + bankName + "]]>").append("</bank_bank_name>");
valueXmlString.append("<acct_code__cf>").append("<![CDATA[" + acctCodeCf + "]]>").append("</acct_code__cf>");
valueXmlString.append("<cctr_code__cf>").append("<![CDATA[" + cctrCodeCf + "]]>").append("</cctr_code__cf>");
//Added by Jaffar S. on 21-05-18
setNodeValue(dom, "acct_code__cf", acctCodeCf);
setNodeValue(dom, "cctr_code__cf", cctrCodeCf);
}
vouchType = genericUtility.getColumnValue("vouch_type", dom);
if("F".equalsIgnoreCase(vouchType))
......@@ -3156,6 +3186,8 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
grade = grade.trim();
}
valueXmlString.append("<tran_type>").append("<![CDATA[" + grade + "]]>").append("</tran_type>");
//Added by Jaffar S. on 21-05-18
setNodeValue(dom, "tran_type", grade);
}
else if("A".equalsIgnoreCase(vouchType))
{
......@@ -3190,10 +3222,14 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
if(payMode != null && (payMode.trim().length() > 0 ))
{
valueXmlString.append("<pay_mode>").append("<![CDATA[" + payMode + "]]>").append("</pay_mode>");
//Added by Jaffar S. on 21-05-18
setNodeValue(dom, "pay_mode", payMode);
}
if(bankCode != null && (bankCode.trim().length() > 0 ))
{
valueXmlString.append("<bank_code>").append("<![CDATA[" + bankCode + "]]>").append("</bank_code>");
//Added by Jaffar S. on 21-05-18
setNodeValue(dom, "bank_code", bankCode);
bankName = findValue(conn, "bank_name" , "bank", "bank_code", bankCode);
acctCodeCf = findValue(conn, "acct_code__cf" , "bank", "bank_code", bankCode);
cctrCodeCf = findValue(conn, "cctr_code__cf" , "bank", "bank_code", bankCode);
......@@ -3210,6 +3246,9 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
valueXmlString.append("<bank_bank_name>").append("<![CDATA[" + bankName + "]]>").append("</bank_bank_name>");
valueXmlString.append("<acct_code__cf>").append("<![CDATA[" + acctCodeCf + "]]>").append("</acct_code__cf>");
valueXmlString.append("<cctr_code__cf>").append("<![CDATA[" + cctrCodeCf + "]]>").append("</cctr_code__cf>");
//Added by Jaffar S. on 21-05-18
setNodeValue(dom, "acct_code__cf", acctCodeCf);
setNodeValue(dom, "cctr_code__cf", cctrCodeCf);
}
}
vouchType = genericUtility.getColumnValue("vouch_type", dom);
......@@ -3217,6 +3256,8 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
{
empCode = findValue(conn, "grade" , "employee", "emp_code", empCode);
valueXmlString.append("<tran_type>").append("<![CDATA[" + empCode + "]]>").append("</tran_type>");
//Added by Jaffar S. on 21-05-18
setNodeValue(dom, "tran_type", empCode);
}
fldName = "SP_TYPE";
//Added by Abhijit
......@@ -3250,10 +3291,16 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
}
valueXmlString.append("<tax_class>").append("<![CDATA[" + taxClass + "]]>").append("</tax_class>");
valueXmlString.append("<tax_env>").append("<![CDATA[" + taxEnv + "]]>").append("</tax_env>");
//Added by Jaffar S. on 21-05-18
setNodeValue(dom, "tax_class", taxClass);
setNodeValue(dom, "tax_env", taxEnv);
fldName = "TRANSPORTER_TYPE";
if(payMode != null && (payMode.trim().length() > 0 ))
{
valueXmlString.append("<pay_mode>").append("<![CDATA[" + payMode + "]]>").append("</pay_mode>");
//Added by Jaffar S. on 21-05-18
setNodeValue(dom, "pay_mode", payMode);
}
//Added by Abhijit
lsSiteCodePay=findValue(conn, "site_code__pay" , "site_transporter", "site_code","TRAN_CODE", siteCode,sundryCode);
......@@ -3325,6 +3372,13 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
valueXmlString.append("<tax_env>").append("<![CDATA[" + taxEnv + "]]>").append("</tax_env>");
valueXmlString.append("<acct_code__adv>").append("<![CDATA[" + acctCodeAdv + "]]>").append("</acct_code__adv>");
valueXmlString.append("<cctr_code__adv>").append("<![CDATA[" + cctrCodeAdv + "]]>").append("</cctr_code__adv>");
//Added by Jaffar S. on 21-05-18
setNodeValue(dom, "tax_class", taxClass);
setNodeValue(dom, "tax_chap", taxChap);
setNodeValue(dom, "tax_env", taxEnv);
setNodeValue(dom, "acct_code__adv", acctCodeAdv);
setNodeValue(dom, "cctr_code__adv", cctrCodeAdv);
fldName = "SUPP_TYPE";
if(payMode != null && (payMode.trim().length() > 0 ))
{
......@@ -3353,6 +3407,8 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
payMode = "";
}
valueXmlString.append("<pay_mode>").append("<![CDATA[" + payMode + "]]>").append("</pay_mode>");
//Added by Jaffar S. on 21-05-18
setNodeValue(dom, "pay_mode", payMode);
//Added by Abhijit
lsSiteCodePay=findValue(conn, "site_code__pay" , "SITE_TAX_AUTHORITY", "site_code","tauth_code", siteCode,sundryCode);
if(lsSiteCodePay== null || lsSiteCodePay.trim().length() == 0)
......@@ -3410,13 +3466,19 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
}
valueXmlString.append("<sundry_name_pay>").append("<![CDATA[" + descName + "]]>").append("</sundry_name_pay>");
valueXmlString.append("<curr_code>").append("<![CDATA[" + currCode + "]]>").append("</curr_code>");
//Added by Jaffar S. on 21-05-18
setNodeValue(dom, "curr_code", currCode);
tranDate = genericUtility.getColumnValue("tran_date", dom);
mexrate = finCommon.getDailyExchRateSellBuy(currCode, "", siteCode, tranDate, "B", conn);
valueXmlString.append("<exch_rate>").append("<![CDATA[" + mexrate + "]]>").append("</exch_rate>");
//Added by Jaffar S. on 21-05-18
setNodeValue(dom, "exch_rate", mexrate);
siteCode = (genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode"));
if((siteCode == null || (siteCode.trim().length() == 0 )) && (mSite.length() > 0))
{
valueXmlString.append("<site_code>").append("<![CDATA[" + mSite + "]]>").append("</site_code>");
//Added by Jaffar S. on 21-05-18
setNodeValue(dom, "site_code", mSite);
descName = findValue(conn, "descr" , "site", "site_code", mSite);
finEntity = findValue(conn, "fin_entity" , "site", "site_code", mSite);
valueXmlString.append("<site_descr>").append("<![CDATA[" + descName + "]]>").append("</site_descr>");
......@@ -3425,9 +3487,13 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
{
currCode = findValue(conn, "curr_code" , "finent", "fin_entity", finEntity);
valueXmlString.append("<curr_code>").append("<![CDATA[" + currCode + "]]>").append("</curr_code>");
//Added by Jaffar S. on 21-05-18
setNodeValue(dom, "curr_code", currCode);
tranDate = genericUtility.getColumnValue("tran_date", dom);
mexrate = finCommon.getDailyExchRateSellBuy(currCode, "", siteCode, tranDate, "B", conn);
valueXmlString.append("<exch_rate>").append("<![CDATA[" + mexrate + "]]>").append("</exch_rate>");
//Added by Jaffar S. on 21-05-18
setNodeValue(dom, "exch_rate", mexrate);
}
}
finEntity = genericUtility.getColumnValue("fin_entity", dom);
......@@ -3465,18 +3531,27 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
valueXmlString.append("<cctr_code__ap>").append("<![CDATA[" + cctrCodeAp + "]]>").append("</cctr_code__ap>");
valueXmlString.append("<acct_code__adv>").append("<![CDATA[" + acctCodeAdv + "]]>").append("</acct_code__adv>");
valueXmlString.append("<cctr_code__adv>").append("<![CDATA[" + cctrCodeAdv+ "]]>").append("</cctr_code__adv>");
//Added by Jaffar S. on 21-05-18
setNodeValue(dom, "acct_code__ap", acctCodeAp);
setNodeValue(dom, "cctr_code__ap", cctrCodeAp);
setNodeValue(dom, "acct_code__adv", acctCodeAdv);
setNodeValue(dom, "cctr_code__adv", cctrCodeAdv);
}
else
{
if(acctCodeAp != null)
{
valueXmlString.append("<acct_code__ap>").append("<![CDATA[" + acctCodeAp + "]]>").append("</acct_code__ap>");
//Added by Jaffar S. on 21-05-18
setNodeValue(dom, "acct_code__ap", acctCodeAp);
mdescr = findValue(conn, "descr" , "accounts", "acct_code", acctCodeAp);
valueXmlString.append("<accounts_descr>").append("<![CDATA[" + mdescr + "]]>").append("</accounts_descr>");
}
if(cctrCodeAp != null)
{
valueXmlString.append("<cctr_code__ap>").append("<![CDATA[" + cctrCodeAp + "]]>").append("</cctr_code__ap>");
//Added by Jaffar S. on 21-05-18
setNodeValue(dom, "cctr_code__ap", cctrCodeAp);
}
}
effDate = genericUtility.getColumnValue("eff_date", dom);
......@@ -3487,6 +3562,7 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
if(defCrTerm != null && defCrTerm.trim().length() > 0 )
{
valueXmlString.append("<cr_term>").append("<![CDATA[" + defCrTerm + "]]>").append("</cr_term>");
setNodeValue(dom, "cr_term", defCrTerm);
crDays1 = findValue(conn, "cr_days" ,"crterm", "cr_term", defCrTerm);
if(crDays1 != null && crDays1.trim().length() > 0)
{
......@@ -3504,6 +3580,8 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
else
{
valueXmlString.append("<cr_term>").append("<![CDATA[" + crTerm + "]]>").append("</cr_term>");
//Added by Jaffar S. on 21-05-18
setNodeValue(dom, "cr_term", defCrTerm);
crDays1 = findValue(conn, "cr_days" ,"crterm", "cr_term", crTerm);
if(crDays1 != null && crDays1.trim().length() > 0)
{
......@@ -3571,6 +3649,10 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
valueXmlString.append("<pay_acct_descr>").append("<![CDATA[" + acctName + "]]>").append("</pay_acct_descr>");
valueXmlString.append("<acct_code__pay>").append("<![CDATA[" + acctCodeAp + "]]>").append("</acct_code__pay>");
valueXmlString.append("<cctr_code__pay>").append("<![CDATA[" + cctrCodeAp + "]]>").append("</cctr_code__pay>");
//Added by Jaffar S. on 21-05-18
setNodeValue(dom, "acct_code__pay", acctCodeAp);
setNodeValue(dom, "cctr_code__pay", cctrCodeAp);
}
cctrCodeAp = genericUtility.getColumnValue("cctr_code__ap", dom);
cctrDescr = findValue(conn, "descr" , "costctr", "cctr_code", cctrCodeAp);
......@@ -3580,6 +3662,8 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
valueXmlString.append("<cctr_descr__pay>").append("<![CDATA[" + cctrDescr + "]]>").append("</cctr_descr__pay>");
//Added by Abhijit
valueXmlString.append("<site_code__pay>").append("<![CDATA[" + lsSiteCodePay + "]]>").append("</site_code__pay>");
//Added by Jaffar S. on 21-05-18
setNodeValue(dom, "site_code__pay", lsSiteCodePay);
String mdescrSite="";
mdescrSite = findValue(conn, "descr" ,"site", "site_code", lsSiteCodePay);
valueXmlString.append("<site_descr__pay>").append("<![CDATA[" + mdescrSite + "]]>").append("</site_descr__pay>");
......@@ -5525,5 +5609,23 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
return "w_" + objName;
}
private static void setNodeValue(Document dom, String nodeName,String nodeVal) throws Exception {
Node tempNode = dom.getElementsByTagName(nodeName).item(0);
if (tempNode != null) {
if (tempNode.getFirstChild() == null) {
CDATASection cDataSection = dom.createCDATASection(nodeVal);
tempNode.appendChild(cDataSection);
} else {
tempNode.getFirstChild().setNodeValue(nodeVal);
}
}
tempNode = null;
}
private static void setNodeValue(Document dom, String nodeName, double nodeVal) throws Exception {
setNodeValue(dom, nodeName, Double.toString(nodeVal));
}
}
\ No newline at end of file
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