Commit fadc8801 authored by cshah's avatar cshah

changes done for solving reversible issue


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91527 ce508802-f39f-4f6c-b175-0d175dae99d5
parent edc8f31a
...@@ -8,8 +8,6 @@ package ibase.webitm.ejb.fin.adv; ...@@ -8,8 +8,6 @@ package ibase.webitm.ejb.fin.adv;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import java.sql.*; import java.sql.*;
import javax.ejb.*;
import ibase.webitm.utility.*;
import ibase.webitm.ejb.*; import ibase.webitm.ejb.*;
import ibase.system.config.*; import ibase.system.config.*;
import javax.ejb.Stateless; import javax.ejb.Stateless;
...@@ -33,16 +31,12 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -33,16 +31,12 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
String sql = ""; String sql = "";
ConnDriver connDriver = null; ConnDriver connDriver = null;
String confirm = "" ,siteCode = ""; String confirm = "";
String errString = "" ; String errString = "" ;
FinCommon finCommon = null;
GenericUtility genericUtility = null;
ITMDBAccessEJB itmDBAccessEJB = null; ITMDBAccessEJB itmDBAccessEJB = null;
try try
{ {
finCommon = new FinCommon();
genericUtility = new GenericUtility();
itmDBAccessEJB = new ITMDBAccessEJB(); itmDBAccessEJB = new ITMDBAccessEJB();
connDriver = new ConnDriver(); connDriver = new ConnDriver();
conn = connDriver.getConnectDB("DriverITM"); conn = connDriver.getConnectDB("DriverITM");
...@@ -56,7 +50,6 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -56,7 +50,6 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
if(rs.next()) if(rs.next())
{ {
confirm = rs.getString("confirmed"); confirm = rs.getString("confirmed");
siteCode = rs.getString("site_code");
} }
rs.close(); rs.close();
rs = null; rs = null;
...@@ -642,7 +635,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -642,7 +635,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
// Ended by Dipak // Ended by Dipak
revDt = (Timestamp)journalMap.get("rev_date"); revDt = (Timestamp)journalMap.get("rev_date");
amt = Double.parseDouble((String)journalMap.get("dr_amt")); //Added By Dipak On 22 Oct 2011 //amt = Double.parseDouble((String)journalMap.get("dr_amt")); //Added By Dipak On 22 Oct 2011
tranType = (String)journalMap.get("tran_type"); tranType = (String)journalMap.get("tran_type");
siteCodeRev = (String)journalMap.get("site_code__rev"); siteCodeRev = (String)journalMap.get("site_code__rev");
detRemarks = "Through reversal of JV :" +glTraceMap.get("ref_id"); detRemarks = "Through reversal of JV :" +glTraceMap.get("ref_id");
...@@ -687,7 +680,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -687,7 +680,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
pstmt.setString(8,detRemarks); pstmt.setString(8,detRemarks);
pstmt.setString(9,"N"); pstmt.setString(9,"N");
pstmt.setString(10,"V"); pstmt.setString(10,"V");
pstmt.setString(11,"N"); pstmt.setString(11,"Y");
pstmt.setString(12,revRefSer); pstmt.setString(12,revRefSer);
pstmt.setString(13,revRefId); pstmt.setString(13,revRefId);
pstmt.setString(14,(String)journalMap.get("curr_code")); pstmt.setString(14,(String)journalMap.get("curr_code"));
...@@ -728,12 +721,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -728,12 +721,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
glTraceMap.put("emp_code",detEmpCode); glTraceMap.put("emp_code",detEmpCode);
glTraceMap.put("anal_code ",detAnalCode == null ? "":detAnalCode); glTraceMap.put("anal_code ",detAnalCode == null ? "":detAnalCode);
glTraceMap.put("proj_code ",detProjCode == null ? "":detProjCode); glTraceMap.put("proj_code ",detProjCode == null ? "":detProjCode);
errString = Fcommon.glTraceUpdate(glTraceMap,conn);
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
// Endded by dipak
if ("C".equalsIgnoreCase(detDrcrFlag)) if ("C".equalsIgnoreCase(detDrcrFlag))
{ {
detDrcrFlag = "D"; detDrcrFlag = "D";
...@@ -743,6 +731,26 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -743,6 +731,26 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
detDrcrFlag = "C"; detDrcrFlag = "C";
} }
if ("D".equalsIgnoreCase (detDrcrFlag))
{
glTraceMap.put("dr_amt",amt);
glTraceMap.put("cr_amt","0");
}
else
{
glTraceMap.put("cr_amt",amt);
glTraceMap.put("dr_amt","0");
}
glTraceMap.put("ref_id",tranIDSer);
errString = Fcommon.glTraceUpdate(glTraceMap,conn);
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
// Endded by dipak
if (!(siteFr).equalsIgnoreCase(siteTo)) 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 "
...@@ -857,6 +865,18 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -857,6 +865,18 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
System.out.println("IBCAAConf : : ::" +IBCAAConf); System.out.println("IBCAAConf : : ::" +IBCAAConf);
} }
} //link = "P" } //link = "P"
else if (siteFr == siteTo)
{
IBCAAConf = "Y";
errString= gbfRetrieveJournal (tranId,xtraParams,conn);
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
IBCAAConf = "N";
System.out.println("IBCAAConf : : ::" +IBCAAConf);
}
}// amount }// amount
}// link type }// link type
sql =" update journal " sql =" update journal "
...@@ -946,6 +966,11 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -946,6 +966,11 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
siteCode = journalMap.get("site_code").toString().trim(); siteCode = journalMap.get("site_code").toString().trim();
siteCodeFor = journalMap.get("site_code__for").toString().trim(); siteCodeFor = journalMap.get("site_code__for").toString().trim();
if("Y".equalsIgnoreCase (journalMap.get("reversible").toString()))
{
errString = itmDBAccessEJB.getErrorString("","not allow","","",conn);
return errString;
}
//changes at 12/08/11 by chandni //changes at 12/08/11 by chandni
// header site_code validation // header site_code 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, "
......
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