Skip to content

B
business-java
Commit bc2fa304 authored by pdas's avatar pdas
Browse files
Options

Request ID-F14KCHT001 

Changes for no advance amount in receipt


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@97975 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 5dd621e2
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 40 deletions
webitm-fin/ibase/webitm/ejb/fin/adv/ReceiptAdvConf.java
View file @ bc2fa304
......@@ -24,6 +24,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.text.*;
import java.sql.BatchUpdateException;
......@@ -376,6 +377,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
HashMap RcpDetMap = null;
HashMap ADetMap = null;
HashMap EpcAdjMap = null;
boolean isError = false;
String retString = "";
ArrayList EpcAdjList = new ArrayList();
boolean isEpcCurrSame = false;
ArrayList RcpDetList = new ArrayList();
......@@ -496,7 +499,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
sql = "select tran_id, tran_date, cust_code, tran_type, rcp_mode, bank_code, ref_no, ref_date, remarks, net_amt, curr_code," +
" exch_rate, net_amt__bc, fin_entity, acct_code__ar, cctr_code__ar, acct_code__bal, cctr_code__bal, site_code," +
" confirmed, adv_amt ,acct_code__cf, cctr_code__cf,eff_date, chq_amt,remarks, proj_code, entry_batch_no,bill_amt ," +
" diff_amt__exch, net_amt__bc, anal_code, bill_disc_amt, oth_amt, efundadj_amt, acct_code__adv, cctr_code__adv ,tax_amt" +
" diff_amt__exch, net_amt__bc, anal_code, bill_disc_amt, oth_amt, efundadj_amt, acct_code__adv, cctr_code__adv ,tax_amt ,item_ser" +
" from receipt where tran_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
......@@ -541,7 +544,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
RcpHdrMap.put("acct_code__adv",rs.getString("acct_code__adv"));
RcpHdrMap.put("cctr_code__adv",rs.getString("cctr_code__adv")==null?"":rs.getString("cctr_code__adv"));
RcpHdrMap.put("tax_amt",rs.getDouble("tax_amt"));
RcpHdrMap.put("item_ser",rs.getString("item_ser"));
System.out.println(" Header Map..........");
System.out.println(RcpHdrMap.toString());
}
......@@ -917,12 +920,12 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
detMap.put("sundry_code", scode);
detMap.put("acct_code", acct);
detMap.put("cctr_code", cctr);
detMap.put("emp_code", "");
detMap.put("anal_code", "");
detMap.put("emp_code", null);
detMap.put("anal_code", null);
//detMap.put("curr_code", rs.getString("curr_code"));
detMap.put("exch_rate", exch);
detMap.put("amount", rcpAmt);
detMap.put("party_doc_ref", "");
detMap.put("party_doc_ref", null);
detMap.put("effect_party", "N"); // 29/01/14 manoharan
detMap.put("eff_bank", "Y"); // 03/02/14 Manoj
DetList.add(detMap);
......@@ -1057,12 +1060,12 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
detMap.put("sundry_code", (String) RcpHdrMap.get("cust_code"));
detMap.put("acct_code", acct);
detMap.put("cctr_code", cctr);
detMap.put("emp_code", "");
detMap.put("anal_code", "");
detMap.put("emp_code", null);
detMap.put("anal_code", null);
//detMap.put("curr_code", rs.getString("curr_code"));
detMap.put("exch_rate", exch);
detMap.put("amount", amount);
detMap.put("party_doc_ref", "");
detMap.put("party_doc_ref", null);
detMap.put("effect_party", "Y"); // 29/01/14 manoharan
detMap.put("eff_bank", "Y"); // 03/02/14 Manoj
DetList.add(detMap);
......@@ -1171,14 +1174,14 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
*/
detMap = new HashMap();
detMap.put("sundry_type", "O");
detMap.put("sundry_code", "");
detMap.put("sundry_code", null);
detMap.put("acct_code", acct);
detMap.put("cctr_code", cctr);
detMap.put("emp_code", "");
detMap.put("anal_code", "");
detMap.put("emp_code", null);
detMap.put("anal_code", null);
detMap.put("exch_rate", exch);
detMap.put("amount", tFin);
detMap.put("party_doc_ref", "");
detMap.put("party_doc_ref", null);
detMap.put("effect_party", "N"); // 29/01/14 manoharan
detMap.put("eff_bank", "Y"); // 03/02/14 Manoj
DetList.add(detMap);
......@@ -1206,11 +1209,11 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
detMap.put("sundry_code", (String)RcpHdrMap.get("cust_code"));
detMap.put("acct_code", acctFins);
detMap.put("cctr_code", cctrFins);
detMap.put("emp_code", "");
detMap.put("anal_code", "");
detMap.put("emp_code", null);
detMap.put("anal_code", null);
detMap.put("exch_rate", exch);
detMap.put("amount", tFin);
detMap.put("party_doc_ref", "");
detMap.put("party_doc_ref", null);
detMap.put("effect_party", "Y"); // 29/01/14 manoharan
detMap.put("eff_bank", "Y"); // 03/02/14 Manoj
DetList.add(detMap);
......@@ -1238,11 +1241,11 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
detMap.put("sundry_code", (String)RcpHdrMap.get("cust_code"));
detMap.put("acct_code", acctFins);
detMap.put("cctr_code", cctrFins);
detMap.put("emp_code", "");
detMap.put("anal_code", "");
detMap.put("emp_code", null);
detMap.put("anal_code", null);
detMap.put("exch_rate", exch);
detMap.put("amount", -1 * tFin);
detMap.put("party_doc_ref", "");
detMap.put("party_doc_ref", null);
detMap.put("effect_party", "Y"); // 29/01/14 manoharan
detMap.put("eff_bank", "Y"); // 03/02/14 Manoj
DetList.add(detMap);
......@@ -1302,12 +1305,12 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
detMap.put("sundry_code", (String) RcpHdrMap.get("cust_code"));
detMap.put("acct_code", acct);
detMap.put("cctr_code", cctr);
detMap.put("emp_code", "");
detMap.put("anal_code", "");
detMap.put("emp_code", null);
detMap.put("anal_code", null);
//detMap.put("curr_code", rs.getString("curr_code"));
detMap.put("exch_rate", exch);
detMap.put("amount", (advAmt-amtNoBankEffect));//Changed by Manoj dtd 03/02/14
detMap.put("party_doc_ref", "");
detMap.put("party_doc_ref", null);
detMap.put("effect_party", "Y"); // 29/01/14 manoharan
detMap.put("eff_bank", "Y"); // 03/02/14 Manoj
......@@ -1432,12 +1435,12 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
detMap.put("sundry_code", sundryCode);
detMap.put("acct_code", acctCode);
detMap.put("cctr_code", cctrCode);
detMap.put("emp_code", "");
detMap.put("anal_code", "");
detMap.put("emp_code", null);
detMap.put("anal_code", null);
//detMap.put("curr_code", rs.getString("curr_code"));
detMap.put("exch_rate", exchRate);
detMap.put("amount", amount);
detMap.put("party_doc_ref", "");
detMap.put("party_doc_ref", null);
detMap.put("effect_party", "N"); // 29/01/14 manoharan
detMap.put("eff_bank", "Y"); // 03/02/14 Manoj
......@@ -1563,12 +1566,12 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
detMap.put("sundry_code", (String)RcpHdrMap.get("cust_code"));
detMap.put("acct_code", acct);
detMap.put("cctr_code", cctr);
detMap.put("emp_code", "");
detMap.put("anal_code", "");
detMap.put("emp_code", null);
detMap.put("anal_code", null);
//detMap.put("curr_code", rs.getString("curr_code"));
detMap.put("exch_rate", exchRate);
detMap.put("amount", diffAmtExch);
detMap.put("party_doc_ref", "");
detMap.put("party_doc_ref", null);
detMap.put("effect_party", "N"); // 29/01/14 manoharan
detMap.put("eff_bank", "Y"); // 03/02/14 Manoj
DetList.add(detMap);
......@@ -1711,15 +1714,15 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
detMap = new HashMap();
detMap.put("sundry_type", "O");
detMap.put("sundry_code", "");
detMap.put("sundry_code", null);
detMap.put("acct_code", acctCodeDr);
detMap.put("cctr_code", cctrCodeDr);
detMap.put("emp_code", "");
detMap.put("anal_code", "");
detMap.put("emp_code", null);
detMap.put("anal_code", null);
//detMap.put("curr_code", rs.getString("curr_code"));
detMap.put("exch_rate", exchRate);
detMap.put("amount", (amtRev * -1));
detMap.put("party_doc_ref", "");
detMap.put("party_doc_ref", null);
detMap.put("effect_party", "N"); // 29/01/14 manoharan
detMap.put("eff_bank", "Y"); // 03/02/14 Manoj
DetList.add(detMap);
......@@ -2072,6 +2075,28 @@ if(!isPreview){
*/
}
catch(BatchUpdateException buex)
{
isError = true;
retString = "ERROR";
int [] updateCounts = buex.getUpdateCounts();
for (int j = 0; j < updateCounts.length; i++)
{
System.err.println(" Statement " + i + ":" + updateCounts[i]);
}
System.err.println(" Message: " + buex.getMessage());
System.err.println(" SQLSTATE: " + buex.getSQLState());
System.err.println(" Error code: " + buex.getErrorCode());
SQLException ex = buex.getNextException();
while (ex != null)
{
System.err.println("SQL exception:");
System.err.println(" Message: " + ex.getMessage());
System.err.println(" SQLSTATE: " + ex.getSQLState());
System.err.println(" Error code: " + ex.getErrorCode());
ex = ex.getNextException();
}
}
catch(Exception e)
{
System.out.println(e.getMessage());
......@@ -2830,21 +2855,21 @@ if(! isPreview)//if isPreview is false
receivablesMap.put("discount", 0);
receivablesMap.put("tot_amt", -1 * ((double) Double.parseDouble( "" + RcpHdrMap.get("adv_amt"))-amtNoBankEffect));//Manoj dtd 04/02/2013 to reduce rcpacctamt of eff_bank='N' from receivables
receivablesMap.put("auto_rcp", "N");
receivablesMap.put("bank_code","");
receivablesMap.put("bank_code",(String)RcpHdrMap.get("bank_code")==null?"":(String)RcpHdrMap.get("bank_code"));
receivablesMap.put("ref_type", "F");
receivablesMap.put("cr_term", "");
receivablesMap.put("cr_term", null);
receivablesMap.put("sales_pers", salesPers);
receivablesMap.put("item_ser", (String)RcpHdrMap.get("item_ser")==null?"":(String)RcpHdrMap.get("item_ser"));
receivablesMap.put("fin_scheme",(String)RcpHdrMap.get("fin_scheme"));
//added extra column for gbfReceivablesUpd method
receivablesMap.put("sales_pers__1","");
receivablesMap.put("sales_pers__2","");
receivablesMap.put("sales_pers__1",null);
receivablesMap.put("sales_pers__2",null);
receivablesMap.put("line_no__ref",null);
receivablesMap.put("mrp_value","0");
receivablesMap.put("gp_no","");
receivablesMap.put("gp_date","");
receivablesMap.put("cust_ref_no","");
receivablesMap.put("cust_ref_date","");
receivablesMap.put("gp_no",null);
receivablesMap.put("gp_date",null);
receivablesMap.put("cust_ref_no",null);
receivablesMap.put("cust_ref_date",null);
receivablesMap.put("cust_ref_amt","");
System.out.println("In 1997 receivablesMap [" + receivablesMap + "]");
......@@ -3579,7 +3604,7 @@ if(! isPreview)//if isPreview is false
glTraceMap.put("fin_entity",(RcpHdrMap.get("fin_entity")));
glTraceMap.put("site_code",(RcpHdrMap.get("site_code")));
glTraceMap.put("sundry_type","O");
glTraceMap.put("sundry_code"," ");
glTraceMap.put("sundry_code","");
glTraceMap.put("acct_code",acctCode);
glTraceMap.put("cctr_code",cctrCode==null?"":cctrCode);
glTraceMap.put("emp_code",empCode);
......
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