Skip to content

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

changes in remarks field in gltrace 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91460 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 386df5ab
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 74 deletions
webitm-fin/ibase/webitm/ejb/fin/adv/JvConfirm.java
View file @ 7068eb1f
......@@ -316,12 +316,6 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
}//end of try
catch(ITMException ie)
{
/*try
{
conn.rollback();
}
catch(Exception t){}
ie.printStackTrace();*/
errString = itmDBAccessEJB.getErrorString("","VTDESNCONF","","",conn);
System.out.println("Returnng String From gbfRetrieveJournal :"+errString);
throw new ITMException(ie);
......@@ -410,8 +404,8 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
detAnalCode = (String) detListMap.get("anal_code");
detAmount = (String) detListMap.get("amount");
detDrcrFlag = (String) detListMap.get("drcr_flag");
detRemarks = (String) detListMap.get("remarks ");
detProjCode = (String) detListMap.get("proj_code ");
detRemarks = (String) detListMap.get("remarks");
detProjCode = (String) detListMap.get("proj_code");
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")));
......@@ -439,13 +433,13 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
glTraceMap.put("ref_ser","JOUR");
glTraceMap.put("ref_id",tranId);
if(("null").equalsIgnoreCase(detRemarks))
if (detRemarks == null || detRemarks.trim().length() == 0)
{
glTraceMap.put("remarks ",journalMap.get("remarks"));
glTraceMap.put("remarks",journalMap.get("remarks"));
}
else
{
glTraceMap.put("remarks ",detRemarks);
glTraceMap.put("remarks",detRemarks);
}
glTraceMap.put("proj_code",detProjCode);
......@@ -454,8 +448,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
{
return errString;
}
//Fcommon =null;
if(!("O".equalsIgnoreCase (detSundryType)))
{
sundryBalMap = new HashMap();
......@@ -482,10 +475,8 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
sundryBalMap.put("adv_amt", "0");
sundryBalMap.put("contact_code",Fcommon.getContactCode(detSundryType,detSundryCode,conn));
//Fcommon = null;
errString = Fcommon.gbf_sundrybal_upd(sundryBalMap,conn);
}
//Fcommon =null;
if(errString != null && errString.trim().length() > 0)
{
return errString;
......@@ -534,7 +525,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
}
else
{
sql = " select link_type from ibca_pay_ctrl "
sql =" select link_type from ibca_pay_ctrl "
+" where site_code__from = ? and site_code__to = ?" ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteFr);
......@@ -583,7 +574,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
pstmt.close();
pstmt =null;
sql = " select sum(amount) as debit from jourdet "
sql =" select sum(amount) as debit from jourdet "
+" where tran_id = ? and drcr_flag = 'D' ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
......@@ -604,7 +595,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
tranType = (String)journalMap.get("tran_type");
siteCodeRev = (String)glTraceMap.get("site_code__rev");
System.out.println("siteCode is : : :"+siteCode);
detRemarks = " Through reversal of JV :" +glTraceMap.get("ref_id");
detRemarks = "Through reversal of JV :" +glTraceMap.get("ref_id");
revRefSer = "JOUR";
revRefId = tranId;
......@@ -628,7 +619,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
errString = itmDBAccessEJB.getErrorString("","VTTRANID","","",conn);
return errString;
}
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 ) "
......@@ -657,7 +648,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
pstmt.executeUpdate();
pstmt.close();
sqlInsert = " insert into jourdet "
sqlInsert =" 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 (?,?,?,?,?,?,?,?,?,?,?,?)";
......@@ -719,9 +710,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
} // end if (siteFr != siteTo)
System.out.println(" SQL for journal insert :: "+sql);
//pstmtInsert = conn.prepareStatement(sqlInsert);
pstmtInsert.setString(1,tranIDSer);
System.out.println("after tranid ser :"+tranIDSer);
pstmtInsert.setInt(2,ctr);
pstmtInsert.setString(3,detSundryType);
pstmtInsert.setString(4,detSundryCode);
......@@ -747,7 +736,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
if ("P".equalsIgnoreCase(link))
{
sql = " select fin_entity from site where site_code = ? " ;
sql =" select fin_entity from site where site_code = ? " ;
pstmt = conn.prepareStatement(sql);
pstmt.setString (1,siteTo);
rs = pstmt.executeQuery();
......@@ -800,7 +789,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
} //link = "P"
}// amount
}// link type
sql = " update journal "
sql =" update journal "
+" set status = 'R', "
+" rev_date__act = ? "
+" where tran_id = ? ";
......@@ -913,13 +902,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
rs = null;
pstmt.close();
pstmt = null;
/*
if (Math.abs(drAmt - crAmt) != 0 )
{
errString = itmDBAccessEJB.getErrorString("","VTVCONF3","","",conn);
return errString;
}*/
//header site_code__for validation
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 "
......@@ -939,12 +922,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
rs = null;
pstmt.close();
pstmt = null;
/*
if (Math.abs(drAmt - crAmt) != 0 )
{
errString = itmDBAccessEJB.getErrorString("","VTVCONF3","","",conn);
return errString;
}*/
if(drAmt != crAmtFor && crAmt != drAmtFor)
{
errString = itmDBAccessEJB.getErrorString("","VTVCONF3","","",conn);
......@@ -1055,13 +1033,13 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
glTraceMap.put("ref_ser","JOUR");
glTraceMap.put("ref_id",tranId);
if("null".equalsIgnoreCase(detRemarks))
if (detRemarks == null || detRemarks.trim().length() == 0)
{
glTraceMap.put("remarks ",journalMap.get("remarks"));
glTraceMap.put("remarks",journalMap.get("remarks"));
}
else
{
glTraceMap.put("remarks ",detRemarks);
glTraceMap.put("remarks",detRemarks);
}
glTraceMap.put("proj_code",detProjCode);
......@@ -1114,8 +1092,10 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
rs = null;
pstmt.close();
pstmt = null;
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")));
......@@ -1128,7 +1108,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
glTraceMap.put("anal_code ",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))
if("D".equalsIgnoreCase(detDrcrFlag))
{
glTraceMap.put("dr_amt","0");
glTraceMap.put("cr_amt",detAmount);
......@@ -1141,18 +1121,11 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
glTraceMap.put("ref_type","F");
glTraceMap.put("ref_ser","JOUR");
glTraceMap.put("ref_id",tranId);
if("null".equalsIgnoreCase(detRemarks))
{
glTraceMap.put("remarks ",journalMap.get("remarks"));
}
else
{
glTraceMap.put("remarks ",detRemarks);
}
glTraceMap.put("remarks","");
glTraceMap.put("proj_code",detProjCode);
errString = Fcommon.glTraceUpdate(glTraceMap,conn);
if(!("O".equalsIgnoreCase (detSundryType)))
{
sundryBalMap = new HashMap();
......@@ -1254,7 +1227,6 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
CommonConstants.setIBASEHOME();
TransIDGenerator tg = new TransIDGenerator(xmlString,"Base",CommonConstants.DB_NAME);
tranIDSer = tg.generateTranSeqID("JOUR","tran_id",keyStr,conn);
//System.out.println("connection status =["+conn.isClosed()+"]");
System.out.println("Generated Key :: "+tranIDSer);
if (tranIDSer.indexOf("ERROR") > -1 )
{
......@@ -1281,9 +1253,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
pstmt.setString(1,tranIDSer); //new generated tranId
pstmt.setTimestamp(2,revDt);
pstmt.setTimestamp(3,revDt);
//pstmt.setString(4,(String)journalMap.get("fin_entity"));
pstmt.setString(4,FinEntitySite);
//pstmt.setString(5,(String)journalMap.get("site_code"));
//changed at 12/08/11 by chandni
pstmt.setString(5,siteCodeFor);
pstmt.setDouble(6,detAmount); // set total amount of detail.
......@@ -1353,7 +1323,6 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
{
detAcctCode = rs.getString(1);
detDrcrFlag = rs.getString(2);
//amount = rs.getDouble(3);
amountStr = rs.getString(3);
detSundryType =rs.getString(4);
detSundryCode =rs.getString(5);
......@@ -1366,8 +1335,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
/* calculating total amount*/
amount = Double.parseDouble (amountStr);
totAmount = totAmount + amount ;
System.out.println ("totAmount is : : : "+ totAmount);
System.out.println(" SQL for jourdet insert for acct effect :: "+sql);
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranIDSer); // new generated tran_id
......@@ -1379,7 +1347,6 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
pstmt.setString(6,detCctrCode);
pstmt.setString(7,detDrcrFlag);
pstmt.setDouble(8,amount);
//pstmt.setString(9,(String)journalMap.get("emp_code"));
pstmt.setString(9,detEmpCode);
pstmt.setString(10,(String)journalMap.get("anal_code"));
pstmt.setString(11,detRemarks);
......@@ -1429,9 +1396,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
+" drcr_flag, amount, emp_code, anal_code,remarks,proj_code ) "
+" values (?,?,?,?,?,?,?,?,?,?,?,?)";
System.out.println(" SQL for jourdet insert with total amount:: "+sql);
System.out.println(" totAmount in insert :: "+totAmount);
System.out.println(" tranIDSer in insert :: "+tranIDSer);
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranIDSer); // new generated tran_id
pstmt.setInt(2,cnt1);
......@@ -1450,7 +1415,6 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
//added at 12/08/11 by chandni
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")));
glTraceMap.put("fin_entity",FinEntitySite);
//glTraceMap.put("site_code",siteCode); // from header : siteCode
//changed at 12/08/11 by chandni
......@@ -1476,15 +1440,8 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
glTraceMap.put("ref_type","F");
glTraceMap.put("ref_ser","JOUR");
glTraceMap.put("ref_id",tranIDSer);
if("null".equalsIgnoreCase(detRemarks))
{
glTraceMap.put("remarks ",journalMap.get("remarks"));
}
else
{
glTraceMap.put("remarks ",detRemarks);
}
glTraceMap.put("remarks","");
glTraceMap.put("proj_code",detProjCode);
errString = Fcommon.glTraceUpdate(glTraceMap,conn);
......@@ -1493,9 +1450,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
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("fin_entity",FinEntitySite);
//sundryBalMap.put("site_code",siteCode); // from header : siteCode
sundryBalMap.put("site_code",siteCodeFor); // from header : siteCode
sundryBalMap.put("sundry_type",detSundryType);
sundryBalMap.put("sundry_code",detSundryCode);
......@@ -1522,7 +1477,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
}
/* accounting effect for site code for - auto generation site - end */
/* in original tran id journal set ref_no = new created tran_id */
sql = " update journal "
sql =" update journal "
+" set ref_no = ? "
+" where tran_id = ? ";
pstmt = conn.prepareStatement(sql);
......
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