Skip to content

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

:On confirmation of receipt dishonor system is giving error of coin difference... 

:On confirmation of receipt dishonor system is giving error of coin difference error. the receipt includes packing credit adjustment and taxes in details(ponit no:535)

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@209189 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 49786aa7
Show whitespace changes
Inline Side-by-side
Showing with 1509 additions and 1391 deletions
webitm-fin/src/ibase/webitm/ejb/fin/adv/ReceiptDishonourConf.java
View file @ c8070fe9
......@@ -2,23 +2,23 @@ package ibase.webitm.ejb.fin.adv;
import java.rmi.RemoteException;
import java.sql.Connection;
import java.sql.Date;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.ejb.Stateless;
import javax.naming.InitialContext;
import org.w3c.dom.CDATASection;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import com.itextpdf.text.log.SysoCounter;
import ibase.system.config.AppConnectParm;
import ibase.system.config.ConnDriver;
import ibase.utility.CommonConstants;
import ibase.utility.E12GenericUtility;
import ibase.utility.UserInfoBean;
......@@ -26,18 +26,11 @@ import ibase.webitm.ejb.ActionHandlerEJB;
import ibase.webitm.ejb.E12CreateBatchLoadEjb;
import ibase.webitm.ejb.ITMDBAccessEJB;
import ibase.webitm.ejb.MasterStatefulLocal;
import ibase.webitm.ejb.dis.DistCommon;
import ibase.webitm.ejb.fin.FinCommon;
import ibase.webitm.ejb.fin.InvAcct;
import ibase.webitm.ejb.fin.adv.CalculateCommission;
import ibase.webitm.ejb.sys.UtilMethods;
import ibase.webitm.utility.ITMException;
import ibase.webitm.utility.TransIDGenerator;
import ibase.webitm.ejb.fin.MiscDrCrRcpConf;
import ibase.webitm.ejb.dis.DistCommon;
import org.w3c.dom.CDATASection;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import ibase.webitm.ejb.sys.CreateRCPXML;
import ibase.webitm.utility.ITMException;
@Stateless
public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDishonourConfLocal,ReceiptDishonourConfRemote
......@@ -59,7 +52,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
{
ret
}
*/ }
*/ }
catch(Exception exception)
{
System.out.println("Exception in [InvHoldConfEJB] getCurrdateAppFormat " + exception.getMessage());
......@@ -76,7 +69,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
try
{
System.out.println("Inside auto confirm");
//System.out.println("Inside auto confirm");
retString = confirm( tranID, xtraParams, forcedFlag, conn, isConn );
System.out.println("errstring auto confirm"+retString);
......@@ -84,7 +77,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
{
ret
}
*/ }
*/ }
catch(Exception exception)
{
System.out.println("Exception in [InvHoldConfEJB] getCurrdateAppFormat " + exception.getMessage());
......@@ -110,7 +103,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
conn = getConnection();
conn.setAutoCommit(false);
isLocal=true;
System.out.println("Is Local");
//System.out.println("Is Local");
}
sql =" select confirmed,site_code from rcpdishnr where tran_id = ?";
pstmt = conn.prepareStatement(sql);
......@@ -128,7 +121,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
if(confirm != null && "Y".equalsIgnoreCase(confirm) && isLocal)
{
System.out.println("The Selected transaction is already confirmed");
//System.out.println("The Selected transaction is already confirmed");
errString = itmDBAccessEJB.getErrorString("","VTMCONF1","","",conn);
return errString;
}
......@@ -197,7 +190,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
public String gbfRetrieveRcpDishnr(String tranId, String siteCode, String xtraParams, String forcedFlag,Connection conn)throws ITMException
{
double ll_ctr1=0;
double ll_ctr1=0,epcamount=0,advbkamount=0,netAmt=0;
String errorCode="", rcpNo="", tranSer="", refSer="", refNo="";
String acctCode="", cctrCode="", empCode="", analCode="", sPers="", ls_keyfld="", sundryType="", sundryCode="", effBank="",
ls_winname="", ls_ledg_post_conf="", ls_curr="", currCode="", rcpType="", acctCodeCr="", cctrCodeCr="";
......@@ -207,8 +200,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
String addAcctFrom="";
ResultSet rs=null,rs1=null;
PreparedStatement pstmt=null,pstmt1=null;
ResultSet rs=null,rs1=null,rs2=null,rs3=null,rs4=null;
PreparedStatement pstmt=null,pstmt1=null,pstmt2=null,pstmt3=null,pstmt4=null;
String sql="",errString="";
E12GenericUtility genericUtility=new E12GenericUtility();
StringBuffer xmlBuff = new StringBuffer();
......@@ -276,7 +269,35 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
rcpHnrHdr.put("site_code",checkNull(rs.getString("site_code")));
rcpHnrHdr.put("fin_entity",checkNull(rs.getString("fin_entity")));
rcpHnrHdr.put("bank_code",checkNull(rs.getString("bank_code")));
//added by monika 09 oct 2019-to check coin difference add EFUNDADJ_AMT
tranSer=rs.getString("tran_ser");
rcpNo=rs.getString("receipt_no");
netAmt=rs.getDouble("net_amt");
if("R".equalsIgnoreCase(tranSer))
{
pstmt4=conn.prepareStatement("select efundadj_amt from receipt where tran_id=?");
pstmt4.setString(1,rcpNo);
rs4=pstmt4.executeQuery();
if(rs4.next())
{
epcamount=rs4.getDouble("efundadj_amt");
}
rs4.close();
rs4=null;
pstmt4.close();
pstmt4=null;
netAmt=netAmt+epcamount;
rcpHnrHdr.put("net_amt",netAmt);
}
else
{
rcpHnrHdr.put("net_amt",rs.getDouble("net_amt"));
}
//end
rcpHnrHdr.put("bank_charges",rs.getDouble("bank_charges"));
rcpHnrHdr.put("ref_no",checkNull(rs.getString("ref_no")));
rcpHnrHdr.put("ref_date",rs.getTimestamp("ref_date"));
......@@ -293,13 +314,15 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
rcpHnrHdr.put("exch_rate__bc",rs.getDouble("exch_rate__bc"));
rcpHnrHdr.put("site_code__for",checkNull(rs.getString("site_code__for")));
rcpHnrHdr.put("confirmed","N");
//rcpHnrHdr.put("confirmed",checkNull(rs.getString("confirmed")));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
System.out.println("rcpHnrHdr Map :"+rcpHnrHdr);
//System.out.println("rcpHnrHdr Map :"+rcpHnrHdr);
//Getting detail data d_rcpdishnr_postinv
rcpHnrDetList=getDetailData(tranId, conn);
......@@ -324,13 +347,14 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
rcpHnracctList.add(rcpHnrDeta);
}
System.out.println("rcpHndetailaccount :"+rcpHnracctList);
rs.close();
rs = null;
pstmt.close();
pstmt = null;
String sqladv="SELECT rcpdishnr_adv.tran_id,ref_ser, ref_no,adj_amt,tot_amt,curr_code,exch_rate__vouch,diff_amt__exch,acct_code,cctr_code "
String sqladv="select rcpdishnr_adv.tran_id,ref_ser, ref_no,adj_amt,tot_amt,curr_code,exch_rate__vouch,diff_amt__exch,acct_code,cctr_code "
+ "FROM rcpdishnr_adv WHERE tran_id = ?";
pstmt = conn.prepareStatement(sqladv);
pstmt.setString(1,tranId);
......@@ -366,7 +390,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
tranDate = (Timestamp)rcpHnrHdr.get("tran_date");
ld_today = new java.sql.Timestamp(System.currentTimeMillis());
// ls_winname = 'W_RCPDISHNR'
// ls_winname = 'W_RCPDISHNR'
ls_winname = "W_RCPDISHNR_ADV"; //Changed by Yogesh 12/07/2005
sql="select ledg_post_conf from transetup where upper(tran_window) = ?";
......@@ -418,8 +442,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
cctrCodeCr = "";
if ("R".equalsIgnoreCase(tranSer))
{
sql="Select rcp_type, acct_code__cr, cctr_code__cr "
+ "from receipt where tran_id = ?";
sql="select rcp_type, acct_code__cr, cctr_code__cr from receipt where tran_id = ?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1, rcpNo);
rs=pstmt.executeQuery();
......@@ -439,7 +463,9 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
rs = null;
pstmt.close();
pstmt = null;
}
}//end
//Added end by Jasmina 01/06/10-FI90ALL013, shifted from below
if (rcpHnrDetList.isEmpty())
......@@ -484,8 +510,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
int insdetcnt=pstmt1.executeUpdate();
if (insdetcnt<=0)
{
errorCode = "DS000";
{ errorCode = "DS000";
errString=itmDBAccessEJB.getErrorString("", errorCode, "", "", conn);
return errString;
}
......@@ -620,7 +646,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
pstmt1.setString(9, sundryType);
pstmt1.setString(10, sundryCode);
pstmt1.setString(11, currCode);
//System.out.println("data inserted in rcpdishnr_acct tran_id ["+tranId+"] line_no["+ll_ctr1+"]Amount["+Amt);
int insacctcnt=pstmt1.executeUpdate();
pstmt1.close();
pstmt1= null;
......@@ -646,8 +672,6 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
// rcpdishnr_adv to be populated only for Receipt
if("R".equalsIgnoreCase(tranSer.trim()))
{
//Commented and shifted above by Jasmina 01/06/10-FI90ALL013
////Added by Jasmina 25/08/08-FI89ALL022
//If ll_rows1 > 0 then
......@@ -722,7 +746,6 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
rs = null;
pstmt.close();
pstmt = null;
}
}
if (errorCode!=null && errorCode.trim().length()>0)
......@@ -730,7 +753,6 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
conn.rollback();
System.out.println("Rollbacked");
}
//Populating detail list again
rcpHnrDetList.clear();
rcpHnrDetList=getDetailData(tranId, conn);
......@@ -757,6 +779,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
rcpHnracctList.add(rcpHnrDeta);
}
//System.out.println("populating account list["+rcpHnracctList+"]");
rs.close();
rs = null;
pstmt.close();
......@@ -838,17 +862,17 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
}
public String gbfPostRcpDishnr(HashMap hdrMap,ArrayList detList,ArrayList acctList,ArrayList advList,String xtraParams,Connection conn) throws ITMException
{
String errString="",sql="";
String errString="",sql="",ls_confirm="";
// 04/10/00 manoharan added coin diff. checking
String errorCode ="", ls_tranid="", reasonCode="", siteCode="", custCode="", tranType="",
ls_curr="", acctCode="", cctrCode="", finEnt="", ls_keystr="", ls_auto_tran_id="", receiptNo="", itemSer="",
remark="", suppCode="", acctAdv="", cctrAdv="", taxClass="", taxChap="", taxEnv="",
mcrterm="", ls_dcrterm="", acctBc="", cctrBc="", debitTo="", stationFrom="", stationTo ="", chqAmt ="",
autoDrNote ="", ls_var_value="";
autoDrNote ="", ls_var_value="",rcprefNo="",rcpAdvBkRfNo="";
//nvo_datastore lds_hdr, lds_misc_hdr, lds_misc_det, ds_tax_detbrow
double bankCharges=0, netAmt=0 , lc_rd_net_amt=0, tax =0 , exchRate=0;
double bankCharges=0, netAmt=0 , lc_rd_net_amt=0, tax =0 , exchRate=0,advbkamount=0,epcamount=0;
Timestamp ld_today=null, tranDate=null;
String ls_comm_calc_on_off="",ls_conf_drcr_opt="",ls_conf_jv_opt="";
String ls_var_miscdrcr_val="";
......@@ -859,8 +883,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
FinCommon Fcommon=new FinCommon();
DistCommon distcommon=new DistCommon();
ResultSet rs=null,rs1=null;
PreparedStatement pstmt=null,pstmt1=null;
ResultSet rs=null,rs1=null,rs2=null;
PreparedStatement pstmt=null,pstmt1=null,pstmt2=null;
try
{
SimpleDateFormat sdf=new SimpleDateFormat(genericUtility.getApplDateFormat());
......@@ -890,15 +914,22 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
}
// 28-dec-2018 manoharan moved here to update after detail posting
String ls_confirm = hdrMap.get("confirmed").toString();
ls_confirm = hdrMap.get("confirmed").toString();
receiptNo = hdrMap.get("receipt_no").toString();
// System.out.println("status:"+ls_confirm+"receipt no>>>"+receiptNo);
String login_emp_code=new E12GenericUtility().getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode");
if(ls_confirm==null || ls_confirm.trim().length()==0 )//prince --18-09-06
{
ls_confirm="Y";
}
if(!("Y".equalsIgnoreCase(ls_confirm)))
//ADDED BY MONIKA 30 SEPT 2019 to update reverse amount
else if(!("Y".equalsIgnoreCase(ls_confirm)))
{
//System.out.println("inside the loop of confirm");
sql="update rcpdishnr set confirmed = 'Y', conf_date = ?,"
+ "emp_code__aprv = ? "
+ "where tran_id = ? ";
......@@ -907,6 +938,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
pstmt.setString(2,login_emp_code);
pstmt.setString(3,ls_tranid);
int updconf=pstmt.executeUpdate();
//System.out.println("update count::"+updconf);
pstmt.close();
pstmt = null;
if(updconf <=0)
......@@ -916,6 +948,66 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
return errString;
}
//UPDATE IN E-FUND
sql = "select amount,ref_no from rcpepc_adj WHERE tran_id = ?";
pstmt= conn.prepareStatement(sql);
pstmt.setString(1,receiptNo);
rs= pstmt.executeQuery();
if(rs.next())
{
epcamount = rs.getDouble("amount");
rcprefNo=rs.getString("ref_no");
System.out.println("epc amount"+epcamount);
}
if(Math.abs(epcamount) > 0)
{
//System.out.println("INSIDE ADVAMT"+epcamount);
sql = "update export_fund set bal_amt = (case when bal_amt is null then 0 else bal_amt end -(?)) where tran_id = ? ";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setDouble(1,epcamount);
pstmt1.setString(2,rcprefNo);
pstmt1.executeUpdate();
pstmt1.close();
pstmt1= null;
}
pstmt.close();
pstmt= null;
rs.close();
rs= null;
//ADDED BY MONIKA 30 SEPT 2019
//UPDATE IN ADVBOOKING
sql = "select amount,ref_no from RCPADVBKING_ADJ WHERE tran_id = ?";
pstmt= conn.prepareStatement(sql);
pstmt.setString(1,receiptNo);
rs= pstmt.executeQuery();
if(rs.next())
{
advbkamount = rs.getDouble("amount");
rcpAdvBkRfNo=rs.getString("ref_no");
}
// System.out.println("INSIDE ADVAMT"+advbkamount);
if(Math.abs(advbkamount) > 0)
{
// System.out.println("INSIDE ADVAMT");
sql = "update advbking set bal_amt = (case when bal_amt is null then 0 else bal_amt end +?) where tran_id = ? ";
pstmt1= conn.prepareStatement(sql);
pstmt1.setDouble(1,advbkamount);
pstmt1.setString(2,rcpAdvBkRfNo);
pstmt1.executeUpdate();
pstmt1.close();
pstmt1 = null;
}
pstmt.close();
pstmt= null;
rs.close();
rs= null;//end
}
//--------------------
......@@ -1282,12 +1374,12 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
xmlBuff.append("</DocumentRoot>");
System.out.println("misc voucher Note xml["+xmlBuff.toString()+"]");
//System.out.println("misc voucher Note xml["+xmlBuff.toString()+"]");
errString=saveData(xtraParams, siteCode, xmlBuff.toString(), conn);
if( errString.indexOf("Success") != -1 )
{
ls_auto_tran_id=errString.substring( errString.indexOf("<TranID>")+8, errString.indexOf("</TranID>"));
System.out.println("tranIdVoucher is :"+ls_auto_tran_id);
//System.out.println("tranIdVoucher is :"+ls_auto_tran_id);
//following code added by ajit on date 01-Mar-2017 Request#F16JSUN004
if("Y".equalsIgnoreCase(ls_var_miscdrcr_val))
{
......@@ -1598,7 +1690,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
if( errString.indexOf("Success") != -1 )
{
ls_auto_tran_id=errString.substring( errString.indexOf("<TranID>")+8, errString.indexOf("</TranID>"));
System.out.println("tranIdVoucher is :"+ls_auto_tran_id);
// System.out.println("tranIdVoucher is :"+ls_auto_tran_id);
//following code added by ajit on date 01-Mar-2017 Request#F16JSUN004
if("Y".equalsIgnoreCase(ls_var_miscdrcr_val))
{
......@@ -1706,14 +1798,14 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
public String gbfPostRcpDishnrHdr(HashMap hdrMap,String xtraParams,Connection conn) throws ITMException
{
String errString="";
String errString="",rcpAdvBkRfNo="",rcprefNo="";
String errorCode ="", receiptNo="", currCodeBc="", acctBal="", cctrBal="", ls_confirm="",
crTerm="", crTermOld="",ls_edi_option="", acctAdv="", cctrAdv="", siteCode="",
siteCodeFor="", refSer="",ls_varvalue="", rcpType="", acctCodeCr="", cctrCodeCr ="", ls_cr_limit="",sundryType="";
double lc_amount= 0, advAmt= 0, adjAmt= 0, postExchRate= 0, netAmt= 0, postAmt= 0,
crDays= 0,lc_crprd= 0, creditDays= 0, othAmt = 0, creditLimit=0;
//Change By Subu
double exchRate=0; //decimal change to 6 by ajit on date 9-June-2015
double exchRate=0,epcamount=0,advbkamount=0; //decimal change to 6 by ajit on date 9-June-2015
Timestamp ld_today=new java.sql.Timestamp(System.currentTimeMillis());
......@@ -1743,7 +1835,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
gltraceUpd.put("sundry_code", hdrMap.get("bank_code"));
System.out.println("HeaderPost sundryCode" +hdrMap.get("bank_code"));
// System.out.println("HeaderPost sundryCode" +hdrMap.get("bank_code"));
receiptNo=hdrMap.get("receipt_no").toString();
if ("R".equalsIgnoreCase(hdrMap.get("tran_ser").toString()))
......@@ -1828,6 +1920,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
refSer = "M-RCP";
}
sql="select exch_rate , (dr_amt - cr_amt) as postAmt "
//+ "into :lc_post_exchrt , :lc_post_amt "
+ "from gltrace "
......@@ -1853,14 +1947,15 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
if(postExchRate!=1) //Added by Jasmina 07/06/10-FI90ALL013, bank control always hit in base currency
{
netAmt =(Double) hdrMap.get("net_amt");
netAmt =(Double) hdrMap.get("net_amt");//10000
exchRate = (Double) hdrMap.get("exch_rate");
gltraceUpd.put("curr_code", hdrMap.get("curr_code")) ; //added by jasmina 08/06/10-FI90ALL013
}
else
{
netAmt = postAmt;
//netAmt = postAmt;
netAmt =(Double) hdrMap.get("net_amt");
exchRate = 1;
gltraceUpd.put("curr_code", currCodeBc) ;//added by jasmina 08/06/10-FI90ALL013
}
......@@ -1953,7 +2048,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
bankTranLog.put("entry_batch_no"," ");
errString=Fcommon.bankTranLogUpdate(bankTranLog, xtraParams, conn);
System.out.println("BankTran Map::"+bankTranLog);
//System.out.println("BankTran Map::"+bankTranLog);
if(errString!=null && errString.trim().length()>0)
{
return errString;
......@@ -2301,6 +2396,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
// End of changes on 30/12
crTerm = hdrMap.get("cr_term").toString();
crTermOld = hdrMap.get("cr_term__old").toString();
......@@ -2474,7 +2570,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
}
sql=sql+ "where "+colName+" = ?";
System.out.println("sql"+sql);
// System.out.println("sql"+sql);
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,crTerm);
pstmt.setDouble(2,crDays);
......@@ -2619,9 +2715,9 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
rs=null;
pstmt.close();
pstmt=null;
// where tran_window = 'w_rcpdishnr';
// where tran_window = 'w_rcpdishnr';
// lds_det.retrieve(lstr_gltrace.ref_id)
// lds_det.retrieve(lstr_gltrace.ref_id)
if(Integer.parseInt(ls_edi_option)> 0)
{
......@@ -2635,7 +2731,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
'', '', '', '', '')*/
CreateRCPXML createRCPXML = new CreateRCPXML("w_rcpdishnr_adv", "tran_id");
String dataStr = createRCPXML.getTranXML(hdrMap.get("tran_id").toString(), conn);
System.out.println("dataStr =[ " + dataStr + "]");
//System.out.println("dataStr =[ " + dataStr + "]");
Document ediDataDom = new E12GenericUtility().parseString(dataStr);
setNodeValue(ediDataDom, "confirmed", "Y");
setNodeValue(ediDataDom, "conf_date", sdf.format(ld_today));
......@@ -2650,7 +2746,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
{
CreateRCPXML createRCPXML = new CreateRCPXML("w_rcpdishnr_adv", "tran_id");
String dataStr = createRCPXML.getTranXML(hdrMap.get("tran_id").toString(), conn);
System.out.println("dataStr =[ " + dataStr + "]");
//System.out.println("dataStr =[ " + dataStr + "]");
Document ediDataDom = new E12GenericUtility().parseString(dataStr);
setNodeValue(ediDataDom, "confirmed", "Y");
setNodeValue(ediDataDom, "conf_date", sdf.format(ld_today));
......@@ -2774,7 +2870,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
int updrcv=pstmt.executeUpdate();
if(updrcv<=0)
{
System.out.println("Inside errCode");
// System.out.println("Inside errCode");
errorCode = "DS000";
errString=itmDBAccessEJB.getErrorString("", errorCode, "", "", conn);
return errString;
......@@ -2787,7 +2883,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
//if isnull(lc_repaid_amt) then lc_repaid_amt = 0
if (repaidAmt > 0)
{
System.out.println("Inside recoAmt");
//System.out.println("Inside recoAmt");
/// filter data
/*lds_recofilt.setitem(1,"crnote_date",lds_hdr.getitemdatetime(1, "tran_date"))
lds_recofilt.setitem(1,"site_code",lds_hdr.getitemstring(1, "site_code"))*/
......@@ -2820,7 +2916,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
//ls_tranid = lds_hdr.getitemstring(1, "tran_id")
ls_tranid=hdrMap.get("tran_id").toString();
System.out.println("Inside recodealer");
// System.out.println("Inside recodealer");
errString = gbfMiscCreditNoteOsRecoDealer(recoFiltMap, recoDataMap, "D", "RCPDIS", ls_tranid,xtraParams,conn);
if(errString!=null && errString.trim().length()>0)
{
......@@ -2834,7 +2930,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
// adjustment of advances knocked off in the receipt
//ll_rows1 = lds_adv.rowcount()
System.out.println("Inside detail posting");
// System.out.println("Inside detail posting");
for(HashMap eachAdv:advList)
{
refSer=eachAdv.get("ref_ser").toString();
......@@ -2878,7 +2974,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
}
}
System.out.println("Post Detail"+errString);
// System.out.println("Post Detail"+errString);
}
catch(Exception e)
{
......@@ -2925,19 +3021,23 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
{
String errString="",sql="";
String errorCode = "", contactCode="", acctAdv="", cctrAdv="", receiptNo="", ls_cctr1="", ls_curr="";
double lc_amount=0, lc_adv=0,advAmt=0;
double lc_amount=0, lc_adv=0,advAmt=0,glcramount=0,gldramount=0;
Timestamp ld_today=null, ld_revdt=null;
PreparedStatement pstmt=null;
ResultSet rs=null;
boolean lb_adv=true;
HashMap gltraceUpd=new HashMap();
HashMap sundryBalUpd=new HashMap();
HashMap gltraceUpd=null;
// HashMap gltraceUpd=new HashMap();
HashMap sundryBalUpd=null;
//HashMap sundryBalUpd=new HashMap();
FinCommon Fcommon=new FinCommon();
try
{
ld_today =new Timestamp(System.currentTimeMillis());
System.out.println("Inside acct Posting");
System.out.println("acctList"+acctList);
// System.out.println("Inside acct Posting");
// System.out.println("acctList"+acctList);
if("R".equalsIgnoreCase(hdrMap.get("tran_ser").toString().trim()))
{
......@@ -2962,11 +3062,15 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
pstmt.close();
pstmt=null;
}
//System.out.println("account list in acctpost:["+acctList+"]");
//ll_rows = lds_det.rowcount()
for(HashMap eachAcct:acctList)
{
gltraceUpd=null;
gltraceUpd=new HashMap();
// for each detail do the posting
// System.out.println("list for acctpost of each record:["+eachAcct+"]");
gltraceUpd.put("tran_date", hdrMap.get("tran_date"));
gltraceUpd.put("eff_date", hdrMap.get("eff_date"));
gltraceUpd.put("fin_entity", hdrMap.get("fin_entity"));
......@@ -2980,7 +3084,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
//Added By Yogesh 11/07/2005
ls_curr=eachAcct.get("curr_code").toString();
System.out.println("Inside acct header before"+hdrMap.get("curr_code"));
// System.out.println("Inside acct header before"+hdrMap.get("curr_code"));
if(ls_curr!=null && ls_curr.trim().length()>0)
{
gltraceUpd.put("curr_code", ls_curr);
......@@ -2988,12 +3092,14 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
else
{
gltraceUpd.put("curr_code", hdrMap.get("curr_code"));
System.out.println("Inside acct header curr_code"+hdrMap.get("curr_code"));
// System.out.println("Inside acct header curr_code"+hdrMap.get("curr_code"));
}
//gltraceUpd.put("curr_code", eachAcct.get("curr_code"));
//System.out.println("gl updated list amount :["+ eachAcct.get("amount"));
gltraceUpd.put("exch_rate", eachAcct.get("exch_rate"));
advAmt=(Double)eachAcct.get("amount");
//System.out.println("advamt in accountlist"+advAmt);
if(advAmt>0)
{
//lstr_gltrace.dr_amt = lds_det.getitemnumber(ll_ctr, "amount")
......@@ -3006,11 +3112,16 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
{
// lstr_sundrybal.dr_amt = 0
sundryBalUpd.put("dr_amt", 0);
gltraceUpd.put("dr_amt", 0);
//lstr_sundrybal.cr_amt = abs(lds_det.getitemnumber(ll_ctr, "amount"))
sundryBalUpd.put("cr_amt", Math.abs(advAmt));
//sundryBalUpd.put("cr_amt", Math.abs(advAmt));
//gltraceUpd.put("cr_amt",( eachAcct.get("amount")));
gltraceUpd.put("cr_amt", -advAmt);
}
gltraceUpd.put("ref_type", "F");
gltraceUpd.put("ref_ser", "R-DIS");
gltraceUpd.put("ref_id", hdrMap.get("tran_id"));
......@@ -3025,6 +3136,9 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
if(!"O".equals(gltraceUpd.get("sundry_type").toString()))
{
// reverse sundrybal for sundry from each detail line
sundryBalUpd=null;
sundryBalUpd=new HashMap();
sundryBalUpd.put("tran_date", hdrMap.get("tran_date"));
sundryBalUpd.put("eff_date", hdrMap.get("eff_date"));
sundryBalUpd.put("fin_entity", hdrMap.get("fin_entity"));
......@@ -3037,6 +3151,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
sundryBalUpd.put("exch_rate", eachAcct.get("exch_rate"));
advAmt=(Double)eachAcct.get("amount");
// System.out.println("advamt in accountlist in where condition"+advAmt);
if(advAmt>0)
{
sundryBalUpd.put("dr_amt", eachAcct.get("amount"));
......@@ -3045,7 +3160,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
else
{
sundryBalUpd.put("dr_amt", 0.0);
sundryBalUpd.put("cr_amt", eachAcct.get("amount"));
sundryBalUpd.put("cr_amt",-advAmt);
}
// advance updation not to be done here shiri 23/05/02 moved to post header
......@@ -3064,6 +3179,9 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
}
}
}
}
catch(Exception e)
{
......@@ -3302,11 +3420,11 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
errString=saveData(xtraParams, recodataMap.get("site_code").toString(), xmlBuff.toString(), conn);
if (errString.indexOf("Success") > -1)
{
System.out.println("retString.indexOf(Success) > -1)");
//System.out.println("retString.indexOf(Success) > -1)");
String[] arrayForTranId = errString.split("<TranID>");
int endIndex = arrayForTranId[1].indexOf("</TranID>");
miscVchTranId = arrayForTranId[1].substring(0,endIndex);
System.out.println("miscVchTranId123@@@------>>>["+miscVchTranId+"]");
//System.out.println("miscVchTranId123@@@------>>>["+miscVchTranId+"]");
errString="";
}
else
......@@ -3322,7 +3440,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
if(errString==null ||errString.trim().length()==0) //len(trim(errorCode)) = 0 then // if misc_vouchdet is inserted totally ....
{
// errorCode = nvo_misc.gbf_retrieve_misc_vou(ls_tranid,ls_tranid,1, ls_warning)//Commented and Added by shahid 23/10/2008 for FI6SUP0047
// errorCode = nvo_misc.gbf_retrieve_misc_vou(ls_tranid,ls_tranid,1, ls_warning)//Commented and Added by shahid 23/10/2008 for FI6SUP0047
//errorCode = nvo_misc.gbf_retrieve_misc_vou(ls_tranid,ls_tranid,1, ls_warning,ls_site_code)
MiscValConf MiscValConfObj=new MiscValConf(); //VTSUCC1
errString=MiscValConfObj.confirm(miscVchTranId, xtraParams, "",conn);
......@@ -3498,13 +3616,13 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
} // if debit_hdr inserted
//if isnull(errorCode) or len(trim(errorCode)) = 0 then
// errorCode = 'VTCOMPL'+ '~t' + ' ~n Dr Note :' + ls_tranid
// return true
// errorCode = 'VTCOMPL'+ '~t' + ' ~n Dr Note :' + ls_tranid
// return true
//else
// return false
// return false
//end if
// openwithparm(w_msg, errorCode)
// openwithparm(w_msg, errorCode)
}
catch(Exception e)
......
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