Skip to content

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

changes done for solving issue 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91534 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 24996a15
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 14 deletions
webitm-fin/ibase/webitm/ejb/fin/adv/JvConfirm.java
View file @ 0432645d
...@@ -446,7 +446,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -446,7 +446,7 @@ 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("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")));
if ("D".equalsIgnoreCase (detDrcrFlag)) if ("D".equalsIgnoreCase (detDrcrFlag))
...@@ -728,7 +728,6 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -728,7 +728,6 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
//glTraceMap.put("anal_code",detAnalCode);//added by dipak on 3 Nov 2011 //glTraceMap.put("anal_code",detAnalCode);//added by dipak on 3 Nov 2011
glTraceMap.put("remarks",detRemarks); glTraceMap.put("remarks",detRemarks);
if ("C".equalsIgnoreCase(detDrcrFlag)) if ("C".equalsIgnoreCase(detDrcrFlag))
{ {
detDrcrFlag = "D"; detDrcrFlag = "D";
...@@ -756,8 +755,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -756,8 +755,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
return errString; return errString;
} }
// Endded by dipak // 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 "
...@@ -1110,7 +1108,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -1110,7 +1108,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
glTraceMap.put("acct_code",acctCode); glTraceMap.put("acct_code",acctCode);
glTraceMap.put("cctr_code",detCctrCode); glTraceMap.put("cctr_code",detCctrCode);
glTraceMap.put("emp_code",detEmpCode); glTraceMap.put("emp_code",detEmpCode);
glTraceMap.put("anal_code ",detAnalCode); glTraceMap.put("anal_code",detAnalCode);
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")));
...@@ -1125,7 +1123,6 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -1125,7 +1123,6 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
glTraceMap.put("dr_amt","0"); glTraceMap.put("dr_amt","0");
} }
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")));
System.out.println("fin entity inserted into gltrace 1 : : "+finEntityFr);
glTraceMap.put("ref_type","F"); glTraceMap.put("ref_type","F");
glTraceMap.put("ref_ser","JOUR"); glTraceMap.put("ref_ser","JOUR");
glTraceMap.put("ref_id",tranId); glTraceMap.put("ref_id",tranId);
...@@ -1201,7 +1198,8 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -1201,7 +1198,8 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
glTraceMap.put("acct_code",acctCodePay); //ibca-pay acctcode glTraceMap.put("acct_code",acctCodePay); //ibca-pay acctcode
glTraceMap.put("cctr_code",detCctrCode); glTraceMap.put("cctr_code",detCctrCode);
glTraceMap.put("emp_code",detEmpCode); glTraceMap.put("emp_code",detEmpCode);
glTraceMap.put("anal_code ",detAnalCode); //glTraceMap.put("anal_code",detAnalCode);
glTraceMap.put("anal_code","");
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")));
if("D".equalsIgnoreCase(detDrcrFlag)) if("D".equalsIgnoreCase(detDrcrFlag))
...@@ -1274,7 +1272,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -1274,7 +1272,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
confirm = journalMap.get("confirmed").toString().trim(); confirm = journalMap.get("confirmed").toString().trim();
if (!("Y".equalsIgnoreCase(confirm))) if (!("Y".equalsIgnoreCase(confirm)))
{ {
sql = " update journal set confirmed = 'Y' , " sql =" update journal set confirmed = 'Y' , "
+" conf_date = ?, " +" conf_date = ?, "
+" emp_code__aprv = ? " +" emp_code__aprv = ? "
+" where tran_id = ? " ; +" where tran_id = ? " ;
...@@ -1323,7 +1321,6 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -1323,7 +1321,6 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
pstmt.close();pstmt =null; pstmt.close();pstmt =null;
System.out.println("keyStr :::"+keyStr); System.out.println("keyStr :::"+keyStr);
FinEnt =(String)journalMap.get("fin_entity"); FinEnt =(String)journalMap.get("fin_entity");
revDt = (Timestamp)journalMap.get("tran_date"); revDt = (Timestamp)journalMap.get("tran_date");
tranType = (String)journalMap.get("tran_type"); tranType = (String)journalMap.get("tran_type");
...@@ -1353,8 +1350,10 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -1353,8 +1350,10 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
{ {
FinEntitySite = rs.getString("fin_entity"); FinEntitySite = rs.getString("fin_entity");
} }
rs.close(); rs = null; rs.close();
pstmt.close();pstmt =null; 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 , " +" (tran_id, tran_date, eff_date, fin_entity, site_code, dr_amt, cr_amt , "
...@@ -1459,7 +1458,8 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -1459,7 +1458,8 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
pstmt.setString(7,detDrcrFlag); pstmt.setString(7,detDrcrFlag);
pstmt.setDouble(8,amount); pstmt.setDouble(8,amount);
pstmt.setString(9,detEmpCode); pstmt.setString(9,detEmpCode);
pstmt.setString(10,(String)journalMap.get("anal_code")); //pstmt.setString(10,(String)journalMap.get("anal_code"));
pstmt.setString(10,detAnalCode);
pstmt.setString(11,detRemarks); pstmt.setString(11,detRemarks);
pstmt.setString(12,detProjCode); pstmt.setString(12,detProjCode);
pstmt.addBatch(); pstmt.addBatch();
...@@ -1474,7 +1474,8 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -1474,7 +1474,8 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
jdetMap.put("amount",amountStr); jdetMap.put("amount",amountStr);
jdetMap.put("emp_code",(journalMap.get("curr_code") == null ? "":journalMap.get("curr_code"))); jdetMap.put("emp_code",(journalMap.get("curr_code") == null ? "":journalMap.get("curr_code")));
jdetMap.put("emp_code",detEmpCode); jdetMap.put("emp_code",detEmpCode);
jdetMap.put("anal_code",(journalMap.get("anal_code") == null ? "":journalMap.get("anal_code"))); //jdetMap.put("anal_code",(journalMap.get("anal_code") == null ? "":journalMap.get("anal_code")));
jdetMap.put("anal_code",detAnalCode);
jdetMap.put("sundry_type",detSundryType); jdetMap.put("sundry_type",detSundryType);
jdetMap.put("sundry_code",detSundryCode); jdetMap.put("sundry_code",detSundryCode);
jdetMap.put("remarks",detRemarks); jdetMap.put("remarks",detRemarks);
...@@ -1535,7 +1536,8 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -1535,7 +1536,8 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
glTraceMap.put("acct_code",acctCodeRcp); //ibca-pay acctcode glTraceMap.put("acct_code",acctCodeRcp); //ibca-pay acctcode
glTraceMap.put("cctr_code",detCctrCode); glTraceMap.put("cctr_code",detCctrCode);
glTraceMap.put("emp_code",detEmpCode); glTraceMap.put("emp_code",detEmpCode);
glTraceMap.put("anal_code ",detAnalCode); //glTraceMap.put("anal_code",detAnalCode);
glTraceMap.put("anal_code","");
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")));
if ("D".equalsIgnoreCase (detDrcrFlag)) if ("D".equalsIgnoreCase (detDrcrFlag))
......
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