Skip to content

B
business-java
Commit 542e32c2 authored by kshinde's avatar kshinde
Browse files
Options

bug fix 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@189606 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 9d2d2ead
Show whitespace changes
Inline Side-by-side
Showing with 87 additions and 56 deletions
webitm-fin/ibase/webitm/ejb/fin/adv/ReceiptDishonourConf.java
View file @ 542e32c2
package ibase.webitm.ejb.fin.adv; package ibase.webitm.ejb.fin.adv;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import java.sql.Connection; import java.sql.Connection;
import java.sql.Date; import java.sql.Date;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
...@@ -39,6 +38,7 @@ import org.w3c.dom.CDATASection; ...@@ -39,6 +38,7 @@ import org.w3c.dom.CDATASection;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.w3c.dom.Node; import org.w3c.dom.Node;
import ibase.webitm.ejb.sys.CreateRCPXML; import ibase.webitm.ejb.sys.CreateRCPXML;
@Stateless @Stateless
public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDishonourConfLocal,ReceiptDishonourConfRemote public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDishonourConfLocal,ReceiptDishonourConfRemote
{ {
...@@ -212,7 +212,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -212,7 +212,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
rcpHnrHdr.put("tran_id",rs.getString("tran_id")); rcpHnrHdr.put("tran_id",rs.getString("tran_id"));
rcpHnrHdr.put("tran_type",rs.getString("tran_type")); rcpHnrHdr.put("tran_type",rs.getString("tran_type"));
rcpHnrHdr.put("tran_date",rs.getTimestamp("tran_date")); rcpHnrHdr.put("tran_date",rs.getTimestamp("tran_date"));
rcpHnrHdr.put("eff_date",rs.getString("eff_date")); rcpHnrHdr.put("eff_date",rs.getTimestamp("eff_date"));
rcpHnrHdr.put("tran_ser",rs.getString("tran_ser")); rcpHnrHdr.put("tran_ser",rs.getString("tran_ser"));
rcpHnrHdr.put("receipt_no",rs.getString("receipt_no")); rcpHnrHdr.put("receipt_no",rs.getString("receipt_no"));
rcpHnrHdr.put("rcp_mode",rs.getString("rcp_mode")); rcpHnrHdr.put("rcp_mode",rs.getString("rcp_mode"));
...@@ -224,7 +224,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -224,7 +224,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
rcpHnrHdr.put("net_amt",rs.getDouble("net_amt")); rcpHnrHdr.put("net_amt",rs.getDouble("net_amt"));
rcpHnrHdr.put("bank_charges",rs.getDouble("bank_charges")); rcpHnrHdr.put("bank_charges",rs.getDouble("bank_charges"));
rcpHnrHdr.put("ref_no",rs.getString("ref_no")); rcpHnrHdr.put("ref_no",rs.getString("ref_no"));
rcpHnrHdr.put("ref_date",rs.getString("ref_date")); rcpHnrHdr.put("ref_date",rs.getTimestamp("ref_date"));
rcpHnrHdr.put("cctr_code__cf",rs.getString("cctr_code__cf")); rcpHnrHdr.put("cctr_code__cf",rs.getString("cctr_code__cf"));
rcpHnrHdr.put("diff_amt__exch",rs.getDouble("diff_amt__exch")); rcpHnrHdr.put("diff_amt__exch",rs.getDouble("diff_amt__exch"));
rcpHnrHdr.put("reas_code",rs.getString("reas_code")); rcpHnrHdr.put("reas_code",rs.getString("reas_code"));
...@@ -237,6 +237,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -237,6 +237,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
rcpHnrHdr.put("exch_rate",rs.getDouble("exch_rate")); rcpHnrHdr.put("exch_rate",rs.getDouble("exch_rate"));
rcpHnrHdr.put("exch_rate__bc",rs.getDouble("exch_rate__bc")); rcpHnrHdr.put("exch_rate__bc",rs.getDouble("exch_rate__bc"));
rcpHnrHdr.put("site_code__for",rs.getString("site_code__for")); rcpHnrHdr.put("site_code__for",rs.getString("site_code__for"));
rcpHnrHdr.put("confirmed","");
} }
rs.close(); rs.close();
rs = null; rs = null;
...@@ -247,7 +248,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -247,7 +248,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
//Getting detail data d_rcpdishnr_postinv //Getting detail data d_rcpdishnr_postinv
rcpHnrDetList=getDetailData(tranId, conn); rcpHnrDetList=getDetailData(tranId, conn);
String acctSql="select tran_id, line_no, acct_code, cctr_code, amount, emp_code, anal_code, exch_rate, sundry_type, sundry_code, curr_code" String acctSql="select tran_id, line_no, acct_code, cctr_code, amount, emp_code, anal_code, exch_rate, sundry_type, sundry_code, curr_code "
+ "from rcpdishnr_acct where rcpdishnr_acct.tran_id = ?"; + "from rcpdishnr_acct where rcpdishnr_acct.tran_id = ?";
pstmt = conn.prepareStatement(acctSql); pstmt = conn.prepareStatement(acctSql);
pstmt.setString(1,tranId); pstmt.setString(1,tranId);
...@@ -395,7 +396,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -395,7 +396,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
{ {
//ll_rows1 = lds_inv.retrieve(ls_rcpno) //ll_rows1 = lds_inv.retrieve(ls_rcpno)
//retrieving rows from rcpdet //retrieving rows from rcpdet
sql="SELECT rcpdet.tran_id,rcpdet.ref_ser,rcpdet.ref_no,rcpdet.rcp_amt,rcpdet.ref_date,receivables.sales_pers" sql="SELECT rcpdet.tran_id,rcpdet.ref_ser,rcpdet.ref_no,rcpdet.rcp_amt,rcpdet.ref_date,receivables.sales_pers "
+ "FROM rcpdet,receivables" + "FROM rcpdet,receivables"
+ " WHERE ( rcpdet.ref_ser = receivables.tran_ser (+)) " + " WHERE ( rcpdet.ref_ser = receivables.tran_ser (+)) "
+ "and ( rcpdet.ref_no = receivables.ref_no (+)) " + "and ( rcpdet.ref_no = receivables.ref_no (+)) "
...@@ -441,9 +442,12 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -441,9 +442,12 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
if(pstmt1!=null)
{
pstmt1.close(); pstmt1.close();
pstmt1= null; pstmt1= null;
} }
}
else // for receipt only else // for receipt only
{ {
sql="select exch_rate from misc_receipt where tran_id = ?"; sql="select exch_rate from misc_receipt where tran_id = ?";
...@@ -463,7 +467,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -463,7 +467,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
// populate rcpdishnr_acct // populate rcpdishnr_acct
if(addAcctFrom.equalsIgnoreCase("d_rcpacct_brow")) if(addAcctFrom.equalsIgnoreCase("d_rcpacct_brow"))
{ {
sql="SELECT .tran_id,line_no, acct_code, cctr_code, amount, emp_code, anal_code, exch_rate, effect_party, sundry_type, sundry_code, curr_code, amount__bc," sql="SELECT tran_id,line_no, acct_code, cctr_code, amount, emp_code, anal_code, exch_rate, effect_party, sundry_type, sundry_code, curr_code, amount__bc "
+ "FROM rcpacct WHERE tran_id = ?"; + "FROM rcpacct WHERE tran_id = ?";
} }
else if(addAcctFrom.equalsIgnoreCase("d_misc_rcpdet_brow")) else if(addAcctFrom.equalsIgnoreCase("d_misc_rcpdet_brow"))
...@@ -628,7 +632,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -628,7 +632,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
cctrCode = rs.getString("cctr_code"); cctrCode = rs.getString("cctr_code");
} }
String sqlInsAdv="Insert into rcpdishnr_acct (tran_id,ref_ser,ref_no,tot_amt,adj_amt,curr_code,exch_rate__vouch,diff_amt__exch,acct_code,cctr_code)values(?,?,?,?,?,?,?,?,?,?)"; String sqlInsAdv="Insert into rcpdishnr_adv (tran_id,ref_ser,ref_no,tot_amt,adj_amt,curr_code,exch_rate__vouch,diff_amt__exch,acct_code,cctr_code)values(?,?,?,?,?,?,?,?,?,?)";
pstmt1=conn.prepareStatement(sqlInsAdv); pstmt1=conn.prepareStatement(sqlInsAdv);
pstmt1.setString(1, tranId); pstmt1.setString(1, tranId);
pstmt1.setString(2, refSer); pstmt1.setString(2, refSer);
...@@ -1622,7 +1626,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -1622,7 +1626,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
refSer = "M-RCP"; refSer = "M-RCP";
} }
sql="select exch_rate , (dr_amt - cr_amt) as postAmt" sql="select exch_rate , (dr_amt - cr_amt) as postAmt "
//+ "into :lc_post_exchrt , :lc_post_amt " //+ "into :lc_post_exchrt , :lc_post_amt "
+ "from gltrace " + "from gltrace "
+ "where ref_ser = ? " + "where ref_ser = ? "
...@@ -1691,7 +1695,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -1691,7 +1695,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
sundryBalUpd.put("cctr_code", cctrBal); sundryBalUpd.put("cctr_code", cctrBal);
sundryBalUpd.put("curr_code", hdrMap.get("curr_code")); sundryBalUpd.put("curr_code", hdrMap.get("curr_code"));
sundryBalUpd.put("exch_rate", exchRate); sundryBalUpd.put("exch_rate", exchRate);
sundryBalUpd.put("dr_amt", 0); sundryBalUpd.put("dr_amt", 0.0);
double bankChrgtemp=Double.parseDouble(hdrMap.get("bank_charges").toString()); double bankChrgtemp=Double.parseDouble(hdrMap.get("bank_charges").toString());
if(currCodeBc.equalsIgnoreCase(sundryBalUpd.get("curr_code").toString().trim()) && bankChrgtemp>0 ) if(currCodeBc.equalsIgnoreCase(sundryBalUpd.get("curr_code").toString().trim()) && bankChrgtemp>0 )
...@@ -1703,7 +1707,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -1703,7 +1707,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
sundryBalUpd.put("cr_amt",(netAmt) ); sundryBalUpd.put("cr_amt",(netAmt) );
} }
sundryBalUpd.put("adv_amt",0 ); sundryBalUpd.put("adv_amt",0.0 );
sundryBalUpd.put("contact_code"," "); sundryBalUpd.put("contact_code"," ");
errString=Fcommon.gbf_sundrybal_upd(sundryBalUpd, conn); errString=Fcommon.gbf_sundrybal_upd(sundryBalUpd, conn);
...@@ -1720,7 +1724,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -1720,7 +1724,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
bankTranLog.put("ref_no", hdrMap.get("ref_no")); bankTranLog.put("ref_no", hdrMap.get("ref_no"));
bankTranLog.put("ref_date", hdrMap.get("ref_date")); bankTranLog.put("ref_date", hdrMap.get("ref_date"));
bankTranLog.put("rcp_mode", hdrMap.get("rcp_mode")); bankTranLog.put("ref_mode", hdrMap.get("rcp_mode"));
bankChrgtemp=Double.parseDouble(hdrMap.get("bank_charges").toString()); bankChrgtemp=Double.parseDouble(hdrMap.get("bank_charges").toString());
if(currCodeBc.equalsIgnoreCase(sundryBalUpd.get("curr_code").toString()) && bankChrgtemp>0) if(currCodeBc.equalsIgnoreCase(sundryBalUpd.get("curr_code").toString()) && bankChrgtemp>0)
...@@ -1741,10 +1745,13 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -1741,10 +1745,13 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
bankTranLog.put("sundry_type",sundryType);//code added by ajit on date 05-apr-2017 bankTranLog.put("sundry_type",sundryType);//code added by ajit on date 05-apr-2017
bankTranLog.put("sundry_code",hdrMap.get("cust_code")); bankTranLog.put("sundry_code",hdrMap.get("cust_code"));
bankTranLog.put("remarks",hdrMap.get("remarks")); bankTranLog.put("remarks",hdrMap.get("remarks"));
bankTranLog.put("tran_date",hdrMap.get("tran_date")); bankTranLog.put("due_date",hdrMap.get("tran_date"));
bankTranLog.put("exch_rate",exchRate); bankTranLog.put("exch_rate",exchRate);
bankTranLog.put("entry_batch_no"," ");
errString=Fcommon.bankTranLogUpdate(bankTranLog, xtraParams, conn); errString=Fcommon.bankTranLogUpdate(bankTranLog, xtraParams, conn);
System.out.println("BankTran Map::"+bankTranLog);
if(errString!=null && errString.trim().length()>0) if(errString!=null && errString.trim().length()>0)
{ {
return errString; return errString;
...@@ -1811,7 +1818,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -1811,7 +1818,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
} }
// currency fluctuation AMOUNT will be posted at invoicing site, not at receipt other site // currency fluctuation AMOUNT will be posted at invoicing site, not at receipt other site
if((!"R".equalsIgnoreCase(hdrMap.get("rcpType").toString().trim())) || rcpType==null || rcpType.trim().length()==0) //added by jasmina 31/05/2010-FI90ALL013 if(rcpType==null || rcpType.trim().length()==0 || (!"R".equalsIgnoreCase(rcpType))) //added by jasmina 31/05/2010-FI90ALL013
{ {
// reverse for currency fluctuation // reverse for currency fluctuation
double diffExchTemp=Double.parseDouble(hdrMap.get("diff_amt__exch").toString()); double diffExchTemp=Double.parseDouble(hdrMap.get("diff_amt__exch").toString());
...@@ -1868,8 +1875,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -1868,8 +1875,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
sundryBalUpd.put("cctr_code", cctrAdv); sundryBalUpd.put("cctr_code", cctrAdv);
sundryBalUpd.put("curr_code", hdrMap.get("curr_code")); sundryBalUpd.put("curr_code", hdrMap.get("curr_code"));
sundryBalUpd.put("exch_rate", hdrMap.get("exch_rate")); sundryBalUpd.put("exch_rate", hdrMap.get("exch_rate"));
sundryBalUpd.put("dr_amt", 0); sundryBalUpd.put("dr_amt", 0.0);
sundryBalUpd.put("cr_amt", 0); sundryBalUpd.put("cr_amt", 0.0);
sundryBalUpd.put("adv_amt",-advAmt); sundryBalUpd.put("adv_amt",-advAmt);
sundryBalUpd.put("contact_code"," "); sundryBalUpd.put("contact_code"," ");
...@@ -1883,7 +1890,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -1883,7 +1890,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
// check that the advance has not been adjusted already, if it has been then the // check that the advance has not been adjusted already, if it has been then the
// receipt cannot be dishonoured // receipt cannot be dishonoured
sql="select adj_amt from receivables" sql="select adj_amt from receivables "
+ "where tran_ser = 'R-ADV' and ref_no = ? "; + "where tran_ser = 'R-ADV' and ref_no = ? ";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
pstmt.setString(1,receiptNo ); pstmt.setString(1,receiptNo );
...@@ -1929,7 +1936,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -1929,7 +1936,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
} }
/////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////
//added by jasmina 31/05/2010-FI90ALL013, to reversing IBCA account //added by jasmina 31/05/2010-FI90ALL013, to reversing IBCA account
if("R".equalsIgnoreCase(rcpType.trim()) && "R".equalsIgnoreCase(hdrMap.get("tran_ser").toString())) if("R".equalsIgnoreCase(rcpType.trim()) && "R".equalsIgnoreCase(hdrMap.get("tran_ser").toString())) //*T NP at trim()
{ {
//Debit effect- reversed entry in gltrace for IBCA Control Account //Debit effect- reversed entry in gltrace for IBCA Control Account
gltraceUpd.put("tran_date", hdrMap.get("tran_date")); gltraceUpd.put("tran_date", hdrMap.get("tran_date"));
...@@ -2039,8 +2046,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2039,8 +2046,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
sundryBalUpd.put("curr_code", hdrMap.get("curr_code")); sundryBalUpd.put("curr_code", hdrMap.get("curr_code"));
sundryBalUpd.put("exch_rate", hdrMap.get("exch_rate")); sundryBalUpd.put("exch_rate", hdrMap.get("exch_rate"));
sundryBalUpd.put("cr_amt", hdrMap.get("net_amt")); sundryBalUpd.put("cr_amt", hdrMap.get("net_amt"));
sundryBalUpd.put("dr_amt", 0); sundryBalUpd.put("dr_amt", 0.0);
sundryBalUpd.put("adv_amt",0); sundryBalUpd.put("adv_amt",0.0);
sundryBalUpd.put("contact_code"," "); sundryBalUpd.put("contact_code"," ");
errString=Fcommon.gbf_sundrybal_upd(sundryBalUpd, conn); errString=Fcommon.gbf_sundrybal_upd(sundryBalUpd, conn);
...@@ -2077,9 +2084,9 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2077,9 +2084,9 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
sundryBalUpd.put("site_code", hdrMap.get("site_code")); sundryBalUpd.put("site_code", hdrMap.get("site_code"));
sundryBalUpd.put("curr_code", hdrMap.get("curr_code")); sundryBalUpd.put("curr_code", hdrMap.get("curr_code"));
sundryBalUpd.put("exch_rate", hdrMap.get("exch_rate")); sundryBalUpd.put("exch_rate", hdrMap.get("exch_rate"));
sundryBalUpd.put("cr_amt", 0); sundryBalUpd.put("cr_amt", 0.0);
sundryBalUpd.put("dr_amt", hdrMap.get("net_amt")); sundryBalUpd.put("dr_amt", hdrMap.get("net_amt"));
sundryBalUpd.put("adv_amt",0); sundryBalUpd.put("adv_amt",0.0);
sundryBalUpd.put("contact_code"," "); sundryBalUpd.put("contact_code"," ");
errString=Fcommon.gbf_sundrybal_upd(sundryBalUpd, conn); errString=Fcommon.gbf_sundrybal_upd(sundryBalUpd, conn);
...@@ -2107,6 +2114,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2107,6 +2114,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
{ {
//prince --moved sql from below //prince --moved sql from below
sql="select cr_days from crterm where cr_term = ?"; sql="select cr_days from crterm where cr_term = ?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,crTerm ); pstmt.setString(1,crTerm );
rs=pstmt.executeQuery(); rs=pstmt.executeQuery();
if(rs.next()) if(rs.next())
...@@ -2142,26 +2150,30 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2142,26 +2150,30 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
//end of the code commented by ajit on date 22-May-2017 //end of the code commented by ajit on date 22-May-2017
//following code added by ajit on date 22-may-2017 //following code added by ajit on date 22-may-2017
String tname=""; String tname="",colName="";
if("C".equalsIgnoreCase(sundryType.trim())) if("C".equalsIgnoreCase(sundryType.trim()))
{ {
tname="customer"; tname="customer";
colName="cust_code";
} }
else if("S".equalsIgnoreCase(sundryType.trim())) else if("S".equalsIgnoreCase(sundryType.trim()))
{ {
tname="supplier"; tname="supplier";
colName="supp_code";
} }
else if("T".equalsIgnoreCase(sundryType.trim())) else if("T".equalsIgnoreCase(sundryType.trim()))
{ {
tname="transporter"; tname="transporter";
colName="tran_code";
} }
else if("X".equalsIgnoreCase(sundryType.trim())) else if("X".equalsIgnoreCase(sundryType.trim()))
{ {
tname="tax_authority"; tname="tax_authority";
colName="tauth_code";
} }
sql="select credit_prd from '"+tname+"' where " sql="select credit_prd from "+tname+" "
+ "where cust_code = ?"; + "where "+colName+" = ?";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
pstmt.setString(1,bankTranLog.get("sundry_code").toString() ); pstmt.setString(1,bankTranLog.get("sundry_code").toString() );
rs=pstmt.executeQuery(); rs=pstmt.executeQuery();
...@@ -2193,7 +2205,10 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2193,7 +2205,10 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
} }
//Added By Rutuja on 20-09-2011 for FI90SUN018 //Added By Rutuja on 20-09-2011 for FI90SUN018
ls_cr_limit = Fcommon.getFinparams("999999","CR_LIMIT_ON_DISHNR",conn); ls_cr_limit = Fcommon.getFinparams("999999","CR_LIMIT_ON_DISHNR",conn);
if(!"NULLFOUND".equalsIgnoreCase(ls_cr_limit.trim()))
{
creditLimit = Double.parseDouble(ls_cr_limit); creditLimit = Double.parseDouble(ls_cr_limit);
}
//following code commented by ajit on date 22-may-2017 //following code commented by ajit on date 22-may-2017
/*if not isnull(lc_credit_limit) then /*if not isnull(lc_credit_limit) then
...@@ -2212,6 +2227,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2212,6 +2227,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
if("C".equalsIgnoreCase(sundryType.trim())) if("C".equalsIgnoreCase(sundryType.trim()))
{ {
tname="customer"; tname="customer";
colName="cust_code";
if(creditLimit>0) if(creditLimit>0)
{ {
setCrLimit=true; setCrLimit=true;
...@@ -2221,6 +2237,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2221,6 +2237,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
else if("S".equalsIgnoreCase(sundryType.trim())) else if("S".equalsIgnoreCase(sundryType.trim()))
{ {
tname="supplier"; tname="supplier";
colName="supp_code";
if(creditLimit>0) if(creditLimit>0)
{ {
setCrLimit=true; setCrLimit=true;
...@@ -2229,6 +2246,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2229,6 +2246,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
else if("T".equalsIgnoreCase(sundryType.trim())) else if("T".equalsIgnoreCase(sundryType.trim()))
{ {
tname="transporter"; tname="transporter";
colName="tran_code";
if(creditLimit>0) if(creditLimit>0)
{ {
setCrLimit=true; setCrLimit=true;
...@@ -2237,6 +2255,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2237,6 +2255,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
else if("X".equalsIgnoreCase(sundryType.trim())) else if("X".equalsIgnoreCase(sundryType.trim()))
{ {
tname="tax_authority"; tname="tax_authority";
colName="tauth_code";
if(creditLimit>0) if(creditLimit>0)
{ {
setCrLimit=true; setCrLimit=true;
...@@ -2245,20 +2264,28 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2245,20 +2264,28 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
//end of the code added by ajit on date 22-may-2017 //end of the code added by ajit on date 22-may-2017
sql="update supplier set cr_term = ? , credit_prd = ? "; sql="update "+tname+" set cr_term = ? , credit_prd = ? ";
if(setCrLimit) if(setCrLimit)
{ {
sql=sql+", credit_lmt =? "; sql=sql+", credit_lmt =? ";
} }
sql=sql+ "where supp_code = ?"; sql=sql+ "where "+colName+" = ?";
System.out.println("sql"+sql);
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
pstmt.setString(1,crTerm); pstmt.setString(1,crTerm);
pstmt.setDouble(2,crDays); pstmt.setDouble(2,crDays);
pstmt.setDouble(3,creditLimit);
if(setCrLimit) if(setCrLimit)
{ {
pstmt.setDouble(3,creditLimit);
pstmt.setString(4,bankTranLog.get("sundry_code").toString()); pstmt.setString(4,bankTranLog.get("sundry_code").toString());
} }
else
{
pstmt.setString(3,bankTranLog.get("sundry_code").toString());
}
int updSundry=pstmt.executeUpdate(); int updSundry=pstmt.executeUpdate();
pstmt.close(); pstmt.close();
pstmt=null; pstmt=null;
...@@ -2281,6 +2308,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2281,6 +2308,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
+ "where cust_code = ? and credit_prd is not null"; + "where cust_code = ? and credit_prd is not null";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
pstmt.setString(1,bankTranLog.get("sundry_code").toString()); pstmt.setString(1,bankTranLog.get("sundry_code").toString());
rs=pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
lc_crprd=rs.getDouble("credit_prd"); lc_crprd=rs.getDouble("credit_prd");
...@@ -2329,14 +2357,18 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2329,14 +2357,18 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
if(creditLimit>0) if(creditLimit>0)
{ {
pstmt.setDouble(3, creditLimit); pstmt.setDouble(3, creditLimit);
}
pstmt.setString(4, bankTranLog.get("sundry_code").toString()); pstmt.setString(4, bankTranLog.get("sundry_code").toString());
}
else
{
pstmt.setString(3, bankTranLog.get("sundry_code").toString());
}
int updcustSer=pstmt.executeUpdate(); int updcustSer=pstmt.executeUpdate();
pstmt.close(); pstmt.close();
pstmt=null; pstmt=null;
if(updcustSer >1) if(updcustSer <=0)
{ {
errorCode = "DS000"; errorCode = "DS000";
errString=itmDBAccessEJB.getErrorString("", errorCode, "", "", conn); errString=itmDBAccessEJB.getErrorString("", errorCode, "", "", conn);
...@@ -2357,7 +2389,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2357,7 +2389,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
if(!"Y".equalsIgnoreCase(ls_confirm.trim())) if(!"Y".equalsIgnoreCase(ls_confirm.trim()))
{ {
sql="update rcpdishnr set confirmed = 'Y', conf_date = ?," sql="update rcpdishnr set confirmed = 'Y', conf_date = ?,"
+ "emp_code__aprv = ?" + "emp_code__aprv = ? "
+ "where tran_id = ? "; + "where tran_id = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setTimestamp(1,ld_today); pstmt.setTimestamp(1,ld_today);
...@@ -2373,7 +2405,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2373,7 +2405,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
} }
sql="select edi_option from transetup" //Changes by Yogesh 12/07/2005 sql="select edi_option from transetup " //Changes by Yogesh 12/07/2005
+"where tran_window = 'w_rcpdishnr_adv'"; +"where tran_window = 'w_rcpdishnr_adv'";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
rs=pstmt.executeQuery(); rs=pstmt.executeQuery();
...@@ -2510,9 +2542,9 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2510,9 +2542,9 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
pstmt.close(); pstmt.close();
pstmt=null; pstmt=null;
sql="update receivables set adj_amt = adj_amt - :lc_rcpamt, status = 'D'," sql="update receivables set adj_amt = adj_amt - ?, status = 'D',"
+ "stat_date = :ld_today" + "stat_date = ? "
+ "where tran_ser = :ls_refser and ref_no = :ls_refno"; + "where tran_ser = ? and ref_no = ?";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
pstmt.setDouble(1, rcpAmt); pstmt.setDouble(1, rcpAmt);
pstmt.setTimestamp(2, ld_today); pstmt.setTimestamp(2, ld_today);
...@@ -2585,7 +2617,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2585,7 +2617,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
adjAmt=(Double)eachAdv.get("adj_amt"); adjAmt=(Double)eachAdv.get("adj_amt");
sql="update receivables set adj_amt = adj_amt - ?, status = 'D'," sql="update receivables set adj_amt = adj_amt - ?, status = 'D',"
+ "stat_date =?" + "stat_date =? "
+ "where tran_ser = ? and ref_no = ?"; + "where tran_ser = ? and ref_no = ?";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
pstmt.setDouble(1, adjAmt); pstmt.setDouble(1, adjAmt);
...@@ -2609,8 +2641,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2609,8 +2641,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
sundryBalUpd.put("acct_code", eachAdv.get("acct_code")); sundryBalUpd.put("acct_code", eachAdv.get("acct_code"));
sundryBalUpd.put("cctr_code", eachAdv.get("cctr_code")); sundryBalUpd.put("cctr_code", eachAdv.get("cctr_code"));
sundryBalUpd.put("exch_rate", eachAdv.get("exch_rate")); sundryBalUpd.put("exch_rate", eachAdv.get("exch_rate"));
sundryBalUpd.put("cr_amt", 0); sundryBalUpd.put("cr_amt", 0.0);
sundryBalUpd.put("dr_amt", 0); sundryBalUpd.put("dr_amt", 0.0);
sundryBalUpd.put("adv_amt",(0-adjAmt)); sundryBalUpd.put("adv_amt",(0-adjAmt));
sundryBalUpd.put("contact_code"," "); sundryBalUpd.put("contact_code"," ");
...@@ -2672,7 +2704,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2672,7 +2704,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
{ {
acctAdv=rs.getString("acct_code__adv"); acctAdv=rs.getString("acct_code__adv");
cctrAdv=rs.getString("cctr_code__adv"); cctrAdv=rs.getString("cctr_code__adv");
lc_adv=rs.getDouble("lc_adv"); lc_adv=rs.getDouble("adv_amt");
} }
rs.close(); rs.close();
...@@ -2689,8 +2721,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2689,8 +2721,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
gltraceUpd.put("eff_date", hdrMap.get("eff_date")); gltraceUpd.put("eff_date", hdrMap.get("eff_date"));
gltraceUpd.put("fin_entity", hdrMap.get("fin_entity")); gltraceUpd.put("fin_entity", hdrMap.get("fin_entity"));
gltraceUpd.put("site_code", hdrMap.get("site_code")); gltraceUpd.put("site_code", hdrMap.get("site_code"));
gltraceUpd.put("sundry_type", eachAcct.get("")); gltraceUpd.put("sundry_type", eachAcct.get("sundry_type"));
gltraceUpd.put("sundry_code", " "); gltraceUpd.put("sundry_code", eachAcct.get("sundry_code"));
gltraceUpd.put("emp_code",eachAcct.get("emp_code")); gltraceUpd.put("emp_code",eachAcct.get("emp_code"));
gltraceUpd.put("anal_code", eachAcct.get("anal_code")); gltraceUpd.put("anal_code", eachAcct.get("anal_code"));
gltraceUpd.put("acct_code", eachAcct.get("acct_code")); gltraceUpd.put("acct_code", eachAcct.get("acct_code"));
...@@ -2730,7 +2762,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2730,7 +2762,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
gltraceUpd.put("ref_type", "F"); gltraceUpd.put("ref_type", "F");
gltraceUpd.put("ref_ser", "R-DIS"); gltraceUpd.put("ref_ser", "R-DIS");
gltraceUpd.put("ref_id", hdrMap.get("tran_id")); gltraceUpd.put("ref_id", hdrMap.get("tran_id"));
gltraceUpd.put("sundry_type",hdrMap.get("remarks")); gltraceUpd.put("remarks",hdrMap.get("remarks"));
errString=Fcommon.glTraceUpdate(gltraceUpd, conn); errString=Fcommon.glTraceUpdate(gltraceUpd, conn);
if(errString!=null && errString.trim().length()>0) if(errString!=null && errString.trim().length()>0)
...@@ -2738,7 +2770,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2738,7 +2770,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
return errString; return errString;
} }
if("O".equals(gltraceUpd.get("sundry_type").toString())) if(!"O".equals(gltraceUpd.get("sundry_type").toString()))
{ {
// reverse sundrybal for sundry from each detail line // reverse sundrybal for sundry from each detail line
sundryBalUpd.put("tran_date", hdrMap.get("tran_date")); sundryBalUpd.put("tran_date", hdrMap.get("tran_date"));
...@@ -2756,21 +2788,20 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2756,21 +2788,20 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
if(advAmt>0) if(advAmt>0)
{ {
sundryBalUpd.put("dr_amt", eachAcct.get("amount")); sundryBalUpd.put("dr_amt", eachAcct.get("amount"));
sundryBalUpd.put("cr_amt", 0); sundryBalUpd.put("cr_amt", 0.0);
} }
else else
{ {
sundryBalUpd.put("dr_amt", 0); sundryBalUpd.put("dr_amt", 0.0);
sundryBalUpd.put("cr_amt", eachAcct.get("amount")); sundryBalUpd.put("cr_amt", eachAcct.get("amount"));
} }
errString=Fcommon.gbf_sundrybal_upd(sundryBalUpd, conn);
if(errString!=null && errString.trim().length()>0)
// advance updation not to be done here shiri 23/05/02 moved to post header // advance updation not to be done here shiri 23/05/02 moved to post header
contactCode =Fcommon.getContactCode(sundryBalUpd.get("sundry_type").toString(), sundryBalUpd.get("sundry_code").toString(), conn); contactCode =Fcommon.getContactCode(sundryBalUpd.get("sundry_type").toString(), sundryBalUpd.get("sundry_code").toString(), conn);
sundryBalUpd.put("contact_code",contactCode); sundryBalUpd.put("contact_code",contactCode);
sundryBalUpd.put("adv_amt",0.0);
//lstr_sundrybal.contact_code= ls_contactcode //lstr_sundrybal.contact_code= ls_contactcode
...@@ -2872,7 +2903,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2872,7 +2903,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
if(acctCode==null || acctCode.trim().length()==0) if(acctCode==null || acctCode.trim().length()==0)
{ {
sql="select acct_code__ap, cctr_code__ap" sql="select acct_code__ap, cctr_code__ap "
+ "from sales_pers" + "from sales_pers"
+ "where sales_pers = ? "; + "where sales_pers = ? ";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
...@@ -3079,7 +3110,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -3079,7 +3110,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
else if("RCP".equalsIgnoreCase(as_call_from)) else if("RCP".equalsIgnoreCase(as_call_from))
{ {
sql="select max(tran_id)" sql="select max(tran_id) "
//+ "into :ls_tranid_payadj" //+ "into :ls_tranid_payadj"
+ "from receivables_reco" + "from receivables_reco"
+ "where ref_ser = ?" + "where ref_ser = ?"
...@@ -3115,9 +3146,9 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -3115,9 +3146,9 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
pstmt.close(); pstmt.close();
pstmt=null; pstmt=null;
// updating misc_payables for adj_amt of basic payable // updating misc_payables for adj_amt of basic payable
sql="update receivables" sql="update receivables "
+ "set recover_amt = recover_amt - ?" + "set recover_amt = recover_amt - ? "
+ "where tran_ser = ?" + "where tran_ser = ? "
+ "and ref_no = ? "; + "and ref_no = ? ";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
pstmt.setDouble(1, Amt); pstmt.setDouble(1, Amt);
...@@ -3137,7 +3168,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -3137,7 +3168,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
} }
else if("RCPDIS".equalsIgnoreCase(as_call_from)) else if("RCPDIS".equalsIgnoreCase(as_call_from))
{ {
sql="select max(tran_id)" sql="select max(tran_id) "
+ "from receivables_reco where ref_ser = ? and ref_no = ? " ; + "from receivables_reco where ref_ser = ? and ref_no = ? " ;
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
pstmt.setString(1, refSer); pstmt.setString(1, refSer);
......
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