Skip to content

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

changes done in post method for reversible is Y 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91480 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c056a1ef
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 35 deletions
webitm-fin/ibase/webitm/ejb/fin/adv/JvConfirm.java
View file @ a742477d
......@@ -399,8 +399,8 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
ResultSet rs = null;
ResultSet rs1 = null;
String errString = "" ;
String sql = "",sql1 = "",sqlInsert = "";
String xmlString = "";
String sql ="",sql1 = "",sqlInsert = "";
String xmlString ="";
ConnDriver connDriver = null;
GenericUtility genericUtility = null;
ITMDBAccessEJB itmDBAccessEJB = null;
......@@ -479,7 +479,7 @@ 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)
{
......@@ -534,15 +534,14 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
if (errString != null && errString.indexOf("Error") != -1 )
{
System.out.println("Returning Result "+errString);
//conn.rollback();
return errString;
}
else
{
confirm = (String)journalMap.get("confirmed");
if (!("Y".equalsIgnoreCase(confirm)))
{
System.out.println("inside Y is equal :");
sql = " update journal set confirmed = 'Y' , "
+" conf_date = ?, "
+" emp_code__aprv = ? "
......@@ -553,15 +552,17 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
pstmt.setString(2,empCodeAprv);
pstmt.setString(3,tranId);
int upd = pstmt.executeUpdate();
/*
System.out.println(" journal Confirmed:: "+upd);
errString = itmDBAccessEJB.getErrorString("","VTCONF","");
errString = itmDBAccessEJB.getErrorString("","VTCONF",""); */
pstmt.close();
pstmt = null;
}
if("Y".equalsIgnoreCase (journalMap.get("reversible").toString()) && "Y".equalsIgnoreCase (journalMap.get("auto_rev").toString()) && "N".equalsIgnoreCase (journalMap.get("status").toString()))
if(("Y".equalsIgnoreCase (journalMap.get("reversible").toString())) && ("Y".equalsIgnoreCase (journalMap.get("auto_rev").toString())) && ("N".equalsIgnoreCase (journalMap.get("status").toString())))
{
siteFr =(String)journalMap.get("site_code");
siteTo = (String)journalMap.get("site_code__rev");
if (siteFr.equalsIgnoreCase(siteTo))
{
link = "A";
......@@ -569,7 +570,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
else
{
sql =" select link_type from ibca_pay_ctrl "
+" where site_code__from = ? and site_code__to = ?" ;
+" where site_code__from = ? and site_code__to = ?" ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteFr);
pstmt.setString(2,siteTo);
......@@ -583,11 +584,10 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
pstmt.close();
pstmt =null;
}
System.out.println("link :::"+link);
if ("P".equalsIgnoreCase (link) || "A".equalsIgnoreCase(link))
{
thisWin ="W_JOURNAL" ;
sql = " select key_string from transetup where upper(tran_window) = ? ";
sql =" select key_string from transetup where upper(tran_window) = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,thisWin);
rs = pstmt.executeQuery();
......@@ -598,7 +598,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();
......@@ -611,7 +611,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
pstmt1.close();
pstmt1 =null;
}
System.out.println("keyStr :::"+keyStr);
rs.close();
rs = null;
pstmt.close();
......@@ -626,7 +626,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
{
amt = rs.getDouble(1);
}
System.out.println("amt :::"+amt);
rs.close();
rs = null;
pstmt.close();
......@@ -636,23 +636,23 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
revDt = (Timestamp)journalMap.get("rev_date");
//amt = Double.parseDouble((String)journalMap.get("dr_amt"));
tranType = (String)journalMap.get("tran_type");
siteCodeRev = (String)glTraceMap.get("site_code__rev");
System.out.println("siteCode is : : :"+siteCode);
siteCodeRev = (String)journalMap.get("site_code__rev");
detRemarks = "Through reversal of JV :" +glTraceMap.get("ref_id");
revRefSer = "JOUR";
revRefId = tranId;
if (amt > 0 )
{
// generate key
xmlString = "<?xml version=\"1.0\"?>\r\n<Root>\r\n<header>"+
"\r\n</header><Detail1><item_ser></item_ser>"+
"\r\n<site_code>"+siteCodeRev+"</site_code>\r\n<tran_date>"+
sdf.format(new java.util.Date(revDt.getTime()))+"</tran_date>\r\n<eff_date>"+
sdf.format(new java.util.Date(revDt.getTime()))+"</eff_date>"+
"\r\n<tran_type>"+tranType+"</tran_type>\r\n<reversible>"+"N"+"</reversible>+</Detail1></Root>";
String revS = "N";
xmlString ="<?xml version=\"1.0\"?>\r\n<Root>\r\n<header>"+
"\r\n</header><Detail1><item_ser></item_ser>"+
"\r\n<site_code>"+siteCodeRev+"</site_code>\r\n<tran_date>"+sdf.format(new java.util.Date(revDt.getTime()))+"</tran_date>"+
"\r\n<eff_date>"+sdf.format(new java.util.Date(revDt.getTime()))+"</eff_date>"+
"\r\n<tran_type>"+tranType+"</tran_type>\r\n<reversible>"+revS+"</reversible>+</Detail1></Root>";
System.out.println("xmlString is :: :: :: "+xmlString);
System.out.println("xmlString is equal:: :: :: "+xmlString);
TransIDGenerator tg = new TransIDGenerator(xmlString,"Base","oracle");
tranIDSer = tg.generateTranSeqID("JOUR","tran_id",keyStr,conn);
......@@ -687,7 +687,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
pstmt.setString(16,(String)journalMap.get("exch_rate"));
pstmt.setTimestamp(17,toDay);
pstmt.setString(18,empCodeAprv);
pstmt.setString(19,journalMap.get("proj_code").toString());
pstmt.setString(19,(String)journalMap.get("proj_code"));
pstmt.executeUpdate();
pstmt.close();
......@@ -695,7 +695,6 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
+" ( tran_id, line_no, sundry_type,sundry_code, acct_code,cctr_code, "
+" drcr_flag, amount, emp_code, anal_code,remarks,proj_code ) "
+" values (?,?,?,?,?,?,?,?,?,?,?,?)";
System.out.println(" SQL for jourdet insert for acct effect :: "+sql);
pstmtInsert = conn.prepareStatement(sqlInsert);
for (ctr =0; ctr < jourdetList.size(); ctr++)
......@@ -908,14 +907,14 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
String revRefSer = "",tranType = "",confirm = "",empCodeAprv="";
String FinEnt ="",siteCode = "",siteCodeJv = "",siteCodeFor = "";
String detSundryType = "", detSundryCode = "",detAcctCode="",detCctrCode = "",detEmpCode = "";
String detAnalCode = "",detDrcrFlag= "",detRemarks= "",detProjCode = "";
String detAnalCode = "",detDrcrFlag= "",detRemarks= "",detProjCode = "",reversible="",autoRev="";
int ctr = 1,cnt1 = 0 ;
double drAmt = 0,crAmt = 0,drAmtFor = 0,crAmtFor = 0,detAmount = 0,totAmount = 0,amount = 0;
java.sql.Timestamp toDay = null;
java.sql.Timestamp revDt = null;
SimpleDateFormat sdf = null;
StringBuffer xmlBuff = null;
String finEntityFr = "",acctCodeRcp = "",acctCodePay = "",autoConf="";
String finEntityFr = "",acctCodeRcp = "",acctCodePay = "",autoConf="",siteCodeRev="";
String acctCode = "",finEntity = "";
FinCommon Fcommon = new FinCommon();
try
......@@ -928,7 +927,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
//changes at 12/08/11 by chandni
// 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, "
+" sum(case when drcr_flag = 'C' then amount else 0 end) credit from jourdet "
+" where tran_id = ? "
+" and site_code__jv = ? " ;
......@@ -1139,7 +1138,6 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
if(cnt1 > 0 )
{
System.out.println("inside cnt1 if ::::::::::::::::::::::::::::::::::::::::::::");
glTraceMap.put("tran_date",(journalMap.get("tran_date") == null ? "":journalMap.get("tran_date")));
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")));
......@@ -1243,7 +1241,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
{
//code to find key_string for calling TransIDGenerator - generateTranSeqID.
thisWin ="W_JOURNAL" ;
sql = " select key_string from transetup where upper(tran_window) = ? ";
sql =" select key_string from transetup where upper(tran_window) = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,thisWin);
rs = pstmt.executeQuery();
......@@ -1275,8 +1273,10 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
FinEnt =(String)journalMap.get("fin_entity");
revDt = (Timestamp)journalMap.get("tran_date");
tranType = (String)journalMap.get("tran_type");
revRefSer = "JOUR";
revRefSer = "JOUR";
reversible = (String)journalMap.get("reversible");
autoRev = (String)journalMap.get("auto_rev");
siteCodeRev =(String)journalMap.get("site_code__rev");
xmlString = "<?xml version=\"1.0\"?>\r\n<Root>\r\n<header>"+
"\r\n</header><Detail1><item_ser></item_ser>"+
"\r\n<site_code>"+siteCodeFor+"</site_code>\r\n<tran_date>"+sdf.format(new java.util.Date(revDt.getTime()))+"</tran_date></Detail1></Root>";
......@@ -1364,7 +1364,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
pstmt1 = null;
/* accounting effect for site code for - auto generation site - start */
sql = " insert into jourdet "
sql =" insert into jourdet "
+" ( tran_id, line_no, sundry_type,sundry_code, acct_code,cctr_code, "
+" drcr_flag, amount, emp_code, anal_code, remarks,proj_code ) "
+" values (?,?,?,?,?,?,?,?,?,?,?,?)";
......@@ -1395,10 +1395,8 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
amount = Double.parseDouble (amountStr);
totAmount = totAmount + amount ;
System.out.println(" SQL for jourdet insert for acct effect :: "+sql);
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranIDSer); // new generated tran_id
System.out.println("after tranid ser :"+tranIDSer);
pstmt.setInt(2,ctr);
pstmt.setString(3,detSundryType);
pstmt.setString(4,detSundryCode);
......
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