Skip to content

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

bug fix 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@189722 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 39476579
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 25 deletions
webitm-fin/ibase/webitm/ejb/fin/adv/ReceiptDishonourConf.java
View file @ aad16b96
......@@ -53,15 +53,18 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
try
{
retString = confirm( tranID, xtraParams, forcedFlag, conn, isConn );
System.out.println("errstring"+retString);
if ( retString != null && retString.length() > 0 )
/*if ( retString.indexOf("VTCONSUCF") == -1)
{
throw new Exception("Exception while calling confirm for tran Id:["+tranID+"]");
ret
}
}
*/ }
catch(Exception exception)
{
System.out.println("Exception in [InvHoldConfEJB] getCurrdateAppFormat " + exception.getMessage());
exception.printStackTrace();
throw new ITMException(exception);
}
return retString;
}
......@@ -131,6 +134,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
else
{
conn.rollback();
System.out.println("Rollbacked");
}
}
catch(Exception e)
......@@ -164,9 +168,9 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
HashMap rcpHnrDeta= new HashMap();
HashMap rcpHnradv= new HashMap();
ArrayList rcpHnrDetList=new ArrayList();
ArrayList rcpHnracctList=new ArrayList();
ArrayList rcpHnradvList=new ArrayList();
ArrayList<HashMap> rcpHnrDetList=new ArrayList<HashMap>();
ArrayList<HashMap> rcpHnracctList=new ArrayList<HashMap>();
ArrayList<HashMap> rcpHnradvList=new ArrayList<HashMap>();
try
{
......@@ -237,14 +241,14 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
rcpHnrHdr.put("exch_rate",rs.getDouble("exch_rate"));
rcpHnrHdr.put("exch_rate__bc",rs.getDouble("exch_rate__bc"));
rcpHnrHdr.put("site_code__for",rs.getString("site_code__for"));
rcpHnrHdr.put("confirmed","");
rcpHnrHdr.put("confirmed","N");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
System.out.println("rcpHnrHdr Map :"+rcpHnrHdr);
//Getting detail data d_rcpdishnr_postinv
rcpHnrDetList=getDetailData(tranId, conn);
......@@ -426,16 +430,14 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
int insdetcnt=pstmt1.executeUpdate();
if (insdetcnt<=0)
{
errorCode = "DS000";
errString=itmDBAccessEJB.getErrorString("", errorCode, "", "", conn);
return errString;
}
pstmt1.clearParameters();
addAcctFrom = "d_rcpacct_brow";
if (insdetcnt<=0)
{
errorCode = "DS000";
errString=itmDBAccessEJB.getErrorString("", errorCode, "", "", conn);
return errString;
}
pstmt1.clearParameters();
}
rs.close();
rs = null;
......@@ -447,6 +449,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
pstmt1.close();
pstmt1= null;
}
addAcctFrom = "d_rcpacct_brow";
}
else // for receipt only
{
......@@ -467,12 +470,12 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
// populate rcpdishnr_acct
if(addAcctFrom.equalsIgnoreCase("d_rcpacct_brow"))
{
sql="SELECT tran_id,line_no, acct_code, cctr_code, amount, emp_code, anal_code, exch_rate, effect_party, sundry_type, sundry_code, curr_code, amount__bc "
sql="SELECT tran_id,line_no, acct_code, cctr_code, amount, emp_code, anal_code, exch_rate, effect_party, sundry_type, sundry_code, curr_code, amount__bc,eff_bank "
+ "FROM rcpacct WHERE tran_id = ?";
}
else if(addAcctFrom.equalsIgnoreCase("d_misc_rcpdet_brow"))
{
sql="SELECT tran_id, line_no, acct_code, cctr_code, amount, anal_code, emp_code, sundry_code, exch_rate,curr_code,net_amt "
sql="SELECT tran_id, line_no, acct_code, cctr_code, amount, anal_code, emp_code, sundry_code, exch_rate,curr_code,net_amt,eff_bank "
+ "FROM misc_rcpdet WHERE TRAN_ID = ?";
}
pstmt=conn.prepareStatement(sql);
......@@ -663,6 +666,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
if (errorCode!=null && errorCode.trim().length()>0)
{
conn.rollback();
System.out.println("Rollbacked");
}
//Populating detail list again
......@@ -736,6 +740,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
try
{
conn.rollback();
System.out.println("Rollbacked");
} catch (java.sql.SQLException e1)
{
e1.printStackTrace();
......@@ -1540,6 +1545,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
try
{
conn.rollback();
System.out.println("Rollbacked");
} catch (java.sql.SQLException e1)
{
e1.printStackTrace();
......@@ -1578,7 +1584,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
PreparedStatement pstmt=null,pstmt1=null;
FinCommon Fcommon=new FinCommon();
try
try
{
SimpleDateFormat sdf=new SimpleDateFormat(genericUtility.getApplDateFormat());
currCodeBc = hdrMap.get("curr_code__bc").toString();
......@@ -2437,7 +2443,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
{
ls_confirm="Y";
}
if(!"Y".equalsIgnoreCase(ls_confirm.trim()))
if(!("Y".equalsIgnoreCase(ls_confirm)))
{
sql="update rcpdishnr set confirmed = 'Y', conf_date = ?,"
+ "emp_code__aprv = ? "
......@@ -2445,7 +2451,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
pstmt = conn.prepareStatement(sql);
pstmt.setTimestamp(1,ld_today);
pstmt.setString(2,login_emp_code);
pstmt.setString(3,gltraceUpd.get("ref_no").toString());
pstmt.setString(3,gltraceUpd.get("ref_id").toString());
int updconf=pstmt.executeUpdate();
if(updconf <=0)
{
......@@ -2518,6 +2524,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
try
{
conn.rollback();
System.out.println("Rollbacked");
} catch (java.sql.SQLException e1)
{
e1.printStackTrace();
......@@ -2576,7 +2583,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
sql="select a.repaid_amt "
//+ "into :lc_repaid_amt"
+ "from receivables_reco "
+ "from receivables_reco a "
+ "where ref_ser = ? "
+ "and ref_no = ? "
+ "and tran_id = ( select max(tran_id) from receivables_reco b where b.ref_ser = a.ref_ser and b.ref_no = a.ref_no ) ";
......@@ -2604,6 +2611,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
int updrcv=pstmt.executeUpdate();
if(updrcv<=0)
{
System.out.println("Inside errCode");
errorCode = "DS000";
errString=itmDBAccessEJB.getErrorString("", errorCode, "", "", conn);
return errString;
......@@ -2616,6 +2624,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");
/// 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"))*/
......@@ -2648,7 +2657,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");
errString = gbfMiscCreditNoteOsRecoDealer(recoFiltMap, recoDataMap, "D", "RCPDIS", ls_tranid,xtraParams,conn);
if(errString!=null && errString.trim().length()>0)
{
......@@ -2661,6 +2670,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
// adjust sundrybal for advance received - done in post hdr
// adjustment of advances knocked off in the receipt
//ll_rows1 = lds_adv.rowcount()
System.out.println("Inside detail posting");
for(HashMap eachAdv:advList)
{
refSer=eachAdv.get("ref_ser").toString();
......@@ -2703,12 +2714,15 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
return errString;
}
}
System.out.println("Post Detail"+errString);
}
catch(Exception e)
{
try
{
conn.rollback();
System.out.println("Rollbacked");
} catch (java.sql.SQLException e1)
{
e1.printStackTrace();
......@@ -2739,6 +2753,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
try
{
ld_today =new Timestamp(System.currentTimeMillis());
System.out.println("Inside acct Posting");
System.out.println("acctList"+acctList);
if("R".equalsIgnoreCase(hdrMap.get("tran_ser").toString().trim()))
{
......@@ -2869,6 +2885,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
try
{
conn.rollback();
System.out.println("Rollbacked");
} catch (java.sql.SQLException e1)
{
e1.printStackTrace();
......
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