Skip to content

B
business-java
Commit 0930f84a authored by msharma's avatar msharma
Browse files
Options

Remove accounting effect from bank if EFF_bank='N' in rcpacct 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94196 ce508802-f39f-4f6c-b175-0d175dae99d5
parent e80856f9
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 11 deletions
webitm-fin/ibase/webitm/ejb/fin/adv/ReceiptAdvConf.java
View file @ 0930f84a
......@@ -356,6 +356,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
double detAmount = 0;
HashMap detMap = null;
int detListSize = 0;
double amtNoBankEffect=0;
try
{
finCommon = new FinCommon();
......@@ -551,7 +552,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
// populate rcpacct
// 29/01/14 manoharan effect_party considered
sql = "select sundry_type,sundry_code,acct_code,cctr_code,emp_code, anal_code,curr_code ,exch_rate,amount,party_doc_ref,case when effect_party is null then 'N' else effect_party end as effect_party from rcpacct where tran_id = ?";
sql = "select sundry_type,sundry_code,acct_code,cctr_code,emp_code, anal_code,curr_code ,exch_rate,amount,party_doc_ref,case when effect_party is null then 'N' else effect_party end as effect_party,case when eff_bank is null then 'N' else eff_bank end as eff_bank from rcpacct where tran_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
rs = pstmt.executeQuery();
......@@ -569,6 +570,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
DetMap.put("amount", rs.getDouble("amount"));
DetMap.put("party_doc_ref", rs.getString("party_doc_ref"));
DetMap.put("effect_party", rs.getString("effect_party")); // 29/01/14 manoharan
DetMap.put("eff_bank", rs.getString("eff_bank")); // 03/02/14 Manoj
DetList.add(DetMap);
//System.out.println(" receipt Acct Map..........");
System.out.println("DetList initial [" + DetList.toString() + "]");
......@@ -778,6 +780,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
partyDocRef = finCommon.gfGetPartyDocRef((String)RcpDetMap.get("ref_ser"), (String)RcpDetMap.get("ref_no"),conn);
detMap.put("party_doc_ref", partyDocRef);
detMap.put("effect_party", "Y"); // 29/01/14 manoharan
detMap.put("eff_bank", "Y"); // 03/02/14 Manoj
DetList.add(detMap);
}
......@@ -883,6 +886,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
detMap.put("amount", rcpAmt);
detMap.put("party_doc_ref", "");
detMap.put("effect_party", "N"); // 29/01/14 manoharan
detMap.put("eff_bank", "Y"); // 03/02/14 Manoj
DetList.add(detMap);
}
}
......@@ -1022,6 +1026,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
detMap.put("amount", amount);
detMap.put("party_doc_ref", "");
detMap.put("effect_party", "Y"); // 29/01/14 manoharan
detMap.put("eff_bank", "Y"); // 03/02/14 Manoj
DetList.add(detMap);
}
......@@ -1135,6 +1140,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
detMap.put("amount", tFin);
detMap.put("party_doc_ref", "");
detMap.put("effect_party", "N"); // 29/01/14 manoharan
detMap.put("eff_bank", "Y"); // 03/02/14 Manoj
DetList.add(detMap);
......@@ -1166,6 +1172,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
detMap.put("amount", tFin);
detMap.put("party_doc_ref", "");
detMap.put("effect_party", "Y"); // 29/01/14 manoharan
detMap.put("eff_bank", "Y"); // 03/02/14 Manoj
DetList.add(detMap);
......@@ -1197,6 +1204,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
detMap.put("amount", -1 * tFin);
detMap.put("party_doc_ref", "");
detMap.put("effect_party", "Y"); // 29/01/14 manoharan
detMap.put("eff_bank", "Y"); // 03/02/14 Manoj
DetList.add(detMap);
......@@ -1233,6 +1241,19 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
else
{
detMap = new HashMap();
sql="select sum(amount*exch_rate/?) from rcpacct where tran_id=? and eff_bank='N'";
pstmt=conn.prepareStatement(sql);
pstmt.setDouble(1, exch);
pstmt.setString(2, tranId);
rs=pstmt.executeQuery();
if(rs.next())
{
amtNoBankEffect=rs.getDouble(1);
}
rs.close();
rs=null;
pstmt.close();
pstmt=null;
detMap.put("sundry_type", "C");
detMap.put("sundry_code", (String) RcpHdrMap.get("cust_code"));
......@@ -1242,11 +1263,14 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
detMap.put("anal_code", "");
//detMap.put("curr_code", rs.getString("curr_code"));
detMap.put("exch_rate", exch);
detMap.put("amount", advAmt);
detMap.put("amount", (advAmt-amtNoBankEffect));//Changed by Manoj dtd 03/02/14
detMap.put("party_doc_ref", "");
detMap.put("effect_party", "Y"); // 29/01/14 manoharan
detMap.put("eff_bank", "Y"); // 03/02/14 Manoj
DetList.add(detMap);
}
System.out.println("1273---DetList.toString()----"+DetList.toString());
/*sql = "select count(*) from rcpacct where acct_code = ? and cctr_code = ? and exch_rate = ? and tran_id = ?";
pstmt = conn.prepareStatement(sql);
......@@ -1372,6 +1396,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
detMap.put("amount", amount);
detMap.put("party_doc_ref", "");
detMap.put("effect_party", "N"); // 29/01/14 manoharan
detMap.put("eff_bank", "Y"); // 03/02/14 Manoj
DetList.add(detMap);
}
......@@ -1502,6 +1528,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
detMap.put("amount", diffAmtExch);
detMap.put("party_doc_ref", "");
detMap.put("effect_party", "N"); // 29/01/14 manoharan
detMap.put("eff_bank", "Y"); // 03/02/14 Manoj
DetList.add(detMap);
}
}
......@@ -1650,6 +1677,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
detMap.put("amount", (amtRev * -1));
detMap.put("party_doc_ref", "");
detMap.put("effect_party", "N"); // 29/01/14 manoharan
detMap.put("eff_bank", "Y"); // 03/02/14 Manoj
DetList.add(detMap);
}
......@@ -1734,6 +1762,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
detMap.put("amount", amtRev );
detMap.put("party_doc_ref", "");
detMap.put("effect_party", "N"); // 29/01/14 manoharan
detMap.put("eff_bank", "Y"); // 03/02/14 Manoj
DetList.add(detMap);
}
......@@ -1970,7 +1999,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
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,amtNoBankEffect, conn);
}
else
{
......@@ -2033,7 +2062,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
}
private String gbfPostReceipt(String tranId,String xtraParams,HashMap RcpHdrMap,ArrayList DDetList, ArrayList RcpDetList,ArrayList ADetList,ArrayList EpcAdjList, Connection conn)throws RemoteException,ITMException
private String gbfPostReceipt(String tranId,String xtraParams,HashMap RcpHdrMap,ArrayList DDetList, ArrayList RcpDetList,ArrayList ADetList,ArrayList EpcAdjList,double amtNoBankEffect, Connection conn)throws RemoteException,ITMException
{
System.out.println("gbfPostReceipt Called..........");
String errString = "";
......@@ -2095,7 +2124,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
*/
// header posting
errString = gbfPostRcphdr(tranId, xtraParams,RcpHdrMap, DDetList,conn);
errString = gbfPostRcphdr(tranId, xtraParams,RcpHdrMap, DDetList,amtNoBankEffect,conn);
System.out.println("ERROR......................"+errString);
if(errString != null && errString.trim().length() > 0)
{
......@@ -2218,7 +2247,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
return errString;
}
private String gbfPostRcphdr(String tranId,String xtraParams,HashMap RcpHdrMap,ArrayList RcpDetList, Connection conn)throws RemoteException,ITMException
private String gbfPostRcphdr(String tranId,String xtraParams,HashMap RcpHdrMap,ArrayList RcpDetList,double amtNoBankEffect,Connection conn)throws RemoteException,ITMException
{
System.out.println("gbfPostRcphdr called........");
String errString = "";
......@@ -2295,6 +2324,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
ValidatorEJB validatorEJB = new ValidatorEJB();
GenericUtility genericUtility = new GenericUtility();
ITMDBAccessEJB itmDBAccessEJB = null;
try
{
finCommon =new FinCommon();
......@@ -2436,8 +2466,11 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
{
taxAmt = taxAmt+ rs.getDouble("taxAmt");
}
rs.close();
rs=null;
pstmt.close();
pstmt=null;
System.out.println("netAmountBc+taxAmt amount --------->"+netAmountBc);
......@@ -2734,7 +2767,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
receivablesMap.put("eff_date", new Timestamp(effDate.getTime()));
receivablesMap.put("tax_amt", 0);
receivablesMap.put("discount", 0);
receivablesMap.put("tot_amt", -1 * ((double) Double.parseDouble( "" + RcpHdrMap.get("adv_amt"))));
receivablesMap.put("tot_amt", -1 * ((double) Double.parseDouble( "" + RcpHdrMap.get("adv_amt"))-amtNoBankEffect));//Manoj dtd 04/02/2013 to reduce rcpacctamt of eff_bank='N' from receivables
receivablesMap.put("auto_rcp", "N");
receivablesMap.put("bank_code","");
receivablesMap.put("ref_type", "F");
......@@ -2994,6 +3027,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
ITMDBAccessEJB itmDBAccessEJB = null;
ValidatorEJB validatorEJB = new ValidatorEJB();
GenericUtility genericUtility = new GenericUtility();
double nobankEffectAmt=0;
double exchRateHdr=0;
try
{
finCommon = new FinCommon();
......@@ -3013,7 +3048,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
System.out.println("DetList SIZE ["+DetList.size() + "] DetList [" +DetList + "]");
for (int ctr =0; ctr < DetList.size(); ctr++)
{
......@@ -3033,7 +3068,11 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
currCode = (String)detListMap.get("curr_code");
exchRate = (Double)detListMap.get("exch_rate");
partyDocRef = (String)detListMap.get("party_doc_ref");*/
/*String sType=(String)DetMap.get("sundry_type")==null?"O":(String)DetMap.get("sundry_type");
if(sType != null && !("O".equalsIgnoreCase(sType)))
{
amount=amount-nobankEffectAmt;
}*/
sundryType = (String)DetMap.get("sundry_type")==null?"O":(String)DetMap.get("sundry_type");
sundryCode = (String)DetMap.get("sundry_code")== null?"":(String)DetMap.get("sundry_code");
glTraceMap = new HashMap();
......
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