Skip to content

B
business-java
Commit 77c54c93 authored by asikarwar's avatar asikarwar
Browse files
Options

FOR BILL AMT DISC 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93397 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 36dab474
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 50 deletions
webitm-fin/ibase/webitm/ejb/fin/ReceiptAdv.java
View file @ 77c54c93
...@@ -172,12 +172,12 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -172,12 +172,12 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
{ {
tranDateS=this.genericUtility.getColumnValue("tran_date", dom); tranDateS=this.genericUtility.getColumnValue("tran_date", dom);
siteCode = this.genericUtility.getColumnValue("site_code", dom); siteCode = this.genericUtility.getColumnValue("site_code", dom);
if (tranDateS != null && !tranDateS.matches("\\d{4}-[01]\\d-[0-3]\\d")) if (tranDateS != null && !tranDateS.matches("\\d{4}-[01]\\d-[0-3]\\d"))
{ {
tranDate = dateFormat2.parse(tranDateS); tranDate = dateFormat2.parse(tranDateS);
/* errCode = this.checkPeriod("FIN", siteCode, tranDate, conn); /* errCode = this.checkPeriod("FIN", siteCode, tranDate, conn);
if(errCode != null && errCode.trim().length() >0) if(errCode != null && errCode.trim().length() >0)
{ {
errList.add(errCode); errList.add(errCode);
...@@ -191,7 +191,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -191,7 +191,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
} }
else if (childNodeName.equalsIgnoreCase("tran_type")) else if (childNodeName.equalsIgnoreCase("tran_type"))
{ {
tranType=this.genericUtility.getColumnValue("tran_type", dom); tranType=this.genericUtility.getColumnValue("tran_type", dom);
...@@ -203,9 +203,9 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -203,9 +203,9 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
} }
// As par discuss with manoharan sir it is not required // As par discuss with manoharan sir it is not required
/* else if (childNodeName.equalsIgnoreCase("tran_type")) /* else if (childNodeName.equalsIgnoreCase("tran_type"))
{ {
tranType=this.genericUtility.getColumnValue("tran_type", dom); tranType=this.genericUtility.getColumnValue("tran_type", dom);
if (tranType != null && tranType.trim().length() > 0) if (tranType != null && tranType.trim().length() > 0)
...@@ -444,7 +444,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -444,7 +444,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
} }
} }
} }
if (childNodeName.equalsIgnoreCase("acct_code__cf")) if (childNodeName.equalsIgnoreCase("acct_code__cf"))
{ {
...@@ -602,7 +602,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -602,7 +602,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
} }
else if (childNodeName.equalsIgnoreCase("proj_code")) else if (childNodeName.equalsIgnoreCase("proj_code"))
{ {
...@@ -899,17 +899,21 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -899,17 +899,21 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
} }
else if(childNodeName.equalsIgnoreCase("bill_disc_amt")) //added by ritesh as per discusion with pravin on 14/05/13 start else if(childNodeName.equalsIgnoreCase("bill_disc_amt")) //added by ritesh as per discusion with pravin on 14/05/13 start
{ {
billDiscAmt = Double.parseDouble(this.genericUtility.getColumnValue("bill_disc_amt", dom)); if(this.genericUtility.getColumnValue("bill_disc_amt", dom)!= null && this.genericUtility.getColumnValue("bill_disc_amt", dom).trim().length() >0)
if (billDiscAmt > 0)
{ {
rcpAmt1 = doublevalue(this.genericUtility.getColumnValue("rcp_amt", dom));
if(billDiscAmt > rcpAmt1) billDiscAmt = Double.parseDouble(this.genericUtility.getColumnValue("bill_disc_amt", dom));
if (billDiscAmt > 0)
{ {
errCode = "VTBDAMT"; rcpAmt1 = doublevalue(this.genericUtility.getColumnValue("rcp_amt", dom));
errList.add(errCode); if(billDiscAmt > rcpAmt1)
errFields.add(childNodeName.toLowerCase()); {
} errCode = "VTBDAMT";
} errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
}
}
} //added by ritesh as per discusion with pravin on 14/05/13 end } //added by ritesh as per discusion with pravin on 14/05/13 end
else if(childNodeName.equalsIgnoreCase("rcp_amt")) else if(childNodeName.equalsIgnoreCase("rcp_amt"))
{ {
...@@ -2188,7 +2192,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -2188,7 +2192,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
sql = "select curr_code from bank where bank_code = ?"; sql = "select curr_code from bank where bank_code = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, bankCode); pstmt.setString(1, bankCode);
...@@ -2202,7 +2206,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -2202,7 +2206,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
sql = "select std_exrt from currency where curr_code = ? "; sql = "select std_exrt from currency where curr_code = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, currCode); pstmt.setString(1, currCode);
...@@ -2215,7 +2219,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -2215,7 +2219,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
valueXmlString.append("<exch_rate protect = \"1\">").append("<![CDATA[" + stdExRt +"]]>").append("</exch_rate>"); valueXmlString.append("<exch_rate protect = \"1\">").append("<![CDATA[" + stdExRt +"]]>").append("</exch_rate>");
} }
sql = "select descr from finent where fin_entity = ?"; sql = "select descr from finent where fin_entity = ?";
...@@ -2226,15 +2230,15 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -2226,15 +2230,15 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
{ {
finentDescr = rs.getString(1); finentDescr = rs.getString(1);
} }
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
//bankCode = bankCode.trim(); //bankCode = bankCode.trim();
sql = " select bank_name, acct_code__bal, cctr_code__bal, acct_code__cf, cctr_code__cf,acct_code__cf_ar, cctr_code__cf_ar from bank where bank_code = ?"; sql = " select bank_name, acct_code__bal, cctr_code__bal, acct_code__cf, cctr_code__cf,acct_code__cf_ar, cctr_code__cf_ar from bank where bank_code = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -2250,13 +2254,13 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -2250,13 +2254,13 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
acctCodeCfAr = rs.getString(6); acctCodeCfAr = rs.getString(6);
cctrCodeCfAr = rs.getString(7); cctrCodeCfAr = rs.getString(7);
} }
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
if ((acctCodeCfAr != null) && (acctCodeCfAr.trim().length() > 0)) if ((acctCodeCfAr != null) && (acctCodeCfAr.trim().length() > 0))
{ {
acctCodeCf = acctCodeCfAr; acctCodeCf = acctCodeCfAr;
...@@ -2297,8 +2301,8 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -2297,8 +2301,8 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
} }
} }
} }
else if (currentColumn.trim().equalsIgnoreCase("bank_code")) else if (currentColumn.trim().equalsIgnoreCase("bank_code"))
...@@ -2345,7 +2349,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -2345,7 +2349,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
...@@ -2369,13 +2373,13 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -2369,13 +2373,13 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
acctCodeAdv = rs.getString(7); acctCodeAdv = rs.getString(7);
cctrCodeAdv = rs.getString(8); cctrCodeAdv = rs.getString(8);
} }
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
valueXmlString.append("<cust_name>").append("<![CDATA[" + custName + "]]>").append("</cust_name>"); valueXmlString.append("<cust_name>").append("<![CDATA[" + custName + "]]>").append("</cust_name>");
valueXmlString.append("<acct_code__ar>").append("<![CDATA[" + acctCodeAr + "]]>").append("</acct_code__ar>"); valueXmlString.append("<acct_code__ar>").append("<![CDATA[" + acctCodeAr + "]]>").append("</acct_code__ar>");
valueXmlString.append("<cctr_code__ar>").append("<![CDATA[" + cctrCodeAr + "]]>").append("</cctr_code__ar>"); valueXmlString.append("<cctr_code__ar>").append("<![CDATA[" + cctrCodeAr + "]]>").append("</cctr_code__ar>");
...@@ -2410,12 +2414,12 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -2410,12 +2414,12 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
{ {
finEntity = rs.getString(1); finEntity = rs.getString(1);
} }
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
advAmt = Double.parseDouble(genericUtility.getColumnValue("adv_amt", dom)); advAmt = Double.parseDouble(genericUtility.getColumnValue("adv_amt", dom));
if (advAmt == 0.0D) if (advAmt == 0.0D)
{ {
...@@ -2446,17 +2450,17 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -2446,17 +2450,17 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
{ {
sumAdvAmt = rs.getDouble(1); sumAdvAmt = rs.getDouble(1);
} }
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
sumAdvAmt *= -1.0D; sumAdvAmt *= -1.0D;
valueXmlString.append("<CFC_REMARKS >").append("<![CDATA[" + sumAdvAmt + "]]>").append("</CFC_REMARKS>"); valueXmlString.append("<CFC_REMARKS >").append("<![CDATA[" + sumAdvAmt + "]]>").append("</CFC_REMARKS>");
} }
setNodeValue(dom, "curr_code", getAbsString(currCode)); setNodeValue(dom, "curr_code", getAbsString(currCode));
} }
...@@ -2484,8 +2488,8 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -2484,8 +2488,8 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
if (currCode.trim().equals(CurrCode.trim())) if (currCode.trim().equals(CurrCode.trim()))
{ {
valueXmlString.append("<exch_rate protect = \"1\">").append("<![CDATA[" + mexchrate + "]]>").append("</exch_rate>"); valueXmlString.append("<exch_rate protect = \"1\">").append("<![CDATA[" + mexchrate + "]]>").append("</exch_rate>");
...@@ -2499,7 +2503,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -2499,7 +2503,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
{ {
valueXmlString.append("<exch_rate_spot>").append("<![CDATA[" + mexchrate + "]]>").append("</exch_rate_spot>"); valueXmlString.append("<exch_rate_spot>").append("<![CDATA[" + mexchrate + "]]>").append("</exch_rate_spot>");
} }
sql = "select std_exrt from currency where curr_code = ? "; sql = "select std_exrt from currency where curr_code = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, currCode); pstmt.setString(1, currCode);
...@@ -2510,12 +2514,12 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -2510,12 +2514,12 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
} }
valueXmlString.append("<exch_rate protect = \"1\">").append("<![CDATA[" + stdExRt +"]]>").append("</exch_rate>"); valueXmlString.append("<exch_rate protect = \"1\">").append("<![CDATA[" + stdExRt +"]]>").append("</exch_rate>");
valueXmlString.append("<exch_rate_spot protect = \"0\">").append("<![CDATA[" + stdExRt + "]]>").append("</exch_rate_spot>"); valueXmlString.append("<exch_rate_spot protect = \"0\">").append("<![CDATA[" + stdExRt + "]]>").append("</exch_rate_spot>");
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
else if (currentColumn.trim().equalsIgnoreCase("chq_amt")) else if (currentColumn.trim().equalsIgnoreCase("chq_amt"))
{ {
...@@ -2561,7 +2565,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -2561,7 +2565,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
valueXmlString.append("</Detail1>"); valueXmlString.append("</Detail1>");
break; break;
...@@ -2700,7 +2704,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -2700,7 +2704,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
if (billDisc.trim().equalsIgnoreCase("Y")) if (billDisc.trim().equalsIgnoreCase("Y"))
{ //added by ritesh { //added by ritesh
sql = "select export_fund.exch_rate,export_fundet.amount from export_fund, export_fundet where ( export_fund.tran_id = export_fundet.tran_id ) and ( export_fund.confirmed = 'Y' ) and ( ( export_fundet.ref_ser = ? ) and ( export_fundet.ref_no = ? ) )"; sql = "select export_fund.exch_rate,export_fundet.amount from export_fund, export_fundet where ( export_fund.tran_id = export_fundet.tran_id ) and ( export_fund.confirmed = 'Y' ) and ( ( export_fundet.ref_ser = ? ) and ( export_fundet.ref_no = ? ) )";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, refSer); pstmt.setString(1, refSer);
pstmt.setString(2, refNo); pstmt.setString(2, refNo);
...@@ -3713,7 +3717,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -3713,7 +3717,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
{ {
errorCode = "VMSTATSND"; errorCode = "VMSTATSND";
} }
pst.close(); pst.close();
pst = null; pst = null;
...@@ -3729,8 +3733,8 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -3729,8 +3733,8 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
return errorCode; return errorCode;
} }
private String checkNull(String str) private String checkNull(String str)
{ {
if(str == null) if(str == null)
......
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