Skip to content

B
business-java
Commit 7c299443 authored by cshah's avatar cshah
Browse files
Options

FI1BALL002 changes done in gbfPostJournal() 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91465 ce508802-f39f-4f6c-b175-0d175dae99d5
parent fc6fd24a
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 25 deletions
webitm-fin/ibase/webitm/ejb/fin/adv/JvConfirm.java
View file @ 7c299443
......@@ -78,7 +78,28 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
System.out.println("Exception ::"+e.getMessage());
throw new ITMException(e);
}
System.out.println("errString ::"+errString);
finally
{
try
{
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
conn.close();
}
catch(Exception e)
{
System.out.println("Exception : "+e);e.printStackTrace();
throw new ITMException(e);
}
}
return errString;
} //end of confirm method
// gbf_retrieve_journal start
......@@ -411,22 +432,22 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
glTraceMap.put("eff_date",(journalMap.get("eff_date") == null ? "":journalMap.get("eff_date")));
glTraceMap.put("fin_entity",(journalMap.get("fin_entity") == null ? "":journalMap.get("fin_entity")));
glTraceMap.put("site_code",(journalMap.get("site_code") == null ? "":journalMap.get("site_code")));
glTraceMap.put("sundry_type",detSundryType);
glTraceMap.put("sundry_code",detSundryCode);
glTraceMap.put("acct_code",detAcctCode);
glTraceMap.put("cctr_code",detCctrCode);
glTraceMap.put("sundry_type",detSundryType == null ? "":detSundryType);
glTraceMap.put("sundry_code",detSundryCode == null ? "":detSundryCode);
glTraceMap.put("acct_code",detAcctCode == null ? "":detAcctCode);
glTraceMap.put("cctr_code",detCctrCode == null ? "":detCctrCode);
glTraceMap.put("emp_code",detEmpCode);
glTraceMap.put("anal_code ",detAnalCode);
glTraceMap.put("anal_code ",detAnalCode == null ? "":detAnalCode);
glTraceMap.put("curr_code",(journalMap.get("curr_code") == null ? "":journalMap.get("curr_code")));
glTraceMap.put("exch_rate",(journalMap.get("exch_rate") == null ? "":journalMap.get("exch_rate")));
if ("D".equalsIgnoreCase (detDrcrFlag))
{
glTraceMap.put("dr_amt",detAmount);
glTraceMap.put("dr_amt",Math.abs(Double.parseDouble(detAmount)));
glTraceMap.put("cr_amt","0");
}
else
{
glTraceMap.put("cr_amt",detAmount);
glTraceMap.put("cr_amt",Math.abs(Double.parseDouble(detAmount)));
glTraceMap.put("dr_amt","0");
}
glTraceMap.put("ref_type","F");
......@@ -442,24 +463,25 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
glTraceMap.put("remarks",detRemarks);
}
glTraceMap.put("proj_code",detProjCode);
System.out.println("gl trace map from Jv :: "+glTraceMap);
errString = Fcommon.glTraceUpdate(glTraceMap,conn);
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
if(!("O".equalsIgnoreCase (detSundryType)))
//if((!("O".equalsIgnoreCase (detSundryType))) || (detSundryCode!= null))
if(!("O".equalsIgnoreCase (detSundryType)) && (detSundryCode == null))
{
sundryBalMap = new HashMap();
sundryBalMap.put("tran_date",journalMap.get("tran_date"));
sundryBalMap.put("eff_date ",journalMap.get("eff_date"));
sundryBalMap.put("fin_entity",journalMap.get("fin_entity"));
sundryBalMap.put("site_code",journalMap.get("site_code"));
sundryBalMap.put("sundry_type",detSundryType);
sundryBalMap.put("sundry_code",detSundryCode);
sundryBalMap.put("acct_code",detAcctCode);
sundryBalMap.put("cctr_code",detCctrCode);
sundryBalMap.put("sundry_type",detSundryType == null ? "":detSundryType);
sundryBalMap.put("sundry_code",detSundryCode == null ? "":detSundryCode);
sundryBalMap.put("acct_code",detAcctCode == null ? "":detAcctCode);
sundryBalMap.put("cctr_code",detCctrCode == null ? "":detCctrCode);
sundryBalMap.put("curr_code ",journalMap.get("curr_code"));
sundryBalMap.put("exch_rate",journalMap.get("exch_rate"));
if ("D".equalsIgnoreCase(detDrcrFlag))
......@@ -476,11 +498,12 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
sundryBalMap.put("contact_code",Fcommon.getContactCode(detSundryType,detSundryCode,conn));
errString = Fcommon.gbf_sundrybal_upd(sundryBalMap,conn);
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
}
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
}// end of for loop
if (jourdetList.size() > 0 )
{
......@@ -682,7 +705,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
if (!(siteFr).equalsIgnoreCase(siteTo))
{
sql = " select acct_code__pay, cctr_code__pay, acct_code__rcp,cctr_code__rcp "
sql =" select acct_code__pay, cctr_code__pay, acct_code__rcp,cctr_code__rcp "
+" from ibca_pay_ctrl "
+" where site_code__from = ? "
+" and site_code__to = ? " ;
......@@ -737,7 +760,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
if ("P".equalsIgnoreCase(link))
{
sql =" select fin_entity from site where site_code = ? " ;
pstmt = conn.prepareStatement(sql);
pstmt = conn.prepareStatement(sql);
pstmt.setString (1,siteTo);
rs = pstmt.executeQuery();
if (rs.next())
......@@ -779,7 +802,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
errString = gbfRetrieveJournal(tranId,xtraParams,conn);
return errString;
}
else if ( siteFr.equalsIgnoreCase(siteTo))
else if (siteFr.equalsIgnoreCase(siteTo))
{
IBCAAConf = "Y";
errString= gbfRetrieveJournal (tranId,xtraParams,conn);
......@@ -805,7 +828,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
conn.commit();
errString = itmDBAccessEJB.getErrorString("","CONFSUCCES","");
System.out.println("JV Confirmed .."+errString);
} // end of else
return errString;
}// end ofTry - gbfPostJournal
......@@ -904,7 +927,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
pstmt = null;
//header site_code__for validation
sql = " select sum(case when drcr_flag = 'D' then amount else 0 end) debit, "
sql = "select sum(case when drcr_flag = 'D' then amount else 0 end) debit, "
+" sum(case when drcr_flag = 'C' then amount else 0 end) credit from jourdet "
+" where tran_id = ? "
+" and site_code__jv = ? ";
......@@ -1195,7 +1218,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
else
{
thisWin ="GENERAL" ;
sql1 = " select key_string from transetup where upper(tran_window) = ? ";
sql1 =" select key_string from transetup where upper(tran_window) = ? ";
pstmt1 = conn.prepareStatement(sql1);
pstmt1.setString(1,thisWin);
rs1 = pstmt1.executeQuery();
......@@ -1243,7 +1266,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
rs.close(); rs = null;
pstmt.close();pstmt =null;
sql = " insert into journal "
sql =" insert into journal "
+" (tran_id, tran_date, eff_date, fin_entity, site_code, dr_amt, cr_amt , "
+" remarks, reversible, status,confirmed, ref_ser, ref_no, curr_code, "
+" tran_type,exch_rate, chg_date, chg_user, proj_code ) "
......
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