Skip to content

B
business-java
Commit bf9d4175 authored by dchattar's avatar dchattar
Browse files
Options

FI1BALL001 - changes done in finEntity... 

FI1BALL001 - changes done in finEntity fieldjava-projects-ejb3/ibase/webitm-fin/ibase/webitm/ejb/fin/MiscVal.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91487 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 84dcd42d
Show whitespace changes
Inline Side-by-side
Showing with 90 additions and 20 deletions
webitm-fin/ibase/webitm/ejb/fin/MiscVal.java
View file @ bf9d4175
......@@ -255,7 +255,7 @@ public class MiscVal extends ValidatorEJB implements MiscValLocal, MiscValRemote
}
}
rs.close();
rs = null;
rs = null;/home/dchattar/Dipak_Project/Misc_voucher/src/
pstmt.close();
pstmt = null;
}
......@@ -350,7 +350,7 @@ public class MiscVal extends ValidatorEJB implements MiscValLocal, MiscValRemote
if ((errCode == null || (errCode.trim().length() == 0)) && "E".equalsIgnoreCase( sundryTypePay))
{
sql1 = "SELECT emp_site FROM employee WHERE emp_code = ?";
pstmt = conn.prepareStatement(sql1);
/home/dchattar/Dipak_Project/Misc_voucher/src/ pstmt = conn.prepareStatement(sql1);
pstmt.setString(1,sundryCodePay);
rs = pstmt.executeQuery();
if (rs.next())
......@@ -417,7 +417,7 @@ public class MiscVal extends ValidatorEJB implements MiscValLocal, MiscValRemote
}
if(cnt == 0)
{
sql = " select count(purc_order) from porder where purc_order = ? and confirmed = 'Y' ";
/home/dchattar/Dipak_Project/Misc_voucher/src/ sql = " select count(purc_order) from porder where purc_order = ? and confirmed = 'Y' ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,orderRef);
rs = pstmt.executeQuery();
......@@ -2178,7 +2178,10 @@ public class MiscVal extends ValidatorEJB implements MiscValLocal, MiscValRemote
if(stanCode!= null && (stanCode.trim().length() > 0 ))
{
stanName = findValue(conn, "descr" ,"station", "stan_code", stanCode);
if(stanName != null)
{
stanName = stanName.trim();
}
valueXmlString.append("<stan_descr_pay>").append("<![CDATA[" + stanName + "]]>").append("</stan_descr_pay>");
}
else
......@@ -2189,7 +2192,10 @@ public class MiscVal extends ValidatorEJB implements MiscValLocal, MiscValRemote
if(stanCode!= null && (stanCode.trim().length() > 0 ))
{
stanName = findValue(conn, "descr" ,"station", "stan_code", stanCode);
if(stanName != null)
{
stanName = stanName.trim();
}
valueXmlString.append("<stan_descr>").append("<![CDATA[" + stanName + "]]>").append("</stan_descr>");
}
else
......@@ -2220,7 +2226,10 @@ public class MiscVal extends ValidatorEJB implements MiscValLocal, MiscValRemote
if(stanCode!= null && (stanCode.trim().length() > 0 ))
{
stanName = findValue(conn, "descr" ,"station", "stan_code", stanCode);
if(stanName != null)
{
stanName = stanName.trim();
}
valueXmlString.append("<stan_descr_pay>").append("<![CDATA[" + stanName + "]]>").append("</stan_descr_pay>");
}
else
......@@ -2470,8 +2479,20 @@ public class MiscVal extends ValidatorEJB implements MiscValLocal, MiscValRemote
else if("R".equalsIgnoreCase(sundryType))
{
mFname = findValue(conn, "first_name" , "strg_customer b", "customer a", "b.cust_code", "b.sc_code", "a.cust_code(+)", sundryCode);
if(mFname != null)
{
mFname = mFname.trim();
}
mName = findValue(conn, "middle_name" , "strg_customer b", "customer a", "b.cust_code", "b.sc_code", "a.cust_code(+)", sundryCode);
if(mName != null)
{
mName = mName.trim();
}
mLname = findValue(conn, "last_name" , "strg_customer b", "customer a", "b.cust_code", "b.sc_code", "a.cust_code(+)", sundryCode);
if(mLname != null)
{
mLname = mLname.trim();
}
currCode = findValue(conn, "a.curr_code" , "strg_customer b", "customer a", "b.cust_code", "b.sc_code", "a.cust_code(+)", sundryCode);
acctCodeAp = findValue(conn, "b.acct_code__ap" , "strg_customer b", "customer a", "b.cust_code", "b.sc_code", "a.cust_code(+)", sundryCode);
cctrCodeAp = findValue(conn, "b.cctr_code__ap" , "strg_customer b", "customer a", "b.cust_code", "b.sc_code", "a.cust_code(+)", sundryCode);
......@@ -2499,7 +2520,7 @@ public class MiscVal extends ValidatorEJB implements MiscValLocal, MiscValRemote
{
cctrCodeAp = findValue(conn, "a.cctr_code__ar" , "strg_customer b", "customer a", "b.cust_code", "b.sc_code", "a.cust_code(+)", sundryCode);
}
descName = mFname.trim() + "" + mName.trim() + "" + mLname.trim();
descName = mFname + "" + mName + "" + mLname;
fldName = "CUST_TYPE";
lcCode = getCode(conn, "fn_strg_customer_det('R',sundryCode,'L')", "dual");
valueXmlString.append("<locality_code>").append("<![CDATA[" + lcCode + "]]>").append("</locality_code>");
......@@ -2521,7 +2542,15 @@ public class MiscVal extends ValidatorEJB implements MiscValLocal, MiscValRemote
else if("E".equalsIgnoreCase(sundryType))
{
mFname = findValue(conn, "a.emp_fname" , "employee a", "site b", "department c", "a.pay_site", "a.emp_code", "a.dept_code", "b.site_code", sundryCode, "c.dept_code");
if(mFname != null)
{
mFname = mFname.trim();
}
mLname = findValue(conn, "a.emp_lname" , "employee a", "site b", "department c", "a.pay_site", "a.emp_code", "a.dept_code", "b.site_code", sundryCode, "c.dept_code");
if(mLname != null)
{
mLname = mLname.trim();
}
acctCodeAp = findValue(conn, "c.acct_code__ap" , "employee a", "site b", "department c", "a.pay_site", "a.emp_code", "a.dept_code", "b.site_code", sundryCode, "c.dept_code");
cctrCodeAp = findValue(conn, "c.cctr_code__ap" , "employee a", "site b", "department c", "a.pay_site", "a.emp_code", "a.dept_code", "b.site_code", sundryCode, "c.dept_code");
mSite = findValue(conn, "b.site_code__acct" , "employee a", "site b", "department c", "a.pay_site", "a.emp_code", "a.dept_code", "b.site_code", sundryCode, "c.dept_code");
......@@ -2538,13 +2567,16 @@ public class MiscVal extends ValidatorEJB implements MiscValLocal, MiscValRemote
{
cctrCodeAp = findValue(conn, "a.cctr_code__sal" , "employee a", "site b", "a.pay_site", "a.emp_code", "b.site_code", sundryCode);
}
descName = mFname.trim() + "" + mLname.trim();
descName = mFname + "" + mLname;
currCode = findValue(conn, "curr_code", "site", "finent", "site.fin_entity", "site_code", "finent.fin_entity", siteCode);
valueXmlString.append("<pay_mode>").append("<![CDATA[" + payMode + "]]>").append("</pay_mode>");
if(bankCode != null && (bankCode.trim().length() > 0 ))
{
valueXmlString.append("<bank_code>").append("<![CDATA[" + bankCode + "]]>").append("</bank_code>");
if(bankCode != null)
{
bankCode = bankCode.trim();
}
descName = 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);
......@@ -2566,7 +2598,11 @@ public class MiscVal extends ValidatorEJB implements MiscValLocal, MiscValRemote
if("F".equalsIgnoreCase(vouchType))
{
grade = findValue(conn, "grade", "employee", "emp_code", sundryCode);
valueXmlString.append("<tran_type>").append("<![CDATA[" + grade.trim() + "]]>").append("</tran_type>");
if(grade != null)
{
grade = grade.trim();
}
valueXmlString.append("<tran_type>").append("<![CDATA[" + grade + "]]>").append("</tran_type>");
}
else if("A".equalsIgnoreCase(vouchType))
{
......@@ -2597,7 +2633,10 @@ public class MiscVal extends ValidatorEJB implements MiscValLocal, MiscValRemote
if(bankCode != null && (bankCode.trim().length() > 0 ))
{
valueXmlString.append("<bank_code>").append("<![CDATA[" + bankCode + "]]>").append("</bank_code>");
if(bankCode != null)
{
bankCode = bankCode.trim();
}
descName = 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);
......@@ -2735,8 +2774,11 @@ public class MiscVal extends ValidatorEJB implements MiscValLocal, MiscValRemote
stanCode = findValue(conn, "stan_code" , "loanparty", "party_code", sundryCode);
}
if(!("E".equalsIgnoreCase(vouchType)))
{
if(descrType != null)
{
descrType = descrType.trim().toUpperCase();
}
designation = findCodes("descr" , "gencodes", "Upper(mod_name)", "Upper(fld_name)", "Upper(fld_value)", "X", fldName , descrType,conn);
valueXmlString.append("<designation>").append("<![CDATA[" + designation + "]]>").append("</designation>");
descrType = "";
......@@ -2744,7 +2786,10 @@ public class MiscVal extends ValidatorEJB implements MiscValLocal, MiscValRemote
if(stanCode != null && (stanCode.trim().length() > 0 ))
{
stanName = findValue(conn, "descr" , "station", "stan_code", stanCode);
if(stanName != null)
{
stanName = stanName.trim();
}
valueXmlString.append("<stan_descr>").append("<![CDATA[" + stanName + "]]>").append("</stan_descr>");
}
else
......@@ -2928,7 +2973,7 @@ public class MiscVal extends ValidatorEJB implements MiscValLocal, MiscValRemote
valueXmlString.append("<accounts_descr>").append("<![CDATA[" + acctName + "]]>").append("</accounts_descr>");
valueXmlString.append("<cctr_code__pay protect = \"1\">").append("<![CDATA[" + cctrCodePay + "]]>").append("</cctr_code__pay>");
valueXmlString.append("<cctr_code__ap>").append("<![CDATA[" + cctrCodePay + "]]>").append("</cctr_code__ap>");
valueXmlString.append("<tot_amt>").append("<![CDATA[" + totAmt + "]]>").append("</tot_amt>");
valueXmlS/home/dchattar/Dipak_Project/Misc_voucher/src/tring.append("<tot_amt>").append("<![CDATA[" + totAmt + "]]>").append("</tot_amt>");
valueXmlString.append("<tax_amt>").append("<![CDATA[" + taxAmt + "]]>").append("</tax_amt>");
valueXmlString.append("<net_amt>").append("<![CDATA[" + amount + "]]>").append("</net_amt>");
valueXmlString.append("<cr_term>").append("<![CDATA[" + crTerm + "]]>").append("</cr_term>");
......@@ -2995,7 +3040,7 @@ public class MiscVal extends ValidatorEJB implements MiscValLocal, MiscValRemote
else if(currentColumn.trim().equalsIgnoreCase("sundry_type__pay"))
{
valueXmlString.append("<sundry_code__pay>").append("<![CDATA[" + "" + "]]>").append("</sundry_code__pay>");
valueXmlString.app/home/dchattar/Dipak_Project/Misc_voucher/src/end("<sundry_code__pay>").append("<![CDATA[" + "" + "]]>").append("</sundry_code__pay>");
valueXmlString.append("<sundry_name_pay>").append("<![CDATA[" + "" + "]]>").append("</sundry_name_pay>");
valueXmlString.append("<acct_code__pay>").append("<![CDATA[" + "" + "]]>").append("</acct_code__pay>");
valueXmlString.append("<cctr_code__pay>").append("<![CDATA[" + "" + "]]>").append("</cctr_code__pay>");
......@@ -3074,7 +3119,10 @@ public class MiscVal extends ValidatorEJB implements MiscValLocal, MiscValRemote
if(stanCode != null && (stanCode.trim().length() > 0 ))
{
stanName = findValue(conn, "descr" , "station", "stan_code", stanCode);
if(stanName != null)
{
stanName = stanName.trim();
}
valueXmlString.append("<stan_descr_pay>").append("<![CDATA[" + stanName + "]]>").append("</stan_descr_pay>");
}
else
......@@ -3159,7 +3207,10 @@ public class MiscVal extends ValidatorEJB implements MiscValLocal, MiscValRemote
bankCode = findValue(conn, "bank_code" , "site", "site_code", siteCode);
}
descName = findValue(conn, "bank_name" , "bank", "bank_code", bankCode);
if(bankCode != null)
{
bankCode = bankCode.trim();
}
valueXmlString.append("<bank_code>").append("<![CDATA[" + bankCode + "]]>").append("</bank_code>");
valueXmlString.append("<bank_bank_name>").append("<![CDATA[" + descName + "]]>").append("</bank_bank_name>");
currCode = findValue(conn, "curr_code" , "bank", "bank_code", bankCode);
......@@ -3253,7 +3304,10 @@ public class MiscVal extends ValidatorEJB implements MiscValLocal, MiscValRemote
else if(currentColumn.trim().equalsIgnoreCase("bank_code"))
{
bankCode = genericUtility.getColumnValue("bank_code", dom);
if(bankCode != null)
{
bankCode = bankCode.trim();
}
descName = 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);
......@@ -3542,8 +3596,16 @@ public class MiscVal extends ValidatorEJB implements MiscValLocal, MiscValRemote
{
mFname = findValue(conn, "emp_fname" , "employee", "emp_code", sundryCodeFor);
mLname = findValue(conn, "emp_lname" , "employee", "emp_code", sundryCodeFor);
if(mFname != null)
{
mFname = mFname.trim();
}
if(mLname != null)
{
mLname = mLname.trim();
}
custCity = findValue(conn, "cur_city" , "employee", "emp_code", sundryCodeFor);
mdescr = mFname.trim() + "" + mLname.trim();
mdescr = mFname + "" + mLname;
}
else if("P".equalsIgnoreCase(sundryTypeFor))
{
......@@ -3742,8 +3804,16 @@ public class MiscVal extends ValidatorEJB implements MiscValLocal, MiscValRemote
{
mFname = findValue(conn, "emp_fname" , "employee", "emp_code", sundryCodeFor);
mLname = findValue(conn, "emp_lname" , "employee", "emp_code", sundryCodeFor);
if(mFname != null)
{
mFname = mFname.trim();
}
if(mLname != null)
{
mLname = mLname.trim();
}
custCity = findValue(conn, "cur_city" , "employee", "emp_code", sundryCodeFor);
mdescr = mFname.trim() + "" + mLname.trim();
mdescr = mFname + "" + mLname;
}
else if("P".equalsIgnoreCase(sundryTypeFor))
{
......
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