Skip to content

B
business-java
Commit 868495e3 authored by kshinde's avatar kshinde
Browse files
Options

Bug fix 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@43804 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 1a74021b
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 39 deletions
webitm-fin/ibase/webitm/ejb/fin/adv/PayIbcaConf.java
View file @ 868495e3
...@@ -270,7 +270,7 @@ conn = getConnection(); ...@@ -270,7 +270,7 @@ conn = getConnection();
HdrMap.put("tran_date",rs.getTimestamp("tran_date")); HdrMap.put("tran_date",rs.getTimestamp("tran_date"));
HdrMap.put("tran_id",rs.getString("tran_id")); HdrMap.put("tran_id",rs.getString("tran_id"));
HdrMap.put("eff_date",rs.getString("eff_date")); HdrMap.put("eff_date",rs.getTimestamp("eff_date"));
HdrMap.put("site_code__from",rs.getString("site_code__from")); HdrMap.put("site_code__from",rs.getString("site_code__from"));
HdrMap.put("fin_entity__from",rs.getString("fin_entity__from")); HdrMap.put("fin_entity__from",rs.getString("fin_entity__from"));
HdrMap.put("site_code__to",rs.getString("site_code__to")); HdrMap.put("site_code__to",rs.getString("site_code__to"));
...@@ -317,8 +317,8 @@ conn = getConnection(); ...@@ -317,8 +317,8 @@ conn = getConnection();
DetMap.put("ref_no", rs.getString("ref_no")); DetMap.put("ref_no", rs.getString("ref_no"));
DetMap.put("ref_date", rs.getTimestamp("ref_date")); DetMap.put("ref_date", rs.getTimestamp("ref_date"));
DetMap.put("curr_code", rs.getString("curr_code")); DetMap.put("curr_code", rs.getString("curr_code"));
DetMap.put("acct_code", rs.getDouble("acct_code")); DetMap.put("acct_code", rs.getString("acct_code"));
DetMap.put("cctr_code", rs.getDouble("cctr_code")); DetMap.put("cctr_code", rs.getString("cctr_code"));
DetMap.put("due_date", rs.getTimestamp("due_date")); DetMap.put("due_date", rs.getTimestamp("due_date"));
DetMap.put("tot_amt", rs.getDouble("tot_amt")); DetMap.put("tot_amt", rs.getDouble("tot_amt"));
DetMap.put("discount", rs.getDouble("discount")); DetMap.put("discount", rs.getDouble("discount"));
...@@ -397,6 +397,7 @@ conn = getConnection(); ...@@ -397,6 +397,7 @@ conn = getConnection();
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getDBDateFormat()); SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getDBDateFormat());
tranDate = java.sql.Timestamp.valueOf(sdf.format(today) + " 00:00:00.000"); tranDate = java.sql.Timestamp.valueOf(sdf.format(today) + " 00:00:00.000");
sql = " update rcp_ibca set tran_date = ? where tran_id = ?" ; sql = " update rcp_ibca set tran_date = ? where tran_id = ?" ;
pstmt = conn.prepareStatement(sql);
pstmt.setTimestamp(1,tranDate); pstmt.setTimestamp(1,tranDate);
pstmt.setString(2,tranId); pstmt.setString(2,tranId);
pstmt.executeUpdate(); pstmt.executeUpdate();
...@@ -648,8 +649,11 @@ conn = getConnection(); ...@@ -648,8 +649,11 @@ conn = getConnection();
if(!linkType.equalsIgnoreCase("R") && !linkType.equalsIgnoreCase("C")) if(!linkType.equalsIgnoreCase("R") && !linkType.equalsIgnoreCase("C"))
{ {
System.out.println("Inside iF linktype");
System.out.println("Printing HASHMAP MAPHRD"+MapHrd);
tranDate = (Timestamp)MapHrd.get("tran_date"); tranDate = (Timestamp)MapHrd.get("tran_date");
refDate = (Timestamp)MapHrd.get("ref_date"); refDate = (Timestamp)MapHrd.get("ref_date");
effDate = (Timestamp)MapHrd.get("eff_date"); effDate = (Timestamp)MapHrd.get("eff_date");
...@@ -697,7 +701,8 @@ conn = getConnection(); ...@@ -697,7 +701,8 @@ conn = getConnection();
glTraceMap.put("ref_ser", "P-IBCA"); glTraceMap.put("ref_ser", "P-IBCA");
glTraceMap.put("ref_id", tranId); glTraceMap.put("ref_id", tranId);
glTraceMap.put("remarks", remarks); glTraceMap.put("remarks", remarks);
System.out.println("HASHMAP glTraceUpdate"+glTraceMap);
System.out.println("1766 glTraceUpdate Called.............."); System.out.println("1766 glTraceUpdate Called..............");
errString = finCommon.glTraceUpdate(glTraceMap,conn); errString = finCommon.glTraceUpdate(glTraceMap,conn);
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
...@@ -1095,6 +1100,7 @@ conn = getConnection(); ...@@ -1095,6 +1100,7 @@ conn = getConnection();
hexchRate = (Double)MapHrd.get("exch_rate"); hexchRate = (Double)MapHrd.get("exch_rate");
remarks = (String)MapHrd.get("remarks"); remarks = (String)MapHrd.get("remarks");
link = (String)MapHrd.get("link_type"); link = (String)MapHrd.get("link_type");
System.out.println("Link_type"+link);
System.out.println("DetList SIZE "+MapDet.size()); System.out.println("DetList SIZE "+MapDet.size());
System.out.println("DetList SIZE "+MapDet); System.out.println("DetList SIZE "+MapDet);
...@@ -1154,23 +1160,24 @@ conn = getConnection(); ...@@ -1154,23 +1160,24 @@ conn = getConnection();
sundryBalMap.put("eff_date",effDate); sundryBalMap.put("eff_date",effDate);
sundryBalMap.put("fin_entity", finEntity); sundryBalMap.put("fin_entity", finEntity);
sundryBalMap.put("site_code", siteCode); sundryBalMap.put("site_code", siteCode);
sundryBalMap.put("sundry_type", sundryType); sundryBalMap.put("sundry_type", (String)DetMap.get("sundry_type"));
sundryBalMap.put("sundry_code", sundryCode); sundryBalMap.put("sundry_code", (String)DetMap.get("sundry_code"));
sundryBalMap.put("acct_code", (String)DetMap.get("acct_code")); sundryBalMap.put("acct_code", (String)DetMap.get("acct_code"));
sundryBalMap.put("cctr_code", (String)DetMap.get("cctr_code")==null?"":(String)DetMap.get("cctr_code")); sundryBalMap.put("cctr_code", (String)DetMap.get("cctr_code")==null?"":(String)DetMap.get("cctr_code"));
sundryBalMap.put("curr_code", (String)DetMap.get("curr_code")==null?hcurrCode:(String)DetMap.get("curr_code")); sundryBalMap.put("curr_code", (String)DetMap.get("curr_code")==null?hcurrCode:(String)DetMap.get("curr_code"));
sundryBalMap.put("exch_rate", (Double)DetMap.get("exch_rate")); sundryBalMap.put("exch_rate", (Double)DetMap.get("exch_rate"));
amount = (Double)DetMap.get("tot_amt"); amount = (Double)DetMap.get("tot_amt");
System.out.println("SundryBalMAP amount"+amount);
if(amount > 0) if(amount > 0)
{ {
glTraceMap.put("dr_amt",amount); sundryBalMap.put("dr_amt",amount);
glTraceMap.put("cr_amt",0.0); sundryBalMap.put("cr_amt",0.0);
} }
else else
{ {
glTraceMap.put("dr_amt",0.0); sundryBalMap.put("dr_amt",0.0);
glTraceMap.put("cr_amt",0 - amount); sundryBalMap.put("cr_amt",0 - amount);
} }
sundryBalMap.put("adv_amt", 0.0); sundryBalMap.put("adv_amt", 0.0);
...@@ -1184,31 +1191,31 @@ conn = getConnection(); ...@@ -1184,31 +1191,31 @@ conn = getConnection();
return errString; return errString;
} }
}
System.out.println("last ..........."); System.out.println("last ...........");
for (int ctr =0; ctr < MapDet.size(); ctr++)
{
RcpDetMap = new HashMap(); RcpDetMap = new HashMap();
RcpDetMap = (HashMap) MapDet.get(ctr); RcpDetMap = (HashMap) MapDet.get(ctr);
refSer = (String)RcpDetMap.get("ref_ser"); refSer = (String)RcpDetMap.get("ref_ser");
refNo = (String)RcpDetMap.get("ref_no"); refNo = (String)RcpDetMap.get("ref_no");
amount = (Double)RcpDetMap.get("rcp_amt"); System.out.println("Ref_Ser"+refSer+"ref_no"+refNo);
lineNoPef = (String)RcpDetMap.get("line_no__ref"); //amount = (Double)RcpDetMap.get("rcp_amt");
amount = (Double)RcpDetMap.get("tot_amt");
//lineNoPef = (String)RcpDetMap.get("line_no__ref");
itmDBAccessEJB = new ITMDBAccessEJB(); itmDBAccessEJB = new ITMDBAccessEJB();
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{ {
sql = "SELECT tot_amt, adj_amt FROM receivables WHERE tran_ser = ? and ref_no = ? for update "; sql = "SELECT tot_amt, adj_amt FROM misc_payables WHERE tran_ser = ? and ref_no = ? for update ";
} }
else if ( "mssql".equalsIgnoreCase(CommonConstants.DB_NAME )) else if ( "mssql".equalsIgnoreCase(CommonConstants.DB_NAME ))
{ {
sql = "SELECT tot_amt, adj_amt FROM receivables (updlock) where tran_ser = ? and ref_no = ? " ; sql = "SELECT tot_amt, adj_amt FROM misc_payables (updlock) where tran_ser = ? and ref_no = ? " ;
} }
else else
{ {
sql =" SELECT tot_amt, adj_amt FROM receivables WHERE tran_ser = ? and ref_no = ? for update nowait" ; sql =" SELECT tot_amt, adj_amt FROM misc_payables WHERE tran_ser = ? and ref_no = ? for update nowait" ;
} }
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,refSer); pstmt.setString(1,refSer);
...@@ -1225,7 +1232,7 @@ conn = getConnection(); ...@@ -1225,7 +1232,7 @@ conn = getConnection();
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
if(Math.abs(amount - adjAmt) < Math.abs(amount)) if(Math.abs(totAmt - adjAmt) < Math.abs(amount))
{ {
errString = itmDBAccessEJB.getErrorString("","VTBAL1","","",conn); errString = itmDBAccessEJB.getErrorString("","VTBAL1","","",conn);
return errString; return errString;
...@@ -1239,14 +1246,14 @@ conn = getConnection(); ...@@ -1239,14 +1246,14 @@ conn = getConnection();
{ {
status = "P"; status = "P";
} }
sql = "update misc_payables set adj_amt = ?, status = ?,stat_date = ? where tran_ser = ? and ref_no = ? and line_no__ref = ? "; sql = "update misc_payables set adj_amt = ?, status = ?,status_date = ? where tran_ser = ? and ref_no = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1,adjAmt+amount); pstmt.setDouble(1,adjAmt+amount);
pstmt.setString(2,status); pstmt.setString(2,status);
pstmt.setDate(3,new java.sql.Date(new java.util.Date().getTime())); pstmt.setDate(3,new java.sql.Date(new java.util.Date().getTime()));
pstmt.setString(4,refSer); pstmt.setString(4,refSer);
pstmt.setString(5,refNo); pstmt.setString(5,refNo);
pstmt.setString(6,lineNoPef); //pstmt.setString(6,lineNoPef);
pstmt.executeUpdate(); pstmt.executeUpdate();
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
...@@ -1492,8 +1499,8 @@ conn = getConnection(); ...@@ -1492,8 +1499,8 @@ conn = getConnection();
bankCode = (String)MapHrd.get("bank_code"); bankCode = (String)MapHrd.get("bank_code");
acctCode = (String)MapHrd.get("acct_code__to"); acctCode = (String)MapHrd.get("acct_code__ito");
cctrCode = (String)MapHrd.get("cctr_code__to"); cctrCode = (String)MapHrd.get("cctr_code__ito");
currCode = (String)MapHrd.get("curr_code"); currCode = (String)MapHrd.get("curr_code");
exchRate = (Double)MapHrd.get("exch_rate"); exchRate = (Double)MapHrd.get("exch_rate");
...@@ -1613,6 +1620,7 @@ conn = getConnection(); ...@@ -1613,6 +1620,7 @@ conn = getConnection();
double adjAmt = 0.0; double adjAmt = 0.0;
double advAdj = 0.0; double advAdj = 0.0;
double recoverAmt = 0.0; double recoverAmt = 0.0;
double holdAmt=0.0;
Timestamp effDate = null; Timestamp effDate = null;
Timestamp tranDate = null; Timestamp tranDate = null;
Timestamp refDate = null; Timestamp refDate = null;
...@@ -1647,13 +1655,15 @@ conn = getConnection(); ...@@ -1647,13 +1655,15 @@ conn = getConnection();
tranId = (String)HdrMap.get("tranId"); tranId = (String)HdrMap.get("tranId");
tranDate = (Timestamp)HdrMap.get("tran_date"); tranDate = (Timestamp)HdrMap.get("tran_date");
effDate = (Timestamp)HdrMap.get("eff_date"); effDate = (Timestamp)HdrMap.get("eff_date");
finEntity = (String)HdrMap.get("fin_entity"); finEntity = (String)HdrMap.get("fin_entity__to");
siteCode = (String)HdrMap.get("site_code"); siteCode = (String)HdrMap.get("site_code__to");
System.out.println("Sitecode========="+siteCode);
siteCodeFor = (String)HdrMap.get("site_code__for"); siteCodeFor = (String)HdrMap.get("site_code__for");
projectCode = (String)HdrMap.get("proj_code"); projectCode = (String)HdrMap.get("proj_code");
hcurrCode = (String)HdrMap.get("curr_code"); hcurrCode = (String)HdrMap.get("curr_code");
hexchRate = (Double)HdrMap.get("exch_rate"); hexchRate = (Double)HdrMap.get("exch_rate");
remarks = (String)HdrMap.get("remarks"); remarks = (String)HdrMap.get("remarks");
System.out.println("DetList SIZE "+DetList.size()); System.out.println("DetList SIZE "+DetList.size());
System.out.println("DetList SIZE "+DetList); System.out.println("DetList SIZE "+DetList);
...@@ -1723,14 +1733,16 @@ conn = getConnection(); ...@@ -1723,14 +1733,16 @@ conn = getConnection();
sundryBalMap.put("eff_date",effDate); sundryBalMap.put("eff_date",effDate);
sundryBalMap.put("fin_entity", finEntity); sundryBalMap.put("fin_entity", finEntity);
sundryBalMap.put("site_code", siteCode); sundryBalMap.put("site_code", siteCode);
sundryBalMap.put("sundry_type", sundryType); sundryBalMap.put("sundry_type", (String)DetMap.get("sundry_type"));
sundryBalMap.put("sundry_code", sundryCode); sundryBalMap.put("sundry_code",(String)DetMap.get("sundry_code"));
sundryBalMap.put("acct_code", (String)DetMap.get("acct_code")); sundryBalMap.put("acct_code", (String)DetMap.get("acct_code"));
sundryBalMap.put("cctr_code", (String)DetMap.get("cctr_code")==null?"":(String)DetMap.get("cctr_code")); sundryBalMap.put("cctr_code", (String)DetMap.get("cctr_code")==null?"":(String)DetMap.get("cctr_code"));
sundryBalMap.put("curr_code", (String)DetMap.get("curr_code")); sundryBalMap.put("curr_code", (String)DetMap.get("curr_code"));
sundryBalMap.put("exch_rate", (Double)DetMap.get("exch_rate")); sundryBalMap.put("exch_rate", (Double)DetMap.get("exch_rate"));
amount = (Double)DetMap.get("amount"); amount = (Double)DetMap.get("tot_amt");
System.out.println("Sundrybalcramt"+amount);
if(amount > 0) if(amount > 0)
{ {
sundryBalMap.put("dr_amt", 0.0); sundryBalMap.put("dr_amt", 0.0);
...@@ -1757,19 +1769,20 @@ conn = getConnection(); ...@@ -1757,19 +1769,20 @@ conn = getConnection();
// insert into misc_payable // insert into misc_payable
miscPayMap = new HashMap(); miscPayMap = new HashMap();
miscPayMap.put("tran_date",tranDate); miscPayMap.put("tran_date",tranDate);
miscPayMap.put("tran_ser",(String)DetMap.get("ref_ser"));
miscPayMap.put("ref_no",(String)DetMap.get("ref_no")); miscPayMap.put("ref_no",(String)DetMap.get("ref_no"));
miscPayMap.put("ref_date", refDate); miscPayMap.put("ref_date", (Timestamp)DetMap.get("ref_date"));
miscPayMap.put("bill_no", (String)DetMap.get("bill_no")); miscPayMap.put("bill_no", (String)DetMap.get("bill_no"));
miscPayMap.put("bill_date", billDate); miscPayMap.put("bill_date", (Timestamp)DetMap.get("bill_date"));
miscPayMap.put("sundry_type",(String)DetMap.get("sundry_type")==null?"O":(String)DetMap.get("sundry_type")); miscPayMap.put("sundry_type",(String)DetMap.get("sundry_type")==null?"O":(String)DetMap.get("sundry_type"));
miscPayMap.put("sundry_code", (String)DetMap.get("sundry_code")==null?"O":(String)DetMap.get("sundry_code")); miscPayMap.put("sundry_code", (String)DetMap.get("sundry_code")==null?"O":(String)DetMap.get("sundry_code"));
miscPayMap.put("acct_code", (String)DetMap.get("acct_code")); miscPayMap.put("acct_code", (String)DetMap.get("acct_code"));
miscPayMap.put("cctr_code", (String)DetMap.get("cctr_code")==null?"":(String)DetMap.get("cctr_code")); miscPayMap.put("cctr_code", (String)DetMap.get("cctr_code")==null?"":(String)DetMap.get("cctr_code"));
miscPayMap.put("curr_code", (Double)DetMap.get("curr_code")); miscPayMap.put("curr_code", (String)DetMap.get("curr_code"));
miscPayMap.put("exch_rate", (Double)DetMap.get("exch_rate__vouch")); miscPayMap.put("exch_rate", (Double)DetMap.get("exch_rate"));
miscPayMap.put("due_date", dueDate); miscPayMap.put("due_date", (Timestamp)DetMap.get("due_date"));
miscPayMap.put("site_code",siteCode); miscPayMap.put("site_code",siteCode);
miscPayMap.put("fin_entity",finEntity); miscPayMap.put("fin_entity",finEntity);
miscPayMap.put("tot_amt", (Double)DetMap.get("tot_amt")); miscPayMap.put("tot_amt", (Double)DetMap.get("tot_amt"));
...@@ -1778,11 +1791,14 @@ conn = getConnection(); ...@@ -1778,11 +1791,14 @@ conn = getConnection();
miscPayMap.put("pay_mode", (String)DetMap.get("pay_mode")); miscPayMap.put("pay_mode", (String)DetMap.get("pay_mode"));
miscPayMap.put("paid", "N"); miscPayMap.put("paid", "N");
miscPayMap.put("adv_amt", (Double)DetMap.get("adv_amt")); miscPayMap.put("adv_amt", (Double)DetMap.get("adv_amt"));
miscPayMap.put("tds_amt", (Double)DetMap.get("tds_amt")); miscPayMap.put("tds_amt", DetMap.get("tds_amt").toString());
miscPayMap.put("supp_bill_amt", (Double)DetMap.get("supp_bill_amt")); miscPayMap.put("supp_bill_amt", DetMap.get("supp_bill_amt").toString());
miscPayMap.put("entry_batch_no", (Double)DetMap.get("entry_batch_no"));
miscPayMap.put("purc_order",(Double)DetMap.get("purc_order")); miscPayMap.put("entry_batch_no", (String)DetMap.get("entry_batch_no"));
miscPayMap.put("ref_ser__org", (Double)DetMap.get("ref_ser__org")); miscPayMap.put("purc_order",(String)DetMap.get("purc_order"));
miscPayMap.put("ref_ser__org", (String)DetMap.get("ref_ser__org"));
miscPayMap.put("paid", "N");
miscPayMap.put("hold_amt", holdAmt);
System.out.println("884 sundryBaleUpdate Called.............."); System.out.println("884 sundryBaleUpdate Called..............");
errString = finCommon.gbfMiscPayUpd(miscPayMap, conn); errString = finCommon.gbfMiscPayUpd(miscPayMap, conn);
......
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