Commit 9163982b 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@91531 ce508802-f39f-4f6c-b175-0d175dae99d5
parent fadc8801
...@@ -409,7 +409,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -409,7 +409,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
String acct = "",IBCAAConf = "",FinEnt ="",FinEntto="",val="",siteCodeJv = ""; String acct = "",IBCAAConf = "",FinEnt ="",FinEntto="",val="",siteCodeJv = "";
String detSundryType = "", detSundryCode = "",detAcctCode="",detCctrCode = "",detEmpCode = ""; String detSundryType = "", detSundryCode = "",detAcctCode="",detCctrCode = "",detEmpCode = "";
String detAnalCode = "",detAmount = "",detDrcrFlag= "",detRemarks= "",detProjCode = ""; String detAnalCode = "",detAmount = "",detDrcrFlag= "",detRemarks= "",detProjCode = "";
int ctr = 0 , ediOption = 0; int ctr = 0 ,ctrLine = 0, ediOption = 0;
double amt = 0; double amt = 0;
java.sql.Timestamp toDay = null; java.sql.Timestamp toDay = null;
java.sql.Timestamp revDt = null; java.sql.Timestamp revDt = null;
...@@ -480,17 +480,17 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -480,17 +480,17 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
} }
if(!("O".equalsIgnoreCase (detSundryType)) && (detSundryCode == null)) if(!("O".equalsIgnoreCase (detSundryType)) && (detSundryCode == null))
{ {glTraceMap.put("remarks",journalMap.get("remarks"));
sundryBalMap = new HashMap(); sundryBalMap = new HashMap();
sundryBalMap.put("tran_date",journalMap.get("tran_date")); sundryBalMap.put("tran_date",journalMap.get("tran_date"));
sundryBalMap.put("eff_date ",journalMap.get("eff_date")); sundryBalMap.put("eff_date",journalMap.get("eff_date"));
sundryBalMap.put("fin_entity",journalMap.get("fin_entity")); sundryBalMap.put("fin_entity",journalMap.get("fin_entity"));
sundryBalMap.put("site_code",journalMap.get("site_code")); sundryBalMap.put("site_code",journalMap.get("site_code"));
sundryBalMap.put("sundry_type",detSundryType == null ? "":detSundryType); sundryBalMap.put("sundry_type",detSundryType == null ? "":detSundryType);
sundryBalMap.put("sundry_code",detSundryCode == null ? "":detSundryCode); sundryBalMap.put("sundry_code",detSundryCode == null ? "":detSundryCode);
sundryBalMap.put("acct_code",detAcctCode == null ? "":detAcctCode); sundryBalMap.put("acct_code",detAcctCode == null ? "":detAcctCode);
sundryBalMap.put("cctr_code",detCctrCode == null ? "":detCctrCode); sundryBalMap.put("cctr_code",detCctrCode == null ? "":detCctrCode);
sundryBalMap.put("curr_code ",journalMap.get("curr_code")); sundryBalMap.put("curr_code",journalMap.get("curr_code"));
sundryBalMap.put("exch_rate",journalMap.get("exch_rate")); sundryBalMap.put("exch_rate",journalMap.get("exch_rate"));
if ("D".equalsIgnoreCase(detDrcrFlag)) if ("D".equalsIgnoreCase(detDrcrFlag))
{ {
...@@ -626,19 +626,23 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -626,19 +626,23 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
pstmt =null; pstmt =null;
FinEnt =(String)journalMap.get("fin_entity"); FinEnt =(String)journalMap.get("fin_entity");
revDt = (Timestamp)journalMap.get("rev_date");
System.out.println("revDt is equal ::"+revDt+"OR :::"+(Timestamp)journalMap.get("rev_date"));
// Added by Dipak 22Oct - start // Added by Dipak 22Oct - start
glTraceMap.put("tran_date",(journalMap.get("rev_date") == null ? "":journalMap.get("rev_date")));
glTraceMap.put("eff_date",(journalMap.get("rev_date") == null ? "":journalMap.get("rev_date")));
glTraceMap.put("fin_entity",(journalMap.get("fin_entity") == null ? "":journalMap.get("fin_entity"))); 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__rev"))); glTraceMap.put("site_code",(journalMap.get("site_code") == null ? "":journalMap.get("site_code__rev")));
glTraceMap.put("curr_code",(journalMap.get("curr_code") == null ? "":journalMap.get("curr_code"))); 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"))); glTraceMap.put("exch_rate",(journalMap.get("exch_rate") == null ? "":journalMap.get("exch_rate")));
// Ended by Dipak // Ended by Dipak
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");
detAnalCode = "" + glTraceMap.get("anal_code");//added by dipak on 3 nov 2011
revRefSer = "JOUR"; revRefSer = "JOUR";
revRefId = tranId; revRefId = tranId;
glTraceMap.put("proj_code",(journalMap.get("proj_code") == null ? "":journalMap.get("proj_code")));//Added By Dipak On 22 Oct 2011 glTraceMap.put("proj_code",(journalMap.get("proj_code") == null ? "":journalMap.get("proj_code")));//Added By Dipak On 22 Oct 2011
...@@ -698,7 +702,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -698,7 +702,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
+" values (?,?,?,?,?,?,?,?,?,?,?,?)"; +" values (?,?,?,?,?,?,?,?,?,?,?,?)";
pstmtInsert = conn.prepareStatement(sqlInsert); pstmtInsert = conn.prepareStatement(sqlInsert);
for (ctr =0; ctr < jourdetList.size(); ctr++) for (ctr =0, ctrLine = 0; ctr < jourdetList.size(); ctr++)
{ {
detListMap = new HashMap(); detListMap = new HashMap();
detListMap = (HashMap)jourdetList.get(ctr); detListMap = (HashMap)jourdetList.get(ctr);
...@@ -719,8 +723,11 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -719,8 +723,11 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
glTraceMap.put("acct_code",detAcctCode == null ? "":detAcctCode); glTraceMap.put("acct_code",detAcctCode == null ? "":detAcctCode);
glTraceMap.put("cctr_code",detCctrCode == null ? "":detCctrCode); glTraceMap.put("cctr_code",detCctrCode == null ? "":detCctrCode);
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);
//glTraceMap.put("anal_code",detAnalCode);//added by dipak on 3 Nov 2011
glTraceMap.put("remarks",detRemarks);
if ("C".equalsIgnoreCase(detDrcrFlag)) if ("C".equalsIgnoreCase(detDrcrFlag))
{ {
...@@ -779,10 +786,11 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -779,10 +786,11 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
detCctrCode = ccRcp ; detCctrCode = ccRcp ;
} }
} // end if (siteFr != siteTo) } // end if (siteFr != siteTo)
ctrLine = ctr + 1;
System.out.println(" SQL for journal insert :: "+sql); System.out.println(" SQL for journal insert :: "+sql);
pstmtInsert.setString(1,tranIDSer); pstmtInsert.setString(1,tranIDSer);
pstmtInsert.setInt(2,ctr); //pstmtInsert.setInt(2,ctr);
pstmtInsert.setInt(2,ctrLine);
pstmtInsert.setString(3,detSundryType); pstmtInsert.setString(3,detSundryType);
pstmtInsert.setString(4,detSundryCode); pstmtInsert.setString(4,detSundryCode);
pstmtInsert.setString(5,detAcctCode); pstmtInsert.setString(5,detAcctCode);
...@@ -816,7 +824,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -816,7 +824,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
FinEntto = rs.getString(1); FinEntto = rs.getString(1);
} }
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt =null; pstmt =null;
...@@ -1634,4 +1642,4 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -1634,4 +1642,4 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
} }
return errString; return errString;
}//method end }//method end
} //end of class } //end of class
\ No newline at end of file
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