Skip to content

B
business-java
Commit 355fd605 authored by msalla's avatar msalla
Browse files
Options

Issue : In receivables JV if advance amount taken more than receipt amount... 

Issue : In receivables JV if advance amount taken more than receipt amount then system allow to do the same .we have checked Gltrace found Bank to credit of remaining amount .Automatically system credited to bank .


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@216587 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 2cd9cf25
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 43 deletions
webitm-fin/src/ibase/webitm/ejb/fin/adv/ReceiptAdvConf.java
View file @ 355fd605
...@@ -893,7 +893,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -893,7 +893,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
{ {
findIndex = -1; findIndex = -1;
} }
System.out.println("findIndex>>>>>>>>>>>>>>>>>>>>>>>>>>>>773"+findIndex); System.out.println("findIndex>>>>>>>>>>>>>>>>>>>>>>>>>>>>773"+findIndex);
if (findIndex > -1) if (findIndex > -1)
{ {
detMap = (HashMap) DetList.get(findIndex); detMap = (HashMap) DetList.get(findIndex);
...@@ -901,7 +901,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -901,7 +901,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
detAmount = (double) Double.parseDouble( "" + RcpDetMap.get("rcp_amt")); detAmount = (double) Double.parseDouble( "" + RcpDetMap.get("rcp_amt"));
detMap.put("amount", amountMap + detAmount ); detMap.put("amount", amountMap + detAmount );
DetList.set(findIndex, detMap); DetList.set(findIndex, detMap);
System.out.println("amount>>>>>>>>>>>>>>>>>>>>>>>>>>>>781"+(amountMap + detAmount)); System.out.println("amount>>>>>>>>>>>>>>>>>>>>>>>>>>>>781"+(amountMap + detAmount));
} }
else else
...@@ -1222,7 +1222,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1222,7 +1222,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt = null; pstmt = null;
}*/ }*/
} }
System.out.println("DetList****************************1102*******************"+DetList.toString()); System.out.println("DetList****************************1102*******************"+DetList.toString());
// insert data for finchg // insert data for finchg
//take but det and insert //take but det and insert
...@@ -1370,7 +1370,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1370,7 +1370,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
if(rcpClubPost.equals("Y")) if(rcpClubPost.equals("Y"))
{ {
findIndex = findExistingIndex(DetList, acct, cctr, exch); findIndex = findExistingIndex(DetList, acct, cctr, exch);
System.out.println("FINDINDEX>>>>>>>1243>>>>>"+findIndex); System.out.println("FINDINDEX>>>>>>>1243>>>>>"+findIndex);
} }
else else
{ {
...@@ -1399,7 +1399,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1399,7 +1399,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
} }
else else
{ {
System.out.println("Into Else part of findIndex > -1>>>>"); System.out.println("Into Else part of findIndex > -1>>>>");
detMap = new HashMap(); detMap = new HashMap();
/*sql="select sum(amount*exch_rate/?) from rcpacct where tran_id=? and eff_bank='N'"; /*sql="select sum(amount*exch_rate/?) from rcpacct where tran_id=? and eff_bank='N'";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
...@@ -1429,7 +1429,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1429,7 +1429,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
detMap.put("eff_bank", "Y"); // 03/02/14 Manoj detMap.put("eff_bank", "Y"); // 03/02/14 Manoj
DetList.add(detMap); DetList.add(detMap);
} }
System.out.println("1273---DetList.toString()----"+DetList.toString()); 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 = ?"; /*sql = "select count(*) from rcpacct where acct_code = ? and cctr_code = ? and exch_rate = ? and tran_id = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,acct); pstmt.setString(1,acct);
...@@ -1527,7 +1527,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -1527,7 +1527,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
totEpcBc = totEpcBc + (hexchRate * amount); totEpcBc = totEpcBc + (hexchRate * amount);
} }
//added to by monika //added to by monika
System.out.println("epccurrsame value:::"+isEpcCurrSame); System.out.println("epccurrsame value:::"+isEpcCurrSame);
if(rcpClubPost.equals("Y")) if(rcpClubPost.equals("Y"))
{ {
...@@ -2104,7 +2104,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2104,7 +2104,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
//System.out.println("bill discount amount and ["+billDiscountAmt+"] total::>>["+total+"]"); //System.out.println("bill discount amount and ["+billDiscountAmt+"] total::>>["+total+"]");
//to check validation for chq_amt and net_amt is 0 or not in receivables--8 nov 2019--by monika //to check validation for chq_amt and net_amt is 0 or not in receivables--8 nov 2019--by monika
//System.out.println("manohar 04-dec-2019 net_amt ["+total+"] net_amt__bc ["+totBc + "]"); //System.out.println("manohar 04-dec-2019 net_amt ["+total+"] net_amt__bc ["+totBc + "]");
if ((double) Double.parseDouble( "" + RcpHdrMap.get("net_amt")) != 0 && (double) Double.parseDouble( "" + RcpHdrMap.get("chq_amt")) != 0) if ((double) Double.parseDouble( "" + RcpHdrMap.get("net_amt")) != 0 && (double) Double.parseDouble( "" + RcpHdrMap.get("chq_amt")) != 0)
...@@ -2144,8 +2144,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2144,8 +2144,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
//System.out.println("net_amt ["+total+"] net_amt__bc ["+totBc + "]"); //System.out.println("net_amt ["+total+"] net_amt__bc ["+totBc + "]");
System.out.println("manohar 04-dec-2019 size ["+ DetList.size() + "] list [" + DetList.toString() + "]"); System.out.println("manohar 04-dec-2019 size ["+ DetList.size() + "] list [" + DetList.toString() + "]");
// 14/01/14 manoharan details has to be inserted // 14/01/14 manoharan details has to be inserted
sql = "select max(line_no) from rcpacct where tran_id = ?"; sql = "select max(line_no) from rcpacct where tran_id = ?";
...@@ -2531,7 +2531,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2531,7 +2531,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
} }
if(amount > 0) if(amount > 0)
{ {
System.out.println("advbking amount=["+amount+"]"); System.out.println("advbking amount=["+amount+"]");
// sql = "update advbking set bal_amt=bal_amt - ? where tran_id=?"; // sql = "update advbking set bal_amt=bal_amt - ? where tran_id=?";
sql = "update advbking set bal_amt = (case when bal_amt is null then 0 else bal_amt end -?) where tran_id = ?"; sql = "update advbking set bal_amt = (case when bal_amt is null then 0 else bal_amt end -?) where tran_id = ?";
/*pstmt = conn.prepareStatement(sql); /*pstmt = conn.prepareStatement(sql);
...@@ -2552,7 +2552,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2552,7 +2552,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt1.close(); pstmt1.close();
pstmt1 = null; pstmt1 = null;
System.out.println("balamount in advbking=["); System.out.println("balamount in advbking=[");
} }
} }
rs.close(); rs.close();
...@@ -2646,7 +2646,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2646,7 +2646,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
} }
private String gbfPostRcphdr(String tranId,String xtraParams,HashMap RcpHdrMap,ArrayList RcpDetList,double amtNoBankEffect,Connection conn,boolean isPreview)throws RemoteException,ITMException private String gbfPostRcphdr(String tranId,String xtraParams,HashMap RcpHdrMap,ArrayList RcpDetList,double amtNoBankEffect,Connection conn,boolean isPreview)throws RemoteException,ITMException
{ {
System.out.println("gbfPostRcphdr called........"); System.out.println("gbfPostRcphdr called........");
String errString = ""; String errString = "";
String currCode = ""; String currCode = "";
String siteCode = ""; String siteCode = "";
...@@ -2736,16 +2736,23 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2736,16 +2736,23 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
errString = itmDBAccessEJB.getErrorString("","VTFINPARM","","",conn); errString = itmDBAccessEJB.getErrorString("","VTFINPARM","","",conn);
} }
// System.out.println("net_amt AND net_amt__bc 1"+RcpHdrMap.get("net_amt")+""+RcpHdrMap.get("net_amt__bc")); // System.out.println("net_amt AND net_amt__bc 1"+RcpHdrMap.get("net_amt")+""+RcpHdrMap.get("net_amt__bc"));
tranId = (String)RcpHdrMap.get("tran_id"); tranId = (String)RcpHdrMap.get("tran_id");
tranType = (String)RcpHdrMap.get("tran_type"); tranType = (String)RcpHdrMap.get("tran_type");
// if(tranType.equalsIgnoreCase("J")) //if(tranType.equalsIgnoreCase("J"))
if("J".equalsIgnoreCase(tranType)) /*System.out.println(" RECECEIVABLE jv map ---> net_amt["+RcpHdrMap);
System.out.println(" RECECEIVABLE jv ---> net_amt["+RcpHdrMap.get("net_amt")+"] chq_amount ["+RcpHdrMap.get("chq_amt")+" ] adv amount ["+RcpHdrMap.get("adv_amt")+"] tran_type ["+tranType +" ]");
*/
if("J".equalsIgnoreCase(tranType.trim()))
{ {
//System.out.println("inside tran_type["+tranType);
if((double) Double.parseDouble( "" + RcpHdrMap.get("adv_amt")) != 0 && (double) Double.parseDouble( "" + RcpHdrMap.get("chq_amt")) != 0) //if((double) Double.parseDouble( "" + RcpHdrMap.get("adv_amt")) != 0 && (double) Double.parseDouble( "" + RcpHdrMap.get("chq_amt")) != 0)//[START] commenetd by monika salla on 13 feb 2020 -condition set wrong.
//condition added to check net_amt!=0 or chq_amt!=0 or adv_amt!=0
if((double) Double.parseDouble( "" + RcpHdrMap.get("adv_amt")) != 0 || (double) Double.parseDouble( "" + RcpHdrMap.get("chq_amt")) != 0 || (double) Double.parseDouble( "" + RcpHdrMap.get("net_amt")) != 0)
{ {
// System.out.println("amount != zero["+tranType);
errString = itmDBAccessEJB.getErrorString("","VTRCPJVAMT","","",conn); errString = itmDBAccessEJB.getErrorString("","VTRCPJVAMT","","",conn);
return errString;//added by monika 13 feb 2020 to return error//end
} }
} }
...@@ -2842,7 +2849,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2842,7 +2849,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
currCode = (String)RcpHdrMap.get("curr_code"); currCode = (String)RcpHdrMap.get("curr_code");
exchRate = (double) Double.parseDouble( "" + RcpHdrMap.get("exch_rate")); exchRate = (double) Double.parseDouble( "" + RcpHdrMap.get("exch_rate"));
// System.out.println("exchange_rate in diff hdr"+exchRate); // System.out.println("exchange_rate in diff hdr"+exchRate);
projCode = (String)RcpHdrMap.get("proj_code"); projCode = (String)RcpHdrMap.get("proj_code");
projCode = (String)RcpHdrMap.get("proj_code"); projCode = (String)RcpHdrMap.get("proj_code");
refNO = (String)RcpHdrMap.get("ref_no"); refNO = (String)RcpHdrMap.get("ref_no");
...@@ -2873,7 +2880,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2873,7 +2880,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.close(); pstmt.close();
pstmt=null; pstmt=null;
// System.out.println("netAmountBc+taxAmt amount --------->"+netAmountBc); // System.out.println("netAmountBc+taxAmt amount --------->"+netAmountBc);
//ended by akhilesh on 31/july/13 for tax provision //ended by akhilesh on 31/july/13 for tax provision
...@@ -2902,15 +2909,15 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2902,15 +2909,15 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
glTraceMap.put("anal_code", ""); glTraceMap.put("anal_code", "");
// 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 //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);
glTraceMap.put("exch_rate", 1.0); glTraceMap.put("exch_rate", 1.0);
// System.out.println("NET AMOUNT BC..["+RcpHdrMap.get("net_amt__bc")); // System.out.println("NET AMOUNT BC..["+RcpHdrMap.get("net_amt__bc"));
//if((double) Double.parseDouble( "" + RcpHdrMap.get("net_amt__bc")) < 0 ) //if((double) Double.parseDouble( "" + RcpHdrMap.get("net_amt__bc")) < 0 )
if(netAmountBc<0) if(netAmountBc<0)
{ {
...@@ -2925,7 +2932,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2925,7 +2932,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
} }
else else
{ {
// netAmt = netAmt+taxAmt;//added by akhilesh on 31/july/13 for tax provision//commented by monika 20 nov 19 // netAmt = netAmt+taxAmt;//added by akhilesh on 31/july/13 for tax provision//commented by monika 20 nov 19
//System.out.println("IN FALSE!!!!!!!!!!!!!!!!!"); //System.out.println("IN FALSE!!!!!!!!!!!!!!!!!");
glTraceMap.put("curr_code", currCode); glTraceMap.put("curr_code", currCode);
...@@ -2933,7 +2940,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2933,7 +2940,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
glTraceMap.put("exch_rate", exchRate); glTraceMap.put("exch_rate", exchRate);
//System.out.println("NET AMOUNT BC..["+RcpHdrMap.get("net_amt")); //System.out.println("NET AMOUNT BC..["+RcpHdrMap.get("net_amt"));
// if((double) Double.parseDouble( "" + RcpHdrMap.get("net_amt")) < 0 ) // if((double) Double.parseDouble( "" + RcpHdrMap.get("net_amt")) < 0 )
if(netAmt<0) if(netAmt<0)
{ {
glTraceMap.put("dr_amt", 0.0); glTraceMap.put("dr_amt", 0.0);
...@@ -2957,7 +2964,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2957,7 +2964,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
//ls_errcode = gbf_gltrace_upd(lstr_gltrace) //ls_errcode = gbf_gltrace_upd(lstr_gltrace)
//System.out.println("1766 glTraceUpdate Called........isPreview value......"+isPreview); //System.out.println("1766 glTraceUpdate Called........isPreview value......"+isPreview);
// System.out.println("the vslue for CR AMT**********************"+glTraceMap.get("cr_amt")); // System.out.println("the vslue for CR AMT**********************"+glTraceMap.get("cr_amt"));
errString = finCommon.glTraceUpdate(glTraceMap,conn,isPreview); errString = finCommon.glTraceUpdate(glTraceMap,conn,isPreview);
//System.out.println("ERROR STRING>>>>>>>>>>>>>>>>>>>>>>"+errString); //System.out.println("ERROR STRING>>>>>>>>>>>>>>>>>>>>>>"+errString);
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
...@@ -3082,7 +3089,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -3082,7 +3089,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
//bankTranLogMap.put("exch_rate", exchRate); //bankTranLogMap.put("exch_rate", exchRate);
bankTranLogMap.put("entry_batch_no",(String)RcpHdrMap.get("entry_batch_no") ); bankTranLogMap.put("entry_batch_no",(String)RcpHdrMap.get("entry_batch_no") );
//ls_errcode = gbf_banktranlog_upd(lstr_banktranlog) //ls_errcode = gbf_banktranlog_upd(lstr_banktranlog)
// System.out.println("545 bankTranLogUpdateeUpdate Called.............."); // System.out.println("545 bankTranLogUpdateeUpdate Called..............");
errString = finCommon.bankTranLogUpdate(bankTranLogMap, xtraParams, conn); errString = finCommon.bankTranLogUpdate(bankTranLogMap, xtraParams, conn);
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ {
...@@ -3126,7 +3133,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -3126,7 +3133,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
cnt1=1; cnt1=1;
}else }else
{ {
// System.out.println("inside false--- difference amount in gltrace"+ RcpHdrMap.get("diff_amt__exch")); // System.out.println("inside false--- difference amount in gltrace"+ RcpHdrMap.get("diff_amt__exch"));
glTraceMap.put("dr_amt", 0.0); glTraceMap.put("dr_amt", 0.0);
glTraceMap.put("cr_amt", -1 * (double) Double.parseDouble( "" + RcpHdrMap.get("diff_amt__exch"))); glTraceMap.put("cr_amt", -1 * (double) Double.parseDouble( "" + RcpHdrMap.get("diff_amt__exch")));
...@@ -3144,7 +3151,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -3144,7 +3151,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
glTraceMap.put("chg_term", chgTermstr); glTraceMap.put("chg_term", chgTermstr);
//ls_errcode = gbf_gltrace_upd(lstr_gltrace) //ls_errcode = gbf_gltrace_upd(lstr_gltrace)
// System.out.println("1938 glTraceUpdate Called.............."); // System.out.println("1938 glTraceUpdate Called..............");
errString = finCommon.glTraceUpdate(glTraceMap,conn,isPreview); errString = finCommon.glTraceUpdate(glTraceMap,conn,isPreview);
//errString=finCommon.gl //errString=finCommon.gl
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
...@@ -3214,7 +3221,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -3214,7 +3221,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
receivablesMap.put("cust_ref_date",null); receivablesMap.put("cust_ref_date",null);
receivablesMap.put("cust_ref_amt",""); receivablesMap.put("cust_ref_amt","");
//System.out.println("In 1997 receivablesMap [" + receivablesMap + "]"); //System.out.println("In 1997 receivablesMap [" + 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)
{ {
...@@ -3238,7 +3245,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -3238,7 +3245,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
sundryBalMap.put("adv_amt", ((double) Double.parseDouble( "" + RcpHdrMap.get("adv_amt")))); sundryBalMap.put("adv_amt", ((double) Double.parseDouble( "" + RcpHdrMap.get("adv_amt"))));
contactCode = finCommon.getContactCode(sundryType, sundryCode, conn); contactCode = finCommon.getContactCode(sundryType, sundryCode, conn);
sundryBalMap.put("contact_code",contactCode ); sundryBalMap.put("contact_code",contactCode );
//System.out.println("In 2021 sundryBalMap [" + sundryBalMap + "]"); //System.out.println("In 2021 sundryBalMap [" + sundryBalMap + "]");
errString = finCommon.gbf_sundrybal_upd(sundryBalMap,conn); errString = finCommon.gbf_sundrybal_upd(sundryBalMap,conn);
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
...@@ -3376,7 +3383,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -3376,7 +3383,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
private String gbfPostRcpdet(String tranId,String xtraParams,HashMap RcpHdrMap,ArrayList DetList, ArrayList RcpDetList ,ArrayList ADetList,ArrayList EpcAdjList,Connection conn,boolean isPreview)throws RemoteException,ITMException private String gbfPostRcpdet(String tranId,String xtraParams,HashMap RcpHdrMap,ArrayList DetList, ArrayList RcpDetList ,ArrayList ADetList,ArrayList EpcAdjList,Connection conn,boolean isPreview)throws RemoteException,ITMException
{ {
// System.out.println("gbfPostRcpdet called.............."+RcpDetList); // System.out.println("gbfPostRcpdet called.............."+RcpDetList);
String errString = ""; String errString = "";
String currCode = ""; String currCode = "";
String siteCode = ""; String siteCode = "";
...@@ -3481,11 +3488,11 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -3481,11 +3488,11 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
for (int ctr =0; ctr < DetList.size(); ctr++) for (int ctr =0; ctr < DetList.size(); ctr++)
{ {
// System.out.println("no of times "+ctr); // System.out.println("no of times "+ctr);
//DetMap = new HashMap(); //DetMap = new HashMap();
DetMap = (HashMap) DetList.get(ctr); DetMap = (HashMap) DetList.get(ctr);
// //
// System.out.println(" DetMap ctr [" + ctr + "] ["+DetMap + "]"); // System.out.println(" DetMap ctr [" + ctr + "] ["+DetMap + "]");
/* sundryType = (String)detListMap.get("sundry_type"); /* sundryType = (String)detListMap.get("sundry_type");
sundryCode = (String)detListMap.get("sundry_code"); sundryCode = (String)detListMap.get("sundry_code");
...@@ -3512,7 +3519,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -3512,7 +3519,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
glTraceMap.put("sundry_type",(String)DetMap.get("sundry_type")==null?"O":(String)DetMap.get("sundry_type")); glTraceMap.put("sundry_type",(String)DetMap.get("sundry_type")==null?"O":(String)DetMap.get("sundry_type"));
glTraceMap.put("sundry_code",(String)DetMap.get("sundry_code")== null?"":(String)DetMap.get("sundry_code")); glTraceMap.put("sundry_code",(String)DetMap.get("sundry_code")== null?"":(String)DetMap.get("sundry_code"));
glTraceMap.put("acct_code", (String)DetMap.get("acct_code")); glTraceMap.put("acct_code", (String)DetMap.get("acct_code"));
//System.out.println("818 account chek ="+acctCode+" "+sundryType+" "+sundryCode); //System.out.println("818 account chek ="+acctCode+" "+sundryType+" "+sundryCode);
glTraceMap.put("cctr_code", (String)DetMap.get("cctr_code")==null?" ":(String)DetMap.get("cctr_code")); glTraceMap.put("cctr_code", (String)DetMap.get("cctr_code")==null?" ":(String)DetMap.get("cctr_code"));
glTraceMap.put("emp_code", (String)DetMap.get("emp_code")); glTraceMap.put("emp_code", (String)DetMap.get("emp_code"));
glTraceMap.put("anal_code", (String)DetMap.get("anal_code")); glTraceMap.put("anal_code", (String)DetMap.get("anal_code"));
...@@ -3520,7 +3527,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -3520,7 +3527,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
glTraceMap.put("proj_code", projectCode); glTraceMap.put("proj_code", projectCode);
glTraceMap.put("exch_rate", (double) Double.parseDouble( "" + DetMap.get("exch_rate"))); glTraceMap.put("exch_rate", (double) Double.parseDouble( "" + DetMap.get("exch_rate")));
//System.out.println("818 exchrate ="+acctCode+" "+sundryType+" "+sundryCode+" exchrate sundry bal"+DetMap.get("exch_rate")); //System.out.println("818 exchrate ="+acctCode+" "+sundryType+" "+sundryCode+" exchrate sundry bal"+DetMap.get("exch_rate"));
amount = (double) Double.parseDouble( "" + DetMap.get("amount")); amount = (double) Double.parseDouble( "" + DetMap.get("amount"));
if(amount > 0) if(amount > 0)
...@@ -3541,7 +3548,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -3541,7 +3548,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
glTraceMap.put("chg_date", new Timestamp(tranDate.getTime())); glTraceMap.put("chg_date", new Timestamp(tranDate.getTime()));
glTraceMap.put("chg_user", loginEmpCode); glTraceMap.put("chg_user", loginEmpCode);
glTraceMap.put("chg_term", chgTermstr); glTraceMap.put("chg_term", chgTermstr);
// System.out.println("848 glTraceUpdate Called..ctr [" + ctr + "] glTraceMap [" + glTraceMap + "]"); // System.out.println("848 glTraceUpdate Called..ctr [" + ctr + "] glTraceMap [" + glTraceMap + "]");
errString = finCommon.glTraceUpdate(glTraceMap,conn,isPreview); errString = finCommon.glTraceUpdate(glTraceMap,conn,isPreview);
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ {
...@@ -3552,7 +3559,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -3552,7 +3559,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
debit = debit + ((double) Double.parseDouble( "" + glTraceMap.get("dr_amt")) * (double) Double.parseDouble( "" + glTraceMap.get("exch_rate"))); debit = debit + ((double) Double.parseDouble( "" + glTraceMap.get("dr_amt")) * (double) Double.parseDouble( "" + glTraceMap.get("exch_rate")));
credit = credit + ((double) Double.parseDouble( "" + glTraceMap.get("cr_amt")) * (double) Double.parseDouble( "" + glTraceMap.get("exch_rate"))); credit = credit + ((double) Double.parseDouble( "" + glTraceMap.get("cr_amt")) * (double) Double.parseDouble( "" + glTraceMap.get("exch_rate")));
//System.out.println("dr in receivables "+debit+" credit "+credit); //System.out.println("dr in receivables "+debit+" credit "+credit);
/// update sundrybal for customer code /// update sundrybal for customer code
if((String)glTraceMap.get("sundry_type") != null && !((String)glTraceMap.get("sundry_type")).trim().equalsIgnoreCase("O") && (! isPreview))//if is Preview is false **vishakha if((String)glTraceMap.get("sundry_type") != null && !((String)glTraceMap.get("sundry_type")).trim().equalsIgnoreCase("O") && (! isPreview))//if is Preview is false **vishakha
...@@ -3583,7 +3590,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -3583,7 +3590,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
sundryBalMap.put("dr_amt", -1 * amount); sundryBalMap.put("dr_amt", -1 * amount);
sundryBalMap.put("cr_amt", 0.0); sundryBalMap.put("cr_amt", 0.0);
} }
//System.out.println("dr in sundry "+amount); //System.out.println("dr in sundry "+amount);
sundryBalMap.put("adv_amt", 0.0); sundryBalMap.put("adv_amt", 0.0);
...@@ -3593,7 +3600,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -3593,7 +3600,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
errString = finCommon.gbf_sundrybal_upd(sundryBalMap, conn); errString = finCommon.gbf_sundrybal_upd(sundryBalMap, conn);
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;
} }
...@@ -3655,7 +3662,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -3655,7 +3662,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
double tempAmt=distCommon.getRequiredDecimal(Math.abs(totAmt - adjAmt), 3); double tempAmt=distCommon.getRequiredDecimal(Math.abs(totAmt - adjAmt), 3);
//System.out.println("@V@ TempAmt :- ["+tempAmt+"]"); //System.out.println("@V@ TempAmt :- ["+tempAmt+"]");
///System.out.println("@V@ getReqDecimal(tempAmt,2) :- ["+getReqDecimal(tempAmt,2)+"]"); ///System.out.println("@V@ getReqDecimal(tempAmt,2) :- ["+getReqDecimal(tempAmt,2)+"]");
// System.out.println("@V@ getReqDecimal(Math.abs(amount),2) :- ["+getReqDecimal(Math.abs(amount),2)+"]"); // System.out.println("@V@ getReqDecimal(Math.abs(amount),2) :- ["+getReqDecimal(Math.abs(amount),2)+"]");
// if(getReqDecimal(Math.abs(totAmt - adjAmt),2) < getReqDecimal(Math.abs(amount),2)) // if(getReqDecimal(Math.abs(totAmt - adjAmt),2) < getReqDecimal(Math.abs(amount),2))
if(getReqDecimal(tempAmt,2) < getReqDecimal(Math.abs(amount),2)) if(getReqDecimal(tempAmt,2) < getReqDecimal(Math.abs(amount),2))
{ {
...@@ -3940,7 +3947,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -3940,7 +3947,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
//added by akhilesh on 31/july/13 for tax provision //added by akhilesh on 31/july/13 for tax provision
private String taxPost(String tranId,String xtraParams,HashMap RcpHdrMap,Connection conn)throws RemoteException,ITMException private String taxPost(String tranId,String xtraParams,HashMap RcpHdrMap,Connection conn)throws RemoteException,ITMException
{ {
// System.out.println("taxPost called.............."+RcpHdrMap); // System.out.println("taxPost called.............."+RcpHdrMap);
String errString = ""; String 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