Commit 0671731a authored by pchavan's avatar pchavan

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@192484 ce508802-f39f-4f6c-b175-0d175dae99d5
parent ad2c4a19
...@@ -680,10 +680,11 @@ public class MiscRcpConf extends ActionHandlerEJB implements MiscRcpConfLocal,M ...@@ -680,10 +680,11 @@ public class MiscRcpConf extends ActionHandlerEJB implements MiscRcpConfLocal,M
} }
// update currency fluctuation to gltrace // update currency fluctuation to gltrace
glTrace = new HashMap(); //glTrace = new HashMap(); //Changed By PriyankaC on 30OCt2018
diffAmtExch = (double) tranHdrMap.get("diff_amt__exch"); diffAmtExch = (double) tranHdrMap.get("diff_amt__exch");
if(diffAmtExch != 0) if(diffAmtExch != 0)
{ {
glTrace = new HashMap(); //Changed By PriyankaC on 30OCt2018
glTrace.put("tran_date", tranHdrMap.get("tran_date")); glTrace.put("tran_date", tranHdrMap.get("tran_date"));
glTrace.put("eff_date", tranHdrMap.get("eff_date")); glTrace.put("eff_date", tranHdrMap.get("eff_date"));
glTrace.put("fin_entity", tranHdrMap.get("fin_entity")); glTrace.put("fin_entity", tranHdrMap.get("fin_entity"));
...@@ -785,7 +786,7 @@ public class MiscRcpConf extends ActionHandlerEJB implements MiscRcpConfLocal,M ...@@ -785,7 +786,7 @@ public class MiscRcpConf extends ActionHandlerEJB implements MiscRcpConfLocal,M
{ {
tranId = (String) glTrace.get("ref_id"); tranId = (String) glTrace.get("ref_id");
System.out.println("tranId--["+tranId+"]"); System.out.println("tranId--["+tranId+"]");
tranId = (String) tranHdrMap.get("tran_id"); //tranId = (String) tranHdrMap.get("tran_id");
System.out.println("tranId----["+tranId+"]"); System.out.println("tranId----["+tranId+"]");
System.out.println("tranHdrMap---["+tranHdrMap+"]"); System.out.println("tranHdrMap---["+tranHdrMap+"]");
sql = "update misc_receipt set confirmed = 'Y', conf_date = ?, emp_code__aprv = ? "+ sql = "update misc_receipt set confirmed = 'Y', conf_date = ?, emp_code__aprv = ? "+
...@@ -1147,7 +1148,10 @@ public class MiscRcpConf extends ActionHandlerEJB implements MiscRcpConfLocal,M ...@@ -1147,7 +1148,10 @@ public class MiscRcpConf extends ActionHandlerEJB implements MiscRcpConfLocal,M
} }
else else
{ {
glTrace.put("dr_amt", 0 - (Integer)detailRow.get("amount") ); //Changed By PriyankaC on 30OCt2018 [START]
//glTrace.put("dr_amt", 0 - (Integer)detailRow.get("amount") );
glTrace.put("dr_amt", 0 - (double)detailRow.get("amount") );
//Changed By PriyankaC on 30OCt2018 [END]
glTrace.put("cr_amt", 0.0); glTrace.put("cr_amt", 0.0);
} }
glTrace.put("exch_rate",headerMap.get("exch_rate")); glTrace.put("exch_rate",headerMap.get("exch_rate"));
...@@ -1220,8 +1224,11 @@ public class MiscRcpConf extends ActionHandlerEJB implements MiscRcpConfLocal,M ...@@ -1220,8 +1224,11 @@ public class MiscRcpConf extends ActionHandlerEJB implements MiscRcpConfLocal,M
contactCode = fincommon.getContactCode((String)sundryBal.get("sundry_type"),(String)sundryBal.get("sundry_code"), conn); contactCode = fincommon.getContactCode((String)sundryBal.get("sundry_type"),(String)sundryBal.get("sundry_code"), conn);
sundryBal.put("contact_code", contactCode); sundryBal.put("contact_code", contactCode);
//Changed By PriyankaC on 30OCt2018[START]
// retString = fincommon.gbf_sundrybal_upd(glTrace, conn);
retString = fincommon.gbf_sundrybal_upd(sundryBal, conn);
//Changed By PriyankaC on 30OCt2018[END]
retString = fincommon.gbf_sundrybal_upd(glTrace, conn);
System.out.println("retString--@@@@@@["+retString+"]"); System.out.println("retString--@@@@@@["+retString+"]");
if(retString != null && retString.trim().length() > 0 ) if(retString != null && retString.trim().length() > 0 )
{ {
......
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