Skip to content

B
business-java
Commit 527a79a0 authored by kshinde's avatar kshinde
Browse files
Options

Receipt Dishonour auto confirm changes and bug fix 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@196165 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 9ad164ea
Show whitespace changes
Inline Side-by-side
Showing with 123 additions and 76 deletions
webitm-fin/ibase/webitm/ejb/fin/adv/ReceiptDishonourConf.java
View file @ 527a79a0
...@@ -68,6 +68,31 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -68,6 +68,31 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
} }
return retString; return retString;
} }
public String confirm(String tranID,String xtraParams, String forcedFlag,Connection conn) throws RemoteException,ITMException
{
String retString = "";
boolean isConn= true;
//Connection conn = null;
try
{
System.out.println("Inside auto confirm");
retString = confirm( tranID, xtraParams, forcedFlag, conn, isConn );
System.out.println("errstring auto confirm"+retString);
/*if ( retString.indexOf("VTCONSUCF") == -1)
{
ret
}
*/ }
catch(Exception exception)
{
System.out.println("Exception in [InvHoldConfEJB] getCurrdateAppFormat " + exception.getMessage());
exception.printStackTrace();
throw new ITMException(exception);
}
return retString;
}
public String confirm(String tranId, String xtraParams,String forcedFlag, Connection conn, boolean connStatus ) throws RemoteException,ITMException public String confirm(String tranId, String xtraParams,String forcedFlag, Connection conn, boolean connStatus ) throws RemoteException,ITMException
{ {
String errString=""; String errString="";
...@@ -75,6 +100,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -75,6 +100,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
ResultSet rs = null; ResultSet rs = null;
String sql=""; String sql="";
String errorCode="",confirm="",siteCode=""; String errorCode="",confirm="",siteCode="";
boolean isLocal=false;
ITMDBAccessEJB itmDBAccessEJB=new ITMDBAccessEJB(); ITMDBAccessEJB itmDBAccessEJB=new ITMDBAccessEJB();
try try
...@@ -83,6 +109,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -83,6 +109,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
{ {
conn = getConnection(); conn = getConnection();
conn.setAutoCommit(false); conn.setAutoCommit(false);
isLocal=true;
System.out.println("Is Local");
} }
sql =" select confirmed,site_code from rcpdishnr where tran_id = ?"; sql =" select confirmed,site_code from rcpdishnr where tran_id = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -98,7 +126,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -98,7 +126,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
if(confirm != null && "Y".equalsIgnoreCase(confirm)) 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); errString = itmDBAccessEJB.getErrorString("","VTMCONF1","","",conn);
...@@ -127,16 +155,19 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -127,16 +155,19 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
{ {
try try
{ {
if( errString.indexOf("VTCONSUCF") != -1 ) if( errString.indexOf("VTCONSUCF") != -1 && isLocal )
{ {
conn.commit(); conn.commit();
} }
else else
{
if(isLocal)
{ {
conn.rollback(); conn.rollback();
System.out.println("Rollbacked"); System.out.println("Rollbacked");
} }
} }
}
catch(Exception e) catch(Exception e)
{ {
e.getMessage(); e.getMessage();
...@@ -213,34 +244,34 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -213,34 +244,34 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
rcpHnrHdr.put("tran_id",rs.getString("tran_id")); rcpHnrHdr.put("tran_id",checkNull(rs.getString("tran_id")));
rcpHnrHdr.put("tran_type",rs.getString("tran_type")); rcpHnrHdr.put("tran_type",checkNull(rs.getString("tran_type")));
rcpHnrHdr.put("tran_date",rs.getTimestamp("tran_date")); rcpHnrHdr.put("tran_date",rs.getTimestamp("tran_date"));
rcpHnrHdr.put("eff_date",rs.getTimestamp("eff_date")); rcpHnrHdr.put("eff_date",rs.getTimestamp("eff_date"));
rcpHnrHdr.put("tran_ser",rs.getString("tran_ser")); rcpHnrHdr.put("tran_ser",checkNull(rs.getString("tran_ser")));
rcpHnrHdr.put("receipt_no",rs.getString("receipt_no")); rcpHnrHdr.put("receipt_no",checkNull(rs.getString("receipt_no")));
rcpHnrHdr.put("rcp_mode",rs.getString("rcp_mode")); rcpHnrHdr.put("rcp_mode",checkNull(rs.getString("rcp_mode")));
rcpHnrHdr.put("curr_code",rs.getString("curr_code")); rcpHnrHdr.put("curr_code",checkNull(rs.getString("curr_code")));
rcpHnrHdr.put("cust_code",rs.getString("cust_code")); rcpHnrHdr.put("cust_code",checkNull(rs.getString("cust_code")));
rcpHnrHdr.put("site_code",rs.getString("site_code")); rcpHnrHdr.put("site_code",checkNull(rs.getString("site_code")));
rcpHnrHdr.put("fin_entity",rs.getString("fin_entity")); rcpHnrHdr.put("fin_entity",checkNull(rs.getString("fin_entity")));
rcpHnrHdr.put("bank_code",rs.getString("bank_code")); rcpHnrHdr.put("bank_code",checkNull(rs.getString("bank_code")));
rcpHnrHdr.put("net_amt",rs.getDouble("net_amt")); rcpHnrHdr.put("net_amt",rs.getDouble("net_amt"));
rcpHnrHdr.put("bank_charges",rs.getDouble("bank_charges")); rcpHnrHdr.put("bank_charges",rs.getDouble("bank_charges"));
rcpHnrHdr.put("ref_no",rs.getString("ref_no")); rcpHnrHdr.put("ref_no",checkNull(rs.getString("ref_no")));
rcpHnrHdr.put("ref_date",rs.getTimestamp("ref_date")); rcpHnrHdr.put("ref_date",rs.getTimestamp("ref_date"));
rcpHnrHdr.put("cctr_code__cf",rs.getString("cctr_code__cf")); rcpHnrHdr.put("cctr_code__cf",checkNull(rs.getString("cctr_code__cf")));
rcpHnrHdr.put("diff_amt__exch",rs.getDouble("diff_amt__exch")); rcpHnrHdr.put("diff_amt__exch",rs.getDouble("diff_amt__exch"));
rcpHnrHdr.put("reas_code",rs.getString("reas_code")); rcpHnrHdr.put("reas_code",checkNull(rs.getString("reas_code")));
rcpHnrHdr.put("acct_code__bc",rs.getString("acct_code__bc")); rcpHnrHdr.put("acct_code__bc",checkNull(rs.getString("acct_code__bc")));
rcpHnrHdr.put("cctr_code__bc",rs.getString("cctr_code__bc")); rcpHnrHdr.put("cctr_code__bc",checkNull(rs.getString("cctr_code__bc")));
rcpHnrHdr.put("curr_code__bc",rs.getString("curr_code__bc")); rcpHnrHdr.put("curr_code__bc",checkNull(rs.getString("curr_code__bc")));
rcpHnrHdr.put("cr_term__old",rs.getString("cr_term__old")); rcpHnrHdr.put("cr_term__old",checkNull(rs.getString("cr_term__old")));
rcpHnrHdr.put("cr_term",rs.getString("cr_term")); rcpHnrHdr.put("cr_term",checkNull(rs.getString("cr_term")));
rcpHnrHdr.put("emp_code__aprv",rs.getString("emp_code__aprv")); rcpHnrHdr.put("emp_code__aprv",checkNull(rs.getString("emp_code__aprv")));
rcpHnrHdr.put("exch_rate",rs.getDouble("exch_rate")); rcpHnrHdr.put("exch_rate",rs.getDouble("exch_rate"));
rcpHnrHdr.put("exch_rate__bc",rs.getDouble("exch_rate__bc")); rcpHnrHdr.put("exch_rate__bc",rs.getDouble("exch_rate__bc"));
rcpHnrHdr.put("site_code__for",rs.getString("site_code__for")); rcpHnrHdr.put("site_code__for",checkNull(rs.getString("site_code__for")));
rcpHnrHdr.put("confirmed","N"); rcpHnrHdr.put("confirmed","N");
} }
rs.close(); rs.close();
...@@ -259,16 +290,16 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -259,16 +290,16 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while(rs.next()) while(rs.next())
{ {
rcpHnrDeta.put("line_no", rs.getString("line_no")); rcpHnrDeta.put("line_no", checkNull(rs.getString("line_no")));
rcpHnrDeta.put("acct_code", rs.getString("acct_code")); rcpHnrDeta.put("acct_code", checkNull(rs.getString("acct_code")));
rcpHnrDeta.put("cctr_code", rs.getString("cctr_code")); rcpHnrDeta.put("cctr_code", checkNull(rs.getString("cctr_code")));
rcpHnrDeta.put("amount", rs.getDouble("amount")); rcpHnrDeta.put("amount", rs.getDouble("amount"));
rcpHnrDeta.put("emp_code", rs.getString("emp_code")); rcpHnrDeta.put("emp_code", checkNull(rs.getString("emp_code")));
rcpHnrDeta.put("anal_code", rs.getString("anal_code")); rcpHnrDeta.put("anal_code", checkNull(rs.getString("anal_code")));
rcpHnrDeta.put("exch_rate", rs.getDouble("exch_rate")); rcpHnrDeta.put("exch_rate", rs.getDouble("exch_rate"));
rcpHnrDeta.put("sundry_type", rs.getString("sundry_type")); rcpHnrDeta.put("sundry_type", checkNull(rs.getString("sundry_type")));
rcpHnrDeta.put("sundry_code", rs.getString("sundry_code")); rcpHnrDeta.put("sundry_code", checkNull(rs.getString("sundry_code")));
rcpHnrDeta.put("curr_code", rs.getString("curr_code")); rcpHnrDeta.put("curr_code", checkNull(rs.getString("curr_code")));
rcpHnracctList.add(rcpHnrDeta); rcpHnracctList.add(rcpHnrDeta);
} }
...@@ -285,16 +316,16 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -285,16 +316,16 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while(rs.next()) while(rs.next())
{ {
rcpHnradv.put("line_no", rs.getString("line_no")); rcpHnradv.put("line_no", checkNull(rs.getString("line_no")));
rcpHnradv.put("acct_code", rs.getString("acct_code")); rcpHnradv.put("acct_code", checkNull(rs.getString("acct_code")));
rcpHnradv.put("cctr_code", rs.getString("cctr_code")); rcpHnradv.put("cctr_code", checkNull(rs.getString("cctr_code")));
rcpHnradv.put("amount", rs.getDouble("amount")); rcpHnradv.put("amount", rs.getDouble("amount"));
rcpHnradv.put("emp_code", rs.getString("emp_code")); rcpHnradv.put("emp_code", checkNull(rs.getString("emp_code")));
rcpHnradv.put("anal_code", rs.getString("anal_code")); rcpHnradv.put("anal_code", checkNull(rs.getString("anal_code")));
rcpHnradv.put("exch_rate", rs.getDouble("exch_rate")); rcpHnradv.put("exch_rate", rs.getDouble("exch_rate"));
rcpHnradv.put("sundry_type", rs.getString("sundry_type")); rcpHnradv.put("sundry_type", checkNull(rs.getString("sundry_type")));
rcpHnradv.put("sundry_code", rs.getString("sundry_code")); rcpHnradv.put("sundry_code", checkNull(rs.getString("sundry_code")));
rcpHnradv.put("curr_code", rs.getString("curr_code")); rcpHnradv.put("curr_code", checkNull(rs.getString("curr_code")));
rcpHnradvList.add(rcpHnradv); rcpHnradvList.add(rcpHnradv);
} }
rs.close(); rs.close();
...@@ -372,9 +403,9 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -372,9 +403,9 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
rs=pstmt.executeQuery(); rs=pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
rcpType=rs.getString("rcp_type"); rcpType=checkNull(rs.getString("rcp_type"));
acctCodeCr=rs.getString("acct_code__cr"); acctCodeCr=checkNull(rs.getString("acct_code__cr"));
cctrCodeCr=rs.getString("cctr_code__cr"); cctrCodeCr=checkNull(rs.getString("cctr_code__cr"));
} }
else else
{ {
...@@ -411,11 +442,11 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -411,11 +442,11 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
while(rs.next()) while(rs.next())
{ {
refSer = rs.getString("ref_ser"); refSer = checkNull(rs.getString("ref_ser"));
refNo = rs.getString("ref_no"); refNo = checkNull(rs.getString("ref_no"));
rcpAmt = rs.getDouble("rcp_amt"); rcpAmt = rs.getDouble("rcp_amt");
refDate = rs.getTimestamp("ref_date"); refDate = rs.getTimestamp("ref_date");
sPers = rs.getString("sales_pers"); sPers = checkNull(rs.getString("sales_pers"));
//ll_crow = lds_det.insertrow(0) //ll_crow = lds_det.insertrow(0)
//inserting into detail //inserting into detail
...@@ -681,16 +712,16 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -681,16 +712,16 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while(rs.next()) while(rs.next())
{ {
rcpHnrDeta.put("line_no", rs.getString("line_no")); rcpHnrDeta.put("line_no", checkNull(rs.getString("line_no")));
rcpHnrDeta.put("acct_code", rs.getString("acct_code")); rcpHnrDeta.put("acct_code", checkNull(rs.getString("acct_code")));
rcpHnrDeta.put("cctr_code", rs.getString("cctr_code")); rcpHnrDeta.put("cctr_code", checkNull(rs.getString("cctr_code")));
rcpHnrDeta.put("amount", rs.getDouble("amount")); rcpHnrDeta.put("amount", rs.getDouble("amount"));
rcpHnrDeta.put("emp_code", rs.getString("emp_code")); rcpHnrDeta.put("emp_code", checkNull(rs.getString("emp_code")));
rcpHnrDeta.put("anal_code", rs.getString("anal_code")); rcpHnrDeta.put("anal_code", checkNull(rs.getString("anal_code")));
rcpHnrDeta.put("exch_rate", rs.getDouble("exch_rate")); rcpHnrDeta.put("exch_rate", rs.getDouble("exch_rate"));
rcpHnrDeta.put("sundry_type", rs.getString("sundry_type")); rcpHnrDeta.put("sundry_type", checkNull(rs.getString("sundry_type")));
rcpHnrDeta.put("sundry_code", rs.getString("sundry_code")); rcpHnrDeta.put("sundry_code", checkNull(rs.getString("sundry_code")));
rcpHnrDeta.put("curr_code", rs.getString("curr_code")); rcpHnrDeta.put("curr_code", checkNull(rs.getString("curr_code")));
rcpHnracctList.add(rcpHnrDeta); rcpHnracctList.add(rcpHnrDeta);
} }
...@@ -859,7 +890,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -859,7 +890,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
// Added by fatema - 16/06/2006 // Added by fatema - 16/06/2006
// For Creating Misc Dr note or Payable voucher for Bank charges // For Creating Misc Dr note or Payable voucher for Bank charges
// Depending on reason code - Customer or supplier respectively // Depending on reason code - Customer or supplier respectively
if (errString==null || errString.length()>0) if (errString==null || errString.length()==0)
{ {
reasonCode = hdrMap.get("reas_code").toString(); reasonCode = hdrMap.get("reas_code").toString();
// bankCharges = lds_hdr.getitemnumber(1, "bank_charges") // bankCharges = lds_hdr.getitemnumber(1, "bank_charges")
...@@ -907,11 +938,16 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -907,11 +938,16 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
sql="select auto_debit__note from customer " sql="select auto_debit__note from customer "
+ "where cust_code = ?" ; + "where cust_code = ?" ;
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, hdrMap.get("cust_code").toString());
rs=pstmt.executeQuery(); rs=pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
autoDrNote=rs.getString("auto_debit__note"); autoDrNote=rs.getString("auto_debit__note");
} }
pstmt.close();
pstmt=null;
rs.close();
rs=null;
//Ended by Rutuja for check auto_debit_note flag on 20-09-11 for FI90SUN004 //Ended by Rutuja for check auto_debit_note flag on 20-09-11 for FI90SUN004
/*if get_sqlcode() < 0 then /*if get_sqlcode() < 0 then
errorCode = 'DS000' + trim(string(sqlca.sqldbcode)) errorCode = 'DS000' + trim(string(sqlca.sqldbcode))
...@@ -1626,7 +1662,10 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -1626,7 +1662,10 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
gltraceUpd.put("fin_entity", hdrMap.get("fin_entity")); gltraceUpd.put("fin_entity", hdrMap.get("fin_entity"));
gltraceUpd.put("site_code", hdrMap.get("site_code")); gltraceUpd.put("site_code", hdrMap.get("site_code"));
gltraceUpd.put("sundry_type", "B"); gltraceUpd.put("sundry_type", "B");
gltraceUpd.put("bank_code", hdrMap.get("bank_code")); gltraceUpd.put("sundry_code", hdrMap.get("bank_code"));
System.out.println("HeaderPost sundryCode" +hdrMap.get("bank_code"));
receiptNo=hdrMap.get("receipt_no").toString(); receiptNo=hdrMap.get("receipt_no").toString();
if ("R".equalsIgnoreCase(hdrMap.get("tran_ser").toString())) if ("R".equalsIgnoreCase(hdrMap.get("tran_ser").toString()))
...@@ -1640,15 +1679,15 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -1640,15 +1679,15 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
rs=pstmt.executeQuery(); rs=pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
acctBal=rs.getString("acct_code__bal"); acctBal=checkNull(rs.getString("acct_code__bal"));
cctrBal=rs.getString("cctr_code__bal"); cctrBal=checkNull(rs.getString("cctr_code__bal"));
advAmt=rs.getDouble("adv_amt"); advAmt=rs.getDouble("adv_amt");
acctAdv=rs.getString("acct_code__adv"); acctAdv=checkNull(rs.getString("acct_code__adv"));
cctrAdv=rs.getString("cctr_code__adv"); cctrAdv=checkNull(rs.getString("cctr_code__adv"));
rcpType=rs.getString("rcp_type"); rcpType=checkNull(rs.getString("rcp_type"));
othAmt=rs.getDouble("oth_amt"); othAmt=rs.getDouble("oth_amt");
acctCodeCr=rs.getString("acct_code__cr"); acctCodeCr=checkNull(rs.getString("acct_code__cr"));
cctrCodeCr=rs.getString("cctr_code__cr"); cctrCodeCr=checkNull(rs.getString("cctr_code__cr"));
} }
rs.close(); rs.close();
...@@ -2002,7 +2041,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2002,7 +2041,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
pstmt.close(); pstmt.close();
pstmt=null; pstmt=null;
sql="update receivables set adj_amt = adj_amt - ? " sql="update receivables set adj_amt = adj_amt - ?, status = 'D' "
+ "where tran_ser = 'R-ADV' and ref_no = ?"; + "where tran_ser = 'R-ADV' and ref_no = ?";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
pstmt.setDouble(1,advAmt ); pstmt.setDouble(1,advAmt );
...@@ -2463,9 +2502,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2463,9 +2502,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
} }
//end zahid //end zahid
} }
/* //ls_confirm = hdrMap.get("confirmed").toString();
// 28-dec-18 manoharan commented and moved after detail posting
ls_confirm = hdrMap.get("confirmed").toString();*/
String login_emp_code=new E12GenericUtility().getValueFromXTRA_PARAMS(xtraParams, "loginCode"); String login_emp_code=new E12GenericUtility().getValueFromXTRA_PARAMS(xtraParams, "loginCode");
...@@ -2490,8 +2527,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2490,8 +2527,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
return errString; return errString;
} }
} }*/
*/
sql="select edi_option from transetup " //Changes by Yogesh 12/07/2005 sql="select edi_option from transetup " //Changes by Yogesh 12/07/2005
+"where tran_window = 'w_rcpdishnr_adv'"; +"where tran_window = 'w_rcpdishnr_adv'";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
...@@ -2527,7 +2564,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2527,7 +2564,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
setNodeValue(ediDataDom, "emp_code__aprv", login_emp_code); setNodeValue(ediDataDom, "emp_code__aprv", login_emp_code);
E12CreateBatchLoadEjb e12CreateBatchLoad = new E12CreateBatchLoadEjb(); E12CreateBatchLoadEjb e12CreateBatchLoad = new E12CreateBatchLoadEjb();
errString = e12CreateBatchLoad.createBatchLoad(ediDataDom,"w_lc_voucher", "" + 2 ,xtraParams, conn); errString = e12CreateBatchLoad.createBatchLoad(ediDataDom,"rcpdishnr_adv", "" + 2 ,xtraParams, conn);
createRCPXML = null; createRCPXML = null;
e12CreateBatchLoad = null; e12CreateBatchLoad = null;
} }
...@@ -2542,7 +2579,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2542,7 +2579,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
setNodeValue(ediDataDom, "emp_code__aprv", login_emp_code); setNodeValue(ediDataDom, "emp_code__aprv", login_emp_code);
E12CreateBatchLoadEjb e12CreateBatchLoad = new E12CreateBatchLoadEjb(); E12CreateBatchLoadEjb e12CreateBatchLoad = new E12CreateBatchLoadEjb();
errString = e12CreateBatchLoad.createBatchLoad(ediDataDom,"w_lc_voucher", "" + 1 ,xtraParams, conn); errString = e12CreateBatchLoad.createBatchLoad(ediDataDom,"rcpdishnr_adv", "" + 1 ,xtraParams, conn);
createRCPXML = null; createRCPXML = null;
e12CreateBatchLoad = null; e12CreateBatchLoad = null;
} }
...@@ -2827,16 +2864,18 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2827,16 +2864,18 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
//Added By Yogesh 11/07/2005 //Added By Yogesh 11/07/2005
ls_curr=eachAcct.get("curr_code").toString(); ls_curr=eachAcct.get("curr_code").toString();
if(ls_curr!=null || ls_curr.trim().length()>0) 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); gltraceUpd.put("curr_code", ls_curr);
} }
else else
{ {
gltraceUpd.put("curr_code", hdrMap.get("curr_code")); gltraceUpd.put("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")); //gltraceUpd.put("curr_code", eachAcct.get("curr_code"));
gltraceUpd.put("exch_rate", eachAcct.get("exch_rate")); gltraceUpd.put("exch_rate", eachAcct.get("exch_rate"));
advAmt=(Double)eachAcct.get("amount"); advAmt=(Double)eachAcct.get("amount");
if(advAmt>0) if(advAmt>0)
...@@ -3453,6 +3492,12 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -3453,6 +3492,12 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
} }
return retString; return retString;
} }
private String checkNull(String input) {
if (input == null) {
input = " ";
}
return input;
}
......
webitm-fin/ibase/webitm/ejb/fin/adv/ReceiptDishonourConfLocal.java
View file @ 527a79a0
...@@ -11,6 +11,7 @@ import javax.ejb.Local; ...@@ -11,6 +11,7 @@ import javax.ejb.Local;
@Local @Local
public interface ReceiptDishonourConfLocal extends ActionHandlerLocal { public interface ReceiptDishonourConfLocal extends ActionHandlerLocal {
public String confirm(String tranId,String xtraParams,String forcedFlag) throws RemoteException,ITMException; public String confirm(String tranId,String xtraParams,String forcedFlag) throws RemoteException,ITMException;
public String confirm(String tranId,String xtraParams,String forcedFlag,Connection conn) throws RemoteException,ITMException;//added by vishakha
public String confirm(String tranId,String xtraParams,String forcedFlag,Connection conn,boolean isPreview) throws RemoteException,ITMException;//added by vishakha public String confirm(String tranId,String xtraParams,String forcedFlag,Connection conn,boolean isPreview) throws RemoteException,ITMException;//added by vishakha
......
webitm-fin/ibase/webitm/ejb/fin/adv/ReceiptDishonourConfRemote.java
View file @ 527a79a0
...@@ -11,6 +11,7 @@ import javax.ejb.Remote; ...@@ -11,6 +11,7 @@ import javax.ejb.Remote;
@Remote @Remote
public interface ReceiptDishonourConfRemote extends ActionHandlerRemote { public interface ReceiptDishonourConfRemote extends ActionHandlerRemote {
public String confirm(String tranId,String xtraParams,String forcedFlag) throws RemoteException,ITMException; public String confirm(String tranId,String xtraParams,String forcedFlag) throws RemoteException,ITMException;
public String confirm(String tranId,String xtraParams,String forcedFlag,Connection conn) throws RemoteException,ITMException;//added by vishakha
public String confirm(String tranId,String xtraParams,String forcedFlag,Connection conn,boolean isPreview) throws RemoteException,ITMException;//added by vishakha public String confirm(String tranId,String xtraParams,String forcedFlag,Connection conn,boolean isPreview) throws RemoteException,ITMException;//added by vishakha
......
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