Skip to content

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

for tax provision in receipt req id FI3DDOS001 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93518 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 368c8cb9
Hide whitespace changes
Inline Side-by-side
Showing with 529 additions and 229 deletions
webitm-fin/ibase/webitm/ejb/fin/ReceiptAdv.java
View file @ db97a260
...@@ -107,7 +107,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -107,7 +107,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
String refDateS = "" ; String refDateS = "" ;
String dueDateS = ""; String dueDateS = "";
String siteSpecificBank = ""; String siteSpecificBank = "";
String taxClass = "",taxEnv = "",taxChap;//added by akhilesh on 31/july/13 for tax provision
double diffAmtExch = 0.0D; double diffAmtExch = 0.0D;
double exchRate = 0.0D; double exchRate = 0.0D;
double amount = 0.0D; double amount = 0.0D;
...@@ -325,6 +325,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -325,6 +325,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
if ((errCode == null) || (errCode.trim().length() == 0)) if ((errCode == null) || (errCode.trim().length() == 0))
{ {
System.out.println("prioddddddddd"); System.out.println("prioddddddddd");
tranDate = dateFormat2.parse(this.genericUtility.getColumnValue("tran_date", dom)); tranDate = dateFormat2.parse(this.genericUtility.getColumnValue("tran_date", dom));
errCode = checkPeriod("FIN", siteCode, tranDate, conn); errCode = checkPeriod("FIN", siteCode, tranDate, conn);
if(errCode != null && errCode.trim().length() >0) if(errCode != null && errCode.trim().length() >0)
...@@ -665,6 +666,94 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -665,6 +666,94 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
} }
//added by akhilesh on 19/AUG/13 for tax provision
else if(childNodeName.equalsIgnoreCase("tax_class"))
{
taxClass = checkNull(genericUtility.getColumnValue("tax_class", dom));
if( taxClass != null && taxClass.trim().length() > 0)
{
sql = "select count(*) from taxclass where tax_class = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, taxClass);
rs = pstmt.executeQuery();
if (rs.next())
{
cnt = rs.getInt(1);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if(cnt == 0)
{
errCode = "VTTAXCLA1";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
}
}
else if(childNodeName.equalsIgnoreCase("tax_chap"))
{
taxChap = checkNull(genericUtility.getColumnValue("tax_chap", dom));
if( taxChap != null && taxChap.trim().length() > 0)
{
sql = "select count(*) from taxchap where tax_chap = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, taxChap);
rs = pstmt.executeQuery();
if (rs.next())
{
cnt = rs.getInt(1);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if(cnt == 0)
{
errCode = "VTTCHAP1";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
}
}
else if(childNodeName.equalsIgnoreCase("tax_env"))
{
taxEnv = checkNull(genericUtility.getColumnValue("tax_env", dom));
if( taxEnv != null && taxEnv.trim().length() > 0)
{
sql = "select count(*) from taxenv where tax_env = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, taxEnv);
rs = pstmt.executeQuery();
if (rs.next())
{
cnt = rs.getInt(1);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if(cnt == 0)
{
errCode = "VMTAXENVNF";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
}
}
//ended by akhilesh on 19/AUG/13 for tax provision
else if(childNodeName.equalsIgnoreCase("tran_id__advbking")) else if(childNodeName.equalsIgnoreCase("tran_id__advbking"))
{ {
tranIdAdvbking = this.genericUtility.getColumnValue("tran_id__advbking", dom); tranIdAdvbking = this.genericUtility.getColumnValue("tran_id__advbking", dom);
...@@ -826,8 +915,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -826,8 +915,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
dueDate = dateFormat2.parse(dueDateS); dueDate = dateFormat2.parse(dueDateS);
} }
} }
/*Commented by Manoj dtd 12/08/2013 validation not requiredas discussed with Manoharan Sir else if (childNodeName.equalsIgnoreCase("curr_code"))
else if (childNodeName.equalsIgnoreCase("curr_code"))
{ {
currCode = this.genericUtility.getColumnValue("curr_code", dom); currCode = this.genericUtility.getColumnValue("curr_code", dom);
if (currCode != null && currCode.trim().length() > 0) if (currCode != null && currCode.trim().length() > 0)
...@@ -842,7 +930,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -842,7 +930,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
} }
}*/ }
else if (childNodeName.equalsIgnoreCase("acct_code__ar")) else if (childNodeName.equalsIgnoreCase("acct_code__ar"))
{ {
acctCodeAr = this.genericUtility.getColumnValue("acct_code__ar", dom); acctCodeAr = this.genericUtility.getColumnValue("acct_code__ar", dom);
...@@ -1025,6 +1113,92 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -1025,6 +1113,92 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
} }
} }
//added by akhilesh on 31/july/13 for tax provision
else if(childNodeName.equalsIgnoreCase("tax_class"))
{
taxClass = checkNull(genericUtility.getColumnValue("tax_class", dom));
if( taxClass != null && taxClass.trim().length() > 0)
{
sql = "select count(*) from taxclass where tax_class = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, taxClass);
rs = pstmt.executeQuery();
if (rs.next())
{
cnt = rs.getInt(1);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if(cnt == 0)
{
errCode = "VTTAXCLA1";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
}
}
else if(childNodeName.equalsIgnoreCase("tax_chap"))
{
taxChap = checkNull(genericUtility.getColumnValue("tax_chap", dom));
if( taxChap != null && taxChap.trim().length() > 0)
{
sql = "select count(*) from taxchap where tax_chap = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, taxChap);
rs = pstmt.executeQuery();
if (rs.next())
{
cnt = rs.getInt(1);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if(cnt == 0)
{
errCode = "VTTCHAP1";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
}
}
else if(childNodeName.equalsIgnoreCase("tax_env"))
{
taxEnv = checkNull(genericUtility.getColumnValue("tax_env", dom));
if( taxEnv != null && taxEnv.trim().length() > 0)
{
sql = "select count(*) from taxenv where tax_env = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, taxEnv);
rs = pstmt.executeQuery();
if (rs.next())
{
cnt = rs.getInt(1);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if(cnt == 0)
{
errCode = "VMTAXENVNF";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
}
}
//ended by akhilesh on 31/july/13 for tax provision
} }
valueXmlString.append("</Detail2>"); valueXmlString.append("</Detail2>");
break; break;
...@@ -1071,13 +1245,12 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -1071,13 +1245,12 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
/*Commented by Manoj dtd 12/08/2013 validation not requiredas discussed with Manoharan Sir else if(!currCode.trim().equals(hcurrCode.trim()))
else if(!currCode.trim().equals(hcurrCode.trim()))
{ {
errCode = "VTCURR1"; errCode = "VTCURR1";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
}*/ }
else { else {
if (dueDate.after(htranDate)) if (dueDate.after(htranDate))
{ {
...@@ -1212,7 +1385,6 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -1212,7 +1385,6 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
currCode = this.genericUtility.getColumnValue("curr_code", dom); currCode = this.genericUtility.getColumnValue("curr_code", dom);
if(currCode != null && currCode.trim().length() > 0) if(currCode != null && currCode.trim().length() > 0)
{ {
/*Commented by Manoj dtd 12/08/2013 validation not requiredas discussed with Manoharan Sir
hcurrCode = this.genericUtility.getColumnValue("curr_code", dom1); hcurrCode = this.genericUtility.getColumnValue("curr_code", dom1);
exchRate = doublevalue(this.genericUtility.getColumnValue("exch_rate", dom)); exchRate = doublevalue(this.genericUtility.getColumnValue("exch_rate", dom));
if (!currCode.trim().equalsIgnoreCase(hcurrCode.trim()) && (exchRate != 1.0)) if (!currCode.trim().equalsIgnoreCase(hcurrCode.trim()) && (exchRate != 1.0))
...@@ -1220,7 +1392,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -1220,7 +1392,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
errCode = "VTCUR3"; errCode = "VTCUR3";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
}*/ }
} }
else else
{ {
...@@ -1356,7 +1528,6 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -1356,7 +1528,6 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
currCode = this.genericUtility.getColumnValue("curr_code", dom); currCode = this.genericUtility.getColumnValue("curr_code", dom);
if(currCode != null && currCode.trim().length() > 0) if(currCode != null && currCode.trim().length() > 0)
{ {
/*Commented by Manoj dtd 12/08/2013 validation not requiredas discussed with Manoharan Sir
hcurrCode = this.genericUtility.getColumnValue("curr_code", dom1); hcurrCode = this.genericUtility.getColumnValue("curr_code", dom1);
exchRate = Double.parseDouble(this.genericUtility.getColumnValue("exch_rate", dom)); exchRate = Double.parseDouble(this.genericUtility.getColumnValue("exch_rate", dom));
if(!currCode.trim().equals(hcurrCode.trim())) if(!currCode.trim().equals(hcurrCode.trim()))
...@@ -1364,7 +1535,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -1364,7 +1535,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
errCode = "VTCUR3"; errCode = "VTCUR3";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
}*/ }
} }
} }
...@@ -2621,6 +2792,8 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -2621,6 +2792,8 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
if (currentColumn.trim().equalsIgnoreCase("itm_default")) if (currentColumn.trim().equalsIgnoreCase("itm_default"))
{ {
tranId = genericUtility.getColumnValue("tran_id", dom); tranId = genericUtility.getColumnValue("tran_id", dom);
sql = "select rcv_ser from finctrl"; sql = "select rcv_ser from finctrl";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -2632,6 +2805,14 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -2632,6 +2805,14 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
valueXmlString.append("<ref_ser>").append("<![CDATA[" + rcvSer + "]]>").append("</ref_ser>"); valueXmlString.append("<ref_ser>").append("<![CDATA[" + rcvSer + "]]>").append("</ref_ser>");
valueXmlString.append("<bill_disc>").append("<![CDATA[" + "N" + "]]>").append("</bill_disc>"); valueXmlString.append("<bill_disc>").append("<![CDATA[" + "N" + "]]>").append("</bill_disc>");
//added by akhilesh on 19/AUG/13 for tax provision
valueXmlString.append("<tax_class>").append("<![CDATA[" + checkNull(genericUtility.getColumnValue("tax_class", dom1)) + "]]>").append("</tax_class>");
valueXmlString.append("<tax_chap>").append("<![CDATA[" + checkNull(genericUtility.getColumnValue("tax_chap", dom1)) + "]]>").append("</tax_chap>");
valueXmlString.append("<tax_env>").append("<![CDATA[" + checkNull(genericUtility.getColumnValue("tax_env", dom1))+ "]]>").append("</tax_env>");
//ended by akhilesh on 19/AUG/13 for tax provision
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
rs.close(); rs.close();
...@@ -2656,7 +2837,6 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -2656,7 +2837,6 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
billDisc = "N"; billDisc = "N";
refNo = genericUtility.getColumnValue("ref_no", dom); refNo = genericUtility.getColumnValue("ref_no", dom);
refSer = genericUtility.getColumnValue("ref_ser", dom); refSer = genericUtility.getColumnValue("ref_ser", dom);
sql = "select count(*) from receivables where tran_ser = ? and ref_no = ?"; sql = "select count(*) from receivables where tran_ser = ? and ref_no = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, refSer); pstmt.setString(1, refSer);
...@@ -2672,11 +2852,6 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -2672,11 +2852,6 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
} }
} }
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if ((lineNoRef != null) || (lineNoRef.trim().length() > 0)) if ((lineNoRef != null) || (lineNoRef.trim().length() > 0))
{ {
if (!refSer.equals("E-FUND")) if (!refSer.equals("E-FUND"))
...@@ -2706,10 +2881,6 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -2706,10 +2881,6 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
adjAmt = rs.getDouble(14); adjAmt = rs.getDouble(14);
badDebtAmt = rs.getDouble(15); badDebtAmt = rs.getDouble(15);
} }
rs.close();
rs = null;
pstmt.close();
pstmt = null;
} }
hexchRate = doublevalue(genericUtility.getColumnValue("exch_rate", dom1)); hexchRate = doublevalue(genericUtility.getColumnValue("exch_rate", dom1));
sql = "select descr from currency where currency.curr_code = ?"; sql = "select descr from currency where currency.curr_code = ?";
...@@ -2720,11 +2891,6 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -2720,11 +2891,6 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
{ {
currDescr = rs.getString(1); currDescr = rs.getString(1);
} }
rs.close();
rs = null;
pstmt.close();
pstmt = null;
sql = "select descr from accounts where accounts.acct_code = ?"; sql = "select descr from accounts where accounts.acct_code = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, acctCode); pstmt.setString(1, acctCode);
...@@ -2733,11 +2899,6 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -2733,11 +2899,6 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
{ {
accDescr = rs.getString(1); accDescr = rs.getString(1);
} }
rs.close();
rs = null;
pstmt.close();
pstmt = null;
sql = "select receivables.bill_disc from receivables where tran_ser = ? and ref_no = ? "; sql = "select receivables.bill_disc from receivables where tran_ser = ? and ref_no = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, refSer); pstmt.setString(1, refSer);
...@@ -2747,17 +2908,9 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -2747,17 +2908,9 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
{ {
billDisc = rs.getString(1); billDisc = rs.getString(1);
} }
rs.close(); if ((billDisc == null) || (billDisc.trim().length() == 0))
rs = null;
pstmt.close();
pstmt = null;
if(billDisc == null || billDisc.trim().length() == 0)
{
billDisc = "N"; billDisc = "N";
}
System.out.println("bill disc ------ > "+billDisc);
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 = ? ) )";
...@@ -2771,11 +2924,6 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -2771,11 +2924,6 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
discExchRate = rs.getDouble(1); // change by ritesh on 25/05/13 discExchRate = rs.getDouble(1); // change by ritesh on 25/05/13
lcBillDescAmt = rs.getString(2); lcBillDescAmt = rs.getString(2);
} }
rs.close();
rs = null;
pstmt.close();
pstmt = null;
System.out.println("bill disc 1 ------ > "+billDisc);
valueXmlString.append("<bill_disc_amt>").append("<![CDATA[" + lcBillDescAmt + "]]>").append("</bill_disc_amt>"); //added by ritesh as per discussion with pravin valueXmlString.append("<bill_disc_amt>").append("<![CDATA[" + lcBillDescAmt + "]]>").append("</bill_disc_amt>"); //added by ritesh as per discussion with pravin
} }
valueXmlString.append("<bill_disc>").append("<![CDATA[" + billDisc + "]]>").append("</bill_disc>"); valueXmlString.append("<bill_disc>").append("<![CDATA[" + billDisc + "]]>").append("</bill_disc>");
...@@ -2849,12 +2997,6 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -2849,12 +2997,6 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
{ {
ctr = rs.getInt(1); ctr = rs.getInt(1);
} }
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if ((tranSer == "S-INV") || (ctr == 1)) if ((tranSer == "S-INV") || (ctr == 1))
{ {
sql = "select due_date,cr_term from invoice where invoice_id = ?"; sql = "select due_date,cr_term from invoice where invoice_id = ?";
...@@ -2866,13 +3008,6 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -2866,13 +3008,6 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
dueDate = rs.getDate(1); dueDate = rs.getDate(1);
crTrem = rs.getString(2); crTrem = rs.getString(2);
} }
rs.close();
rs = null;
pstmt.close();
pstmt = null;
tranDate = dateFormat1.parse(genericUtility.getColumnValue("tran_date", dom)); tranDate = dateFormat1.parse(genericUtility.getColumnValue("tran_date", dom));
if (tranDate.before(dueDate)) if (tranDate.before(dueDate))
{ {
...@@ -2904,163 +3039,138 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -2904,163 +3039,138 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
discountLc = Math.round(discountLc) * -1L; discountLc = Math.round(discountLc) * -1L;
valueXmlString.append("<fin_chg>").append("<![CDATA[" + discountLc + "]]>").append("</fin_chg>"); valueXmlString.append("<fin_chg>").append("<![CDATA[" + discountLc + "]]>").append("</fin_chg>");
} }
rs.close();
rs = null;
pstmt.close();
pstmt = null;
} }
} }
} }
} }
} }
} else if ((currentColumn.trim().equalsIgnoreCase("exch_rate")) || (currentColumn.trim().equalsIgnoreCase("rcp_amt")))
else if ((currentColumn.trim().equalsIgnoreCase("exch_rate")) || (currentColumn.trim().equalsIgnoreCase("rcp_amt")))
{
System.out.println("exch_rate ::::::::");
billDisc = "N";
refNo = genericUtility.getColumnValue("ref_no", dom);
refSer = genericUtility.getColumnValue("ref_ser", dom);
sql = "select bill_disc FROM receivables where tran_ser = ? and ref_no = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, refSer);
pstmt.setString(2, refNo);
rs = pstmt.executeQuery();
if (rs.next())
{
billDisc = rs.getString(1);
}
if (billDisc == null) billDisc = "N";
if ("Y".equals(billDisc))
{ {
sql = "select export_fund.exch_rate 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 = ?) )"; billDisc = "N";
refNo = genericUtility.getColumnValue("ref_no", dom);
refSer = genericUtility.getColumnValue("ref_ser", dom);
sql = "select bill_disc FROM receivables where tran_ser = ? and 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);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) if (rs.next())
{ {
exchRate = rs.getDouble(1); billDisc = rs.getString(1);
} }
rs.close(); if (billDisc == null) billDisc = "N";
rs = null; if (billDisc == "Y")
pstmt.close(); {
pstmt = null; sql = "select export_fund.exch_rate 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 = ?) )";
rcpAmt = Double.parseDouble(genericUtility.getColumnValue("rcp_amt", dom));
hexchRate = Double.parseDouble(genericUtility.getColumnValue("exch_rate", dom));
exchRate = Double.parseDouble(genericUtility.getColumnValue("exch_rate__rcv", dom));
}
bdFluctuationCf = getfinparm("999999", "BD_FLUCTUATION_CF" ,conn);
if (bdFluctuationCf.equals("") || bdFluctuationCf == null)
{
bdFluctuationCf = "Y";
}
if ((billDisc.equals("Y")) && (bdFluctuationCf.equals("Y")))
{
diffAmtExch = rcpAmt * exchRate - rcpAmt * exchRate;
valueXmlString.append("<diff_amt__exch>").append("<![CDATA[" + diffAmtExch + "]]>").append("</diff_amt__exch>");
}
else
{
diffAmtExch = rcpAmt * exchRate - rcpAmt * hexchRate;
valueXmlString.append("<diff_amt__exch>").append("<![CDATA[" + diffAmtExch + "]]>").append("</diff_amt__exch>");
}
//valueXmlString.append("<site_code protect = \"1\">").append("<![CDATA[" + siteCode + "]]>").append("</site_code>"); pstmt = conn.prepareStatement(sql);
//valueXmlString.append("<cust_code protect = \"1\">").append("<![CDATA[" + custCode + "]]>").append("</cust_code>"); pstmt.setString(1, refSer);
//valueXmlString.append("<curr_code protect = \"1\">").append("<![CDATA[" + currCode + "]]>").append("</curr_code>"); pstmt.setString(2, refNo);
//valueXmlString.append("<sale_order protect = \"1\">").append("<![CDATA[" + saleOrder + "]]>").append("</sale_order>"); rs = pstmt.executeQuery();
if (rs.next())
errCode = checkBadDebtAmt(0, conn, dom); {
if(errCode == null && errCode.trim().length() == 0) exchRate = rs.getDouble(1);
{ }
errList.add(errCode); rcpAmt = Double.parseDouble(genericUtility.getColumnValue("rcp_amt", dom));
errFields.add(childNodeName.toLowerCase()); hexchRate = Double.parseDouble(genericUtility.getColumnValue("exch_rate", dom));
} exchRate = Double.parseDouble(genericUtility.getColumnValue("exch_rate__rcv", dom));
rcpAutoFinchg = getfinparm("999999", "RCP_AUTO_FINCHG", conn); }
if (rcpAutoFinchg.equals("") || rcpAutoFinchg == null) bdFluctuationCf = getfinparm("999999", "BD_FLUCTUATION_CF" ,conn);
{ if (bdFluctuationCf.equals("") || bdFluctuationCf == null)
rcpAutoFinchg = "N";
}
if (rcpAutoFinchg.equals("Y"))
{
sql = "select count(*) from receivables where tran_ser = ? and ref_ser__org = ? and ref_no = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, "R-IBCA");
pstmt.setString(2, "S-INV");
pstmt.setString(3, refNo);
rs = pstmt.executeQuery();
if (rs.next())
{ {
ctr = rs.getInt(1); bdFluctuationCf = "Y";
}
if ((billDisc.equals("Y")) && (bdFluctuationCf.equals("Y")))
{
diffAmtExch = rcpAmt * exchRate - rcpAmt * exchRate;
valueXmlString.append("<diff_amt__exch>").append("<![CDATA[" + diffAmtExch + "]]>").append("</diff_amt__exch>");
}
else
{
diffAmtExch = rcpAmt * exchRate - rcpAmt * hexchRate;
valueXmlString.append("<diff_amt__exch>").append("<![CDATA[" + diffAmtExch + "]]>").append("</diff_amt__exch>");
} }
rs.close();
rs = null;
pstmt.close();
pstmt = null;
rcpAmt = Double.parseDouble(genericUtility.getColumnValue("rcp_amt", dom)); valueXmlString.append("<site_code protect = \"1\">").append("<![CDATA[" + siteCode + "]]>").append("</site_code>");
if ((tranSer == "S-INV") || (ctr == 1)) valueXmlString.append("<cust_code protect = \"1\">").append("<![CDATA[" + custCode + "]]>").append("</cust_code>");
valueXmlString.append("<curr_code protect = \"1\">").append("<![CDATA[" + currCode + "]]>").append("</curr_code>");
valueXmlString.append("<sale_order protect = \"1\">").append("<![CDATA[" + saleOrder + "]]>").append("</sale_order>");
errCode = checkBadDebtAmt(0, conn, dom);
if(errCode == null && errCode.trim().length() == 0)
{
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
rcpAutoFinchg = getfinparm("999999", "RCP_AUTO_FINCHG", conn);
if (rcpAutoFinchg.equals("") || rcpAutoFinchg == null)
{ {
sql = "select due_date,cr_term from invoice where invoice_id = ?"; rcpAutoFinchg = "N";
}
if (rcpAutoFinchg.equals("Y"))
{
sql = "select count(*) from receivables where tran_ser = ? and ref_ser__org = ? and ref_no = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, refNo); pstmt.setString(1, "R-IBCA");
pstmt.setString(2, "S-INV");
pstmt.setString(3, refNo);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) if (rs.next())
{ {
dueDate = rs.getDate(1); ctr = rs.getInt(1);
crTrem = rs.getString(2);
} }
rs.close(); rcpAmt = Double.parseDouble(genericUtility.getColumnValue("rcp_amt", dom));
rs = null; if ((tranSer == "S-INV") || (ctr == 1))
pstmt.close();
pstmt = null;
tranDate = dateFormat1.parse(genericUtility.getColumnValue("tran_date", dom));
if (tranDate.before(dueDate))
{ {
days = (int)(dueDate.getTime() - tranDate.getTime()) / 361440000; sql = "select due_date,cr_term from invoice where invoice_id = ?";
if (days > 0) pstmt = conn.prepareStatement(sql);
pstmt.setString(1, refNo);
rs = pstmt.executeQuery();
if (rs.next())
{ {
sql = "select fchg_type,case when fin_chg is null then 0 else fin_chg end from crtermfc where (min_day <= ? and max_day >= ? ) and cr_term = ?"; dueDate = rs.getDate(1);
crTrem = rs.getString(2);
pstmt = conn.prepareStatement(sql); }
pstmt.setInt(1, days); tranDate = dateFormat1.parse(genericUtility.getColumnValue("tran_date", dom));
pstmt.setInt(2, days); if (tranDate.before(dueDate))
pstmt.setString(3, crTrem); {
rs = pstmt.executeQuery(); days = (int)(dueDate.getTime() - tranDate.getTime()) / 361440000;
if (rs.next()) if (days > 0)
{ {
finChg = rs.getDouble(1); sql = "select fchg_type,case when fin_chg is null then 0 else fin_chg end from crtermfc where (min_day <= ? and max_day >= ? ) and cr_term = ?";
fchgType = rs.getString(2);
} pstmt = conn.prepareStatement(sql);
rs.close(); pstmt.setInt(1, days);
rs = null; pstmt.setInt(2, days);
pstmt.close(); pstmt.setString(3, crTrem);
pstmt = null; rs = pstmt.executeQuery();
if (rs.next())
if (finChg == 0.0D) finChg = 0.0D; {
if (discountLc == 0.0D) discountLc = 0.0D; finChg = rs.getDouble(1);
if (fchgType == "P") fchgType = rs.getString(2);
{
discountLc = rcpAmt * (finChg / 36500.0D) * days;
}
else
{
discountLc = finChg;
}
discountLc = Math.round(discountLc) * -1L;
valueXmlString.append("<fin_chg>").append("<![CDATA[" + discountLc + "]]>").append("</fin_chg>");
if (finChg == 0.0D) finChg = 0.0D;
if (discountLc == 0.0D) discountLc = 0.0D;
if (fchgType == "P")
{
discountLc = rcpAmt * (finChg / 36500.0D) * days;
}
else
{
discountLc = finChg;
}
discountLc = Math.round(discountLc) * -1L;
valueXmlString.append("<fin_chg>").append("<![CDATA[" + discountLc + "]]>").append("</fin_chg>");
}
}
} }
} }
} }
} }
pstmt.close();
pstmt = null;
rs.close();
rs = null;
} }
else if (currentColumn.trim().equalsIgnoreCase("bad_debt_amt")) else if (currentColumn.trim().equalsIgnoreCase("bad_debt_amt"))
{ {
errCode = checkBadDebtAmt(1, conn, dom); errCode = checkBadDebtAmt(1, conn, dom);
...@@ -3806,11 +3916,11 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -3806,11 +3916,11 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
procDate = rs.getDate(2); procDate = rs.getDate(2);
if (statFin.trim().equalsIgnoreCase("N")) if (statFin.trim().equalsIgnoreCase("N"))
{ {
errorCode = "VTPRDFIN"; errorCode = "VTPRDSAL";
} }
else if (procDate.after(tranDate)) else if (procDate.after(tranDate))
{ {
errorCode = "VTPRDTFIN"; errorCode = "VTPRDTSAL";
} }
} }
else else
......
webitm-fin/ibase/webitm/ejb/fin/adv/ReceiptAdvConf.java
View file @ db97a260
...@@ -25,7 +25,7 @@ import java.util.Date; ...@@ -25,7 +25,7 @@ import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import javax.ejb.Stateless; import javax.ejb.Stateless;
...@@ -235,7 +235,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -235,7 +235,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
int cnt = 0 ; int cnt = 0 ;
int maxline = 0; int maxline = 0;
int cnt1 = 0 ; int cnt1 = 0 ;
Date tranDate = null; Date tranDate = null;
HashMap RcpHdrMap = null; HashMap RcpHdrMap = null;
HashMap DetMap = null; HashMap DetMap = null;
...@@ -399,8 +399,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -399,8 +399,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
if(ledgPostConf != null && "Y".equalsIgnoreCase(ledgPostConf)) if(ledgPostConf != null && "Y".equalsIgnoreCase(ledgPostConf))
{ {
...@@ -568,6 +568,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -568,6 +568,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
sql = "select max(LINE_NO) from rcpacct where tran_id = ?"; sql = "select max(LINE_NO) from rcpacct where tran_id = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);//issue pstmt.setString(1,tranId);//issue
...@@ -582,10 +583,12 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -582,10 +583,12 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt = null; pstmt = null;
if(cnt == 0) if(cnt == 0)
{ {
//CLOSE INSERT //CLOSE INSERT
sql = "Insert into rcpacct (TRAN_ID,LINE_NO,ACCT_CODE,CCTR_CODE,EXCH_RATE,AMOUNT,EMP_CODE,ANAL_CODE,EFFECT_PARTY,SUNDRY_TYPE,SUNDRY_CODE) values (?,?,?,?,?,?,?,?,?,?,?)"; sql = "Insert into rcpacct (TRAN_ID,LINE_NO,ACCT_CODE,CCTR_CODE,EXCH_RATE,AMOUNT,EMP_CODE,ANAL_CODE,EFFECT_PARTY,SUNDRY_TYPE,SUNDRY_CODE) values (?,?,?,?,?,?,?,?,?,?,?)";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);//issue pstmt.setString(1,tranId);//issue
...@@ -610,7 +613,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -610,7 +613,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
sql = "update rcpacct set amount =? where tran_id = ?"; sql = "update rcpacct set amount =? where tran_id = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1, ((Double)RcpDetMap.get("rcp_amt")+(Double)(DetMap.get("amount")==null?0.0:DetMap.get("amount")))); pstmt.setDouble(1, ((Double)total));//added by akhilesh on 19/aug/13
//pstmt.setDouble(1, ((Double)RcpDetMap.get("rcp_amt")+(Double)(DetMap.get("amount")==null?0.0:DetMap.get("amount"))));
pstmt.setString(2, tranId); pstmt.setString(2, tranId);
int updateCoount = pstmt.executeUpdate(); int updateCoount = pstmt.executeUpdate();
...@@ -676,10 +680,10 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -676,10 +680,10 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
// rcpAmt = (Double)RcpDetMap.get( "rcp_amt"); // rcpAmt = (Double)RcpDetMap.get( "rcp_amt");
rcpAmt = (Double)RcpDetMap.get( "bill_disc_amt"); //added by ritesh on 15/05/13 as per discussion with pravin rcpAmt = (Double)RcpDetMap.get( "bill_disc_amt"); //added by ritesh on 15/05/13 as per discussion with pravin
totbdDiff = totbdDiff + (rcpAmt * hExchRate ) - (rcpAmt * exch ); totbdDiff = totbdDiff + (rcpAmt * hExchRate ) - (rcpAmt * exch );
// rcpAmt = 0 - (Double)RcpDetMap.get( "rcp_amt"); // rcpAmt = 0 - (Double)RcpDetMap.get( "rcp_amt");
rcpAmt = 0 - (Double)RcpDetMap.get( "bill_disc_amt"); // //added by ritesh on 15/05/13 as per discussion with pravin rcpAmt = 0 - (Double)RcpDetMap.get( "bill_disc_amt"); // //added by ritesh on 15/05/13 as per discussion with pravin
finChg = 0 - (Double)RcpDetMap.get( "fin_chg"); finChg = 0 - (Double)RcpDetMap.get( "fin_chg");
...@@ -708,6 +712,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -708,6 +712,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
sql = "select max(LINE_NO) from rcpacct where tran_id = ?"; sql = "select max(LINE_NO) from rcpacct where tran_id = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);//issue pstmt.setString(1,tranId);//issue
...@@ -721,6 +727,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -721,6 +727,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
if(cnt1 == 0) if(cnt1 == 0)
{ {
...@@ -794,10 +802,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -794,10 +802,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
rs.close();
rs = null;
pstmt.close();
pstmt = null;
sql = "select max(LINE_NO) from rcpacct where tran_id = ?"; sql = "select max(LINE_NO) from rcpacct where tran_id = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -812,6 +817,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -812,6 +817,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
if(cnt == 0) if(cnt == 0)
{ {
sql = "Insert into rcpacct (TRAN_ID,LINE_NO,ACCT_CODE,CCTR_CODE,EXCH_RATE,AMOUNT,EMP_CODE,ANAL_CODE,EFFECT_PARTY,SUNDRY_TYPE,SUNDRY_CODE) values (?,?,?,?,?,?,?,?,?,?,?)"; sql = "Insert into rcpacct (TRAN_ID,LINE_NO,ACCT_CODE,CCTR_CODE,EXCH_RATE,AMOUNT,EMP_CODE,ANAL_CODE,EFFECT_PARTY,SUNDRY_TYPE,SUNDRY_CODE) values (?,?,?,?,?,?,?,?,?,?,?)";
...@@ -864,6 +871,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -864,6 +871,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
acct = acctFin==null?"":acctFin; acct = acctFin==null?"":acctFin;
cctr = cctrFin; cctr = cctrFin;
exch = (Double)RcpHdrMap.get("exch_rate"); exch = (Double)RcpHdrMap.get("exch_rate");
sql = "select max(LINE_NO) from rcpacct where tran_id = ?"; sql = "select max(LINE_NO) from rcpacct where tran_id = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -879,7 +888,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -879,7 +888,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt = null; pstmt = null;
sql = "Insert into rcpacct (TRAN_ID,LINE_NO,ACCT_CODE,CCTR_CODE,EXCH_RATE,AMOUNT,EMP_CODE,ANAL_CODE,EFFECT_PARTY,SUNDRY_TYPE,SUNDRY_CODE) values (?,?,?,?,?,?,?,?,?,?,?)"; sql = "Insert into rcpacct (TRAN_ID,LINE_NO,ACCT_CODE,CCTR_CODE,EXCH_RATE,AMOUNT,EMP_CODE,ANAL_CODE,EFFECT_PARTY,SUNDRY_TYPE,SUNDRY_CODE) values (?,?,?,?,?,?,?,?,?,?,?)";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);//issue pstmt.setString(1,tranId);//issue
...@@ -978,9 +988,9 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -978,9 +988,9 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
if(cnt == 0) if(cnt == 0)
{ {
sql = "Insert into rcpacct (TRAN_ID,LINE_NO,ACCT_CODE,CCTR_CODE,EXCH_RATE,AMOUNT,EMP_CODE,ANAL_CODE,EFFECT_PARTY,SUNDRY_TYPE,SUNDRY_CODE) values (?,?,?,?,?,?,?,?,?,?,?)"; sql = "Insert into rcpacct (TRAN_ID,LINE_NO,ACCT_CODE,CCTR_CODE,EXCH_RATE,AMOUNT,EMP_CODE,ANAL_CODE,EFFECT_PARTY,SUNDRY_TYPE,SUNDRY_CODE) values (?,?,?,?,?,?,?,?,?,?,?)";
...@@ -1062,6 +1072,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1062,6 +1072,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
sql = "select max(LINE_NO) from rcpacct where tran_id = ?"; sql = "select max(LINE_NO) from rcpacct where tran_id = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);//issue pstmt.setString(1,tranId);//issue
...@@ -1075,6 +1086,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1075,6 +1086,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
if(cnt == 0) if(cnt == 0)
{ {
...@@ -1404,9 +1417,9 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1404,9 +1417,9 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
totBc = totBc + (Double)RcpHdrMap.get("net_amt__bc"); totBc = totBc + (Double)RcpHdrMap.get("net_amt__bc");
System.out.println("net_amt AND net_amt__bc 1"+total+""+totBc); System.out.println("net_amt AND net_amt__bc 1"+total+""+totBc);
System.out.println("DDDDDDDDDDDDDDDDDDd"+total); System.out.println("DDDDDDDDDDDDDDDDDDd"+total);
if(bdFluctuationCf.equalsIgnoreCase("N")) if(bdFluctuationCf.equalsIgnoreCase("N"))
{ {
totBc = totBc +totbdDiff; totBc = totBc +totbdDiff;
...@@ -1414,7 +1427,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1414,7 +1427,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
} }
// if EPC is adjusted in diff currency then update the net amount bc. // if EPC is adjusted in diff currency then update the net amount bc.
if(isEpcCurrSame == true) if(isEpcCurrSame == true)
{ {
System.out.println("total totEpc totEpcBc"+total+""+totEpc+""+totEpcBc); System.out.println("total totEpc totEpcBc"+total+""+totEpc+""+totEpcBc);
...@@ -1443,7 +1456,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1443,7 +1456,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt = null; pstmt = null;
chq = (Double)RcpHdrMap.get("chq_amt")- (Double)RcpHdrMap.get("bill_disc_amt")+(Double)RcpHdrMap.get("oth_amt"); chq = (Double)RcpHdrMap.get("chq_amt")- (Double)RcpHdrMap.get("bill_disc_amt")+(Double)RcpHdrMap.get("oth_amt");
// if EPC adjusted in same currency then // if EPC adjusted in same currency then
if(isEpcCurrSame == true) if(isEpcCurrSame == true)
{ {
...@@ -1452,7 +1465,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1452,7 +1465,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
} }
System.out.println("chq and total "+chq+""+total); System.out.println("chq and total "+chq+""+total);
if(chq != total) if(chq != total)
{ {
...@@ -1462,9 +1475,9 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1462,9 +1475,9 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
RcpHdrMap.put("net_amt", total); RcpHdrMap.put("net_amt", total);
RcpHdrMap.put("net_amt__bc", totBc); RcpHdrMap.put("net_amt__bc", totBc);
System.out.println("net_amt AND net_amt__bc 1"+total+""+totBc); System.out.println("net_amt AND net_amt__bc 1"+total+""+totBc);
if(errString == null || errString.trim().length() == 0) if(errString == null || errString.trim().length() == 0)
{ {
errString = gbfPostReceipt(tranId,xtraParams, RcpHdrMap, DetList,RcpDetList,ADetList,EpcAdjList, conn); errString = gbfPostReceipt(tranId,xtraParams, RcpHdrMap, DetList,RcpDetList,ADetList,EpcAdjList, conn);
...@@ -1473,8 +1486,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1473,8 +1486,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
{ {
//conn.rollback(); //conn.rollback();
} }
sql = "update receipt set net_amt = ?, net_amt__bc = ? where tran_id = ?"; sql = "update receipt set net_amt = ?, net_amt__bc = ? where tran_id = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -1485,11 +1498,11 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1485,11 +1498,11 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -1552,7 +1565,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1552,7 +1565,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
DetMap.put("party_doc_ref", rs.getString("party_doc_ref")); DetMap.put("party_doc_ref", rs.getString("party_doc_ref"));
DetList.add(DetMap); DetList.add(DetMap);
} }
System.out.println(" receipt Acct Map 1445.........."); System.out.println(" receipt Acct Map 1445..........");
System.out.println(DetList.toString()); System.out.println(DetList.toString());
...@@ -1661,15 +1674,15 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1661,15 +1674,15 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
confDrcrOpt = finCommon.getFinparams("999999", "COMM_DRCR_CONF", conn); confDrcrOpt = finCommon.getFinparams("999999", "COMM_DRCR_CONF", conn);
confJvOpt = finCommon.getFinparams("999999", "COMM_JV_CONF", conn); confJvOpt = finCommon.getFinparams("999999", "COMM_JV_CONF", conn);
//for Commission Calculate //for Commission Calculate
/*CalculateCommission calCommission = new CalculateCommission(); /*CalculateCommission calCommission = new CalculateCommission();
errString = calCommission.CalCommission("","R", tranId, confDrcrOpt, confJvOpt,xtraParams, conn); errString = calCommission.CalCommission("","R", tranId, confDrcrOpt, confJvOpt,xtraParams, conn);
return errString;*/ return errString;*/
} }
} }
catch(Exception e) catch(Exception e)
...@@ -1744,6 +1757,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1744,6 +1757,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
double totAmt = 0.0; double totAmt = 0.0;
double ediOption = 0.0; double ediOption = 0.0;
double netAmountBc = 0.0; double netAmountBc = 0.0;
double taxAmt = 0.0;
Date effDate = null; Date effDate = null;
Date tranDate = null; Date tranDate = null;
Date refDate = null; Date refDate = null;
...@@ -1776,7 +1790,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1776,7 +1790,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
tranType = (String)RcpHdrMap.get("tran_type"); tranType = (String)RcpHdrMap.get("tran_type");
if(tranType.equalsIgnoreCase("J")) if(tranType.equalsIgnoreCase("J"))
{ {
if((Double)RcpHdrMap.get("adv_amt") != 0 && (Double)RcpHdrMap.get("chq_amt") != 0) if((Double)RcpHdrMap.get("adv_amt") != 0 && (Double)RcpHdrMap.get("chq_amt") != 0)
{ {
errString = itmDBAccessEJB.getErrorString("","VTRCPJVAMT","","",conn); errString = itmDBAccessEJB.getErrorString("","VTRCPJVAMT","","",conn);
...@@ -1881,6 +1895,28 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1881,6 +1895,28 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
acctCodeCf = (String)RcpHdrMap.get("acct_code__cf"); acctCodeCf = (String)RcpHdrMap.get("acct_code__cf");
rcpMode = (String)RcpHdrMap.get("rcp_mode"); rcpMode = (String)RcpHdrMap.get("rcp_mode");
//added by akhilesh on 31/july/13 for tax provision
sql =" select case when sum(tax_amt) is null then 0 else sum(tax_amt) end as taxAmt "
+" from taxtran where tran_code= ? and "
+" tran_id = ? and tax_amt <> 0 and effect <> 'N' ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,"RCP");
pstmt.setString(2,tranId);
rs = pstmt.executeQuery();
while(rs.next())
{
taxAmt = taxAmt+ rs.getDouble("taxAmt");
}
System.out.println("netAmountBc+taxAmt amount --------->"+netAmountBc);
//ended by akhilesh on 31/july/13 for tax provision
for (int ctr =0; ctr < RcpDetList.size(); ctr++) for (int ctr =0; ctr < RcpDetList.size(); ctr++)
{ {
detListMap = new HashMap(); detListMap = new HashMap();
...@@ -1897,7 +1933,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1897,7 +1933,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
glTraceMap.put("eff_date",new Timestamp(effDate.getTime())); glTraceMap.put("eff_date",new Timestamp(effDate.getTime()));
glTraceMap.put("fin_entity", finEntity); glTraceMap.put("fin_entity", finEntity);
glTraceMap.put("site_code", siteCode); glTraceMap.put("site_code", siteCode);
glTraceMap.put("sundry_type", "B"); glTraceMap.put("sundry_type", "C");//OPEN WITH B
glTraceMap.put("sundry_code", bankCode); glTraceMap.put("sundry_code", bankCode);
glTraceMap.put("acct_code", acctCodeBal); glTraceMap.put("acct_code", acctCodeBal);
glTraceMap.put("cctr_code", cctrCodeBal); glTraceMap.put("cctr_code", cctrCodeBal);
...@@ -1908,7 +1944,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1908,7 +1944,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
System.out.println("AMOUTTTTTTTTTTTTTTT"+(Double)RcpHdrMap.get("net_amt")+""+netAmountBc); System.out.println("AMOUTTTTTTTTTTTTTTT"+(Double)RcpHdrMap.get("net_amt")+""+netAmountBc);
if(isInBaseCurr == true) if(isInBaseCurr == true)
{ {
netAmountBc = netAmountBc+taxAmt;//added by akhilesh on 31/july/13 for tax provision
System.out.println("IN TRUE!!!!!!!!!!!!!!!!!"); System.out.println("IN TRUE!!!!!!!!!!!!!!!!!");
glTraceMap.put("curr_code", basecurrCode); glTraceMap.put("curr_code", basecurrCode);
...@@ -1926,6 +1962,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1926,6 +1962,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
} }
else else
{ {
netAmt = netAmt+taxAmt;//added by akhilesh on 31/july/13 for tax provision
System.out.println("IN FALSE!!!!!!!!!!!!!!!!!"); System.out.println("IN FALSE!!!!!!!!!!!!!!!!!");
glTraceMap.put("curr_code", currCode); glTraceMap.put("curr_code", currCode);
...@@ -2187,7 +2225,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2187,7 +2225,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
receivablesMap.put("cust_ref_no",""); receivablesMap.put("cust_ref_no","");
receivablesMap.put("cust_ref_date",""); receivablesMap.put("cust_ref_date","");
receivablesMap.put("cust_ref_amt",""); receivablesMap.put("cust_ref_amt","");
System.out.println("In 1997 receivablesMap !!!!!!!!!!!!!!!!!!!!!!!!!!"); System.out.println("In 1997 receivablesMap !!!!!!!!!!!!!!!!!!!!!!!!!!");
errString = finCommon.gbfReceivablesUpd(receivablesMap,conn); errString = finCommon.gbfReceivablesUpd(receivablesMap,conn);
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
...@@ -2500,7 +2538,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2500,7 +2538,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ {
System.out.println("ERROR IN GLTRACE ..........."); System.out.println("ERROR IN GLTRACE ...........");
return errString; return errString;
} }
...@@ -2511,8 +2549,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2511,8 +2549,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
if((String)glTraceMap.get("sundry_type") != null && !((String)glTraceMap.get("sundry_type")).trim().equalsIgnoreCase("O")) if((String)glTraceMap.get("sundry_type") != null && !((String)glTraceMap.get("sundry_type")).trim().equalsIgnoreCase("O"))
{ {
System.out.println("COMES INTO CONDITION ..........."); System.out.println("COMES INTO CONDITION ...........");
sundryBalMap = new HashMap(); sundryBalMap = new HashMap();
sundryBalMap.put("tran_date",new Timestamp(tranDate.getTime())); sundryBalMap.put("tran_date",new Timestamp(tranDate.getTime()));
sundryBalMap.put("eff_date",new Timestamp(effDate.getTime())); sundryBalMap.put("eff_date",new Timestamp(effDate.getTime()));
...@@ -2544,10 +2582,12 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2544,10 +2582,12 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ {
System.out.println("error is sundryBaleUpdate ..........."+errString); System.out.println("error is sundryBaleUpdate ..........."+errString);
return errString; return errString;
} }
} }
System.out.println("last ..........."); System.out.println("last ...........");
} }
...@@ -2813,6 +2853,135 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2813,6 +2853,135 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
//added by akhilesh on 31/july/13 for tax provision
errString = taxPost(tranId,xtraParams,RcpHdrMap, conn);
if(errString != null && errString.trim().length() > 0)
{
System.out.println("error is taxPost ..........."+errString);
return errString;
}
}
catch(Exception e)
{
System.out.println(e.getMessage());
System.out.println(e.getMessage());
System.out.println("Exception : "+e);
e.printStackTrace();
throw new ITMException(e);
}
return errString;
}
//added by akhilesh on 31/july/13 for tax provision
private String taxPost(String tranId,String xtraParams,HashMap RcpHdrMap,Connection conn)throws RemoteException,ITMException
{
System.out.println("taxPost called.............."+RcpHdrMap);
String errString = "";
String acctCode = "";
String cctrCode = "";
String projectCode = "";
String analCode = "";
String empCode = "";
String loginEmpCode = "";
String drcrFlag = "";
String anal1 = "";
String anal2 = "";
String anal3 = "";
double amount = 0.0;
Date effDate = null;
Date tranDate = null;
HashMap glTraceMap = null;
PreparedStatement pstmt = null;
ResultSet rs = null;
FinCommon finCommon = null;
DistCommon distCommon = null;
ITMDBAccessEJB itmDBAccessEJB = null;
ValidatorEJB validatorEJB = new ValidatorEJB();
GenericUtility genericUtility = new GenericUtility();
try
{
finCommon = new FinCommon();
distCommon = new DistCommon();
itmDBAccessEJB = new ITMDBAccessEJB();
loginEmpCode = validatorEJB.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
tranDate = (Date)RcpHdrMap.get("tran_date");
effDate = (Date)RcpHdrMap.get("eff_date");
//drcrFlag = (String)RcpHdrMap.get("drcr_flag");
//acctCode=(String) RcpHdrMap.get("acct_code__ar");
//cctrCode=(String) RcpHdrMap.get("cctr_code__ar");
pstmt=conn.prepareStatement("select * from taxtran where tran_id=? and tran_code='RCP' and tax_amt<>0");
pstmt.setString(1,tranId);
rs=pstmt.executeQuery();
while(rs.next())
{
glTraceMap = new HashMap();
acctCode = rs.getString("acct_code");
cctrCode = rs.getString("cctr_code");
System.out.println("cctrCode:" +cctrCode + ":");
amount = rs.getDouble("tax_amt");
glTraceMap.put("tran_date",new Timestamp(tranDate.getTime()));
glTraceMap.put("eff_date",new Timestamp(effDate.getTime()));
glTraceMap.put("fin_entity",(RcpHdrMap.get("fin_entity")));
glTraceMap.put("site_code",(RcpHdrMap.get("site_code")));
glTraceMap.put("sundry_type","O");
glTraceMap.put("sundry_code"," ");
glTraceMap.put("acct_code",acctCode);
glTraceMap.put("cctr_code",cctrCode==null?"":cctrCode);
glTraceMap.put("emp_code",empCode);
glTraceMap.put("anal_code",analCode);
glTraceMap.put("curr_code",(RcpHdrMap.get("curr_code")));
glTraceMap.put("exch_rate",(RcpHdrMap.get("exch_rate")));
/*if("D".equalsIgnoreCase(drcrFlag))
{*/
if(amount > 0)
{
glTraceMap.put("dr_amt",0);
glTraceMap.put("cr_amt", Math.abs(amount));
}
else
{
glTraceMap.put("dr_amt", Math.abs(amount));
glTraceMap.put("cr_amt",0);
}
// }
glTraceMap.put("ref_type","F");
glTraceMap.put("ref_id",tranId);
glTraceMap.put("ref_ser","RCP");
glTraceMap.put("remarks",(RcpHdrMap.get("remarks")));
glTraceMap.put("analysis1",anal1);
glTraceMap.put("analysis2",anal2);
glTraceMap.put("analysis3",anal3);
System.out.println("glTraceUpdate before update "+glTraceMap);
errString = finCommon.glTraceUpdate(glTraceMap,conn);
System.out.println("glTraceUpdate errString "+errString);
if(errString != null && errString.trim().length() > 0)
{
System.out.println("error is taxPost ..........."+errString);
return errString;
}
}
rs.close();
rs=null;
pstmt.close();
pstmt=null;
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -2822,6 +2991,27 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2822,6 +2991,27 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
e.printStackTrace(); e.printStackTrace();
throw new ITMException(e); throw new ITMException(e);
} }
finally
{
try
{
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
}
catch(Exception e)
{
System.out.println("Exception : "+e);e.printStackTrace();
throw new ITMException(e);
}
}
return errString; 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