Skip to content

B
business-java
Commit bc76bb87 authored by msalla's avatar msalla
Browse files
Options

1)Test Case fro GTPL _Occuring Error 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@212154 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 51323e64
Hide whitespace changes
Inline Side-by-side
Showing with 377 additions and 255 deletions
webitm-fin/src/ibase/webitm/ejb/fin/adv/ReceiptDishonourConf.java
View file @ bc76bb87
...@@ -16,8 +16,6 @@ import org.w3c.dom.CDATASection; ...@@ -16,8 +16,6 @@ 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 com.itextpdf.text.log.SysoCounter;
import ibase.system.config.AppConnectParm; import ibase.system.config.AppConnectParm;
import ibase.utility.CommonConstants; import ibase.utility.CommonConstants;
import ibase.utility.E12GenericUtility; import ibase.utility.E12GenericUtility;
...@@ -198,7 +196,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -198,7 +196,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
exchRate=0, lc_exch1=0, lc_exch_v=0; exchRate=0, lc_exch1=0, lc_exch_v=0;
Timestamp refDate=null, tranDate=null, ld_today=null; Timestamp refDate=null, tranDate=null, ld_today=null;
String addAcctFrom=""; String addAcctFrom="";
String miscCurrCode="";
ResultSet rs=null,rs1=null,rs2=null,rs3=null,rs4=null; ResultSet rs=null,rs1=null,rs2=null,rs3=null,rs4=null;
PreparedStatement pstmt=null,pstmt1=null,pstmt2=null,pstmt3=null,pstmt4=null; PreparedStatement pstmt=null,pstmt1=null,pstmt2=null,pstmt3=null,pstmt4=null;
...@@ -265,6 +263,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -265,6 +263,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
rcpHnrHdr.put("receipt_no",checkNull(rs.getString("receipt_no"))); rcpHnrHdr.put("receipt_no",checkNull(rs.getString("receipt_no")));
rcpHnrHdr.put("rcp_mode",checkNull(rs.getString("rcp_mode"))); rcpHnrHdr.put("rcp_mode",checkNull(rs.getString("rcp_mode")));
rcpHnrHdr.put("curr_code",checkNull(rs.getString("curr_code"))); rcpHnrHdr.put("curr_code",checkNull(rs.getString("curr_code")));
// System.out.println("account curr ocde data ["+rs.getDouble("curr_code")+" ]");
rcpHnrHdr.put("cust_code",checkNull(rs.getString("cust_code"))); rcpHnrHdr.put("cust_code",checkNull(rs.getString("cust_code")));
rcpHnrHdr.put("site_code",checkNull(rs.getString("site_code"))); rcpHnrHdr.put("site_code",checkNull(rs.getString("site_code")));
rcpHnrHdr.put("fin_entity",checkNull(rs.getString("fin_entity"))); rcpHnrHdr.put("fin_entity",checkNull(rs.getString("fin_entity")));
...@@ -299,6 +299,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -299,6 +299,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
} }
//end //end
rcpHnrHdr.put("bank_charges",rs.getDouble("bank_charges")); rcpHnrHdr.put("bank_charges",rs.getDouble("bank_charges"));
rcpHnrHdr.put("acct_code__cf",rs.getDouble("acct_code__cf"));//added by monika 13 nov 2019
// System.out.println("account cf data ["+rs.getDouble("acct_code__cf")+" ]");
rcpHnrHdr.put("ref_no",checkNull(rs.getString("ref_no"))); rcpHnrHdr.put("ref_no",checkNull(rs.getString("ref_no")));
rcpHnrHdr.put("ref_date",rs.getTimestamp("ref_date")); rcpHnrHdr.put("ref_date",rs.getTimestamp("ref_date"));
rcpHnrHdr.put("cctr_code__cf",checkNull(rs.getString("cctr_code__cf"))); rcpHnrHdr.put("cctr_code__cf",checkNull(rs.getString("cctr_code__cf")));
...@@ -314,7 +316,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -314,7 +316,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
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",checkNull(rs.getString("site_code__for"))); rcpHnrHdr.put("site_code__for",checkNull(rs.getString("site_code__for")));
rcpHnrHdr.put("confirmed","N"); rcpHnrHdr.put("confirmed","N");
//rcpHnrHdr.put("confirmed",checkNull(rs.getString("confirmed"))); //rcpHnrHdr.put("confirmed",checkNull(rs.getString("confirmed")));
} }
rs.close(); rs.close();
...@@ -322,7 +324,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -322,7 +324,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
//System.out.println("rcpHnrHdr Map :"+rcpHnrHdr); //System.out.println("rcpHnrHdr Map--list[ 1]:"+rcpHnrHdr);
//Getting detail data d_rcpdishnr_postinv //Getting detail data d_rcpdishnr_postinv
rcpHnrDetList=getDetailData(tranId, conn); rcpHnrDetList=getDetailData(tranId, conn);
...@@ -347,7 +349,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -347,7 +349,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
rcpHnracctList.add(rcpHnrDeta); rcpHnracctList.add(rcpHnrDeta);
} }
System.out.println("rcpHndetailaccount :"+rcpHnracctList); // System.out.println("rcpHndetailaccount list[2] :"+rcpHnracctList);
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
...@@ -374,6 +376,9 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -374,6 +376,9 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
rcpHnradv.put("curr_code", checkNull(rs.getString("curr_code"))); rcpHnradv.put("curr_code", checkNull(rs.getString("curr_code")));
rcpHnradvList.add(rcpHnradv); rcpHnradvList.add(rcpHnradv);
} }
// System.out.println("rcpHndetailaccount list[3] :"+rcpHnradvList);
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
...@@ -467,6 +472,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -467,6 +472,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
}//end }//end
//Added end by Jasmina 01/06/10-FI90ALL013, shifted from below //Added end by Jasmina 01/06/10-FI90ALL013, shifted from below
// System.out.println("rcpHnrdetlist"+rcpHnrDetList);
if (rcpHnrDetList.isEmpty()) if (rcpHnrDetList.isEmpty())
{ {
...@@ -533,13 +539,16 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -533,13 +539,16 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
} }
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 = ?";//commented by monika 0n 15 n0v 2019 to add curr_code in misc recpt
sql="select exch_rate,curr_code from misc_receipt where tran_id = ?";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
pstmt.setString(1, rcpNo); pstmt.setString(1, rcpNo);
rs=pstmt.executeQuery(); rs=pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
lc_exch1=rs.getDouble("exch_rate"); lc_exch1=rs.getDouble("exch_rate");
miscCurrCode=rs.getString("curr_code");//addedd by mon ika 15 nov 2019
} }
rs.close(); rs.close();
rs = null; rs = null;
...@@ -556,8 +565,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -556,8 +565,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
else if(addAcctFrom.equalsIgnoreCase("d_misc_rcpdet_brow")) else if(addAcctFrom.equalsIgnoreCase("d_misc_rcpdet_brow"))
{ {
/*sql="SELECT tran_id, line_no, acct_code, cctr_code, amount, anal_code, emp_code, sundry_code, exch_rate,curr_code,net_amt,eff_bank " /*sql="SELECT tran_id, line_no, acct_code, cctr_code, amount, anal_code, emp_code, sundry_code, exch_rate,curr_code,net_amt,eff_bank "
+ "FROM misc_rcpdet WHERE TRAN_ID = ?";*///commented by monika oon 13 nov 19 -wrong query. + "FROM misc_rcpdet WHERE TRAN_ID = ?";*///commented by monika on 13 nov 19 -wrong query.
//ADDED BY MONIKA 13-NOV -2019 TO GET DATA FROM MISC_RCPDET-- //ADDED BY MONIKA 13-NOV -2019 TO GET DATA FROM MISC_RCPDET--
sql="select tran_id,line_no,acct_code,cctr_code,amount,anal_code,emp_code,remarks,sundry_type,sundry_code,item_ser,tax_class,tax_chap,tax_env,tax_amt,net_amt,proj_code, fn_sundry_name(misc_rcpdet.sundry_type,misc_rcpdet.sundry_code,'') as sundry_name from misc_rcpdet where tran_id = ?"; sql="select tran_id,line_no,acct_code,cctr_code,amount,anal_code,emp_code,remarks,sundry_type,sundry_code,item_ser,tax_class,tax_chap,tax_env,tax_amt,net_amt,proj_code, fn_sundry_name(misc_rcpdet.sundry_type,misc_rcpdet.sundry_code,'') as sundry_name from misc_rcpdet where tran_id = ?";
} }
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
...@@ -595,6 +604,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -595,6 +604,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
else else
{//Added end by Jasmina 25/08/08-FI89ALL022 {//Added end by Jasmina 25/08/08-FI89ALL022
acctCode = rs.getString("acct_code"); acctCode = rs.getString("acct_code");
//System.out.println("account code in loop"+acctCode);
cctrCode = rs.getString("cctr_code"); cctrCode = rs.getString("cctr_code");
} }
Amt = rs.getDouble("amount"); Amt = rs.getDouble("amount");
...@@ -632,8 +642,11 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -632,8 +642,11 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
} }
else else
{ {
currCode = ""; // currCode = " ";//commented it was set blank it should take from misc receipt
currCode = miscCurrCode;
} }
//System.out.println("recipt or misc receipt cur code="+currCode);
ll_ctr1++; ll_ctr1++;
String insSql="insert into rcpdishnr_acct (tran_id,line_no,acct_code,cctr_code,amount,emp_code,anal_code,exch_rate,sundry_type,sundry_code,curr_code) values(?,?,?,?,?,?,?,?,?,?,?)"; String insSql="insert into rcpdishnr_acct (tran_id,line_no,acct_code,cctr_code,amount,emp_code,anal_code,exch_rate,sundry_type,sundry_code,curr_code) values(?,?,?,?,?,?,?,?,?,?,?)";
pstmt1=conn.prepareStatement(insSql);//Change to batch in future pstmt1=conn.prepareStatement(insSql);//Change to batch in future
...@@ -648,7 +661,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -648,7 +661,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
pstmt1.setString(9, sundryType); pstmt1.setString(9, sundryType);
pstmt1.setString(10, sundryCode); pstmt1.setString(10, sundryCode);
pstmt1.setString(11, currCode); pstmt1.setString(11, currCode);
//System.out.println("data inserted in rcpdishnr_acct tran_id ["+tranId+"] line_no["+ll_ctr1+"]Amount["+Amt); // System.out.println("data inserted in rcpdishnr_acct curr code ["+currCode+"] line_no["+ll_ctr1+"]Amount["+Amt);
int insacctcnt=pstmt1.executeUpdate(); int insacctcnt=pstmt1.executeUpdate();
pstmt1.close(); pstmt1.close();
pstmt1= null; pstmt1= null;
...@@ -664,6 +677,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -664,6 +677,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
pstmt.close(); pstmt.close();
pstmt=null; pstmt=null;
} }
//System.out.println("hnr adv list"+rcpHnradvList);
// shiri 23/05/02 for undoing the advances adjusted in the receipt // shiri 23/05/02 for undoing the advances adjusted in the receipt
if(rcpHnradvList.isEmpty()) if(rcpHnradvList.isEmpty())
...@@ -758,6 +772,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -758,6 +772,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
//Populating detail list again //Populating detail list again
rcpHnrDetList.clear(); rcpHnrDetList.clear();
rcpHnrDetList=getDetailData(tranId, conn); rcpHnrDetList=getDetailData(tranId, conn);
//System.out.println("rcp hnr det list..."+rcpHnrDetList);
//Populating acctList again //Populating acctList again
rcpHnracctList.clear(); rcpHnracctList.clear();
acctSql="select tran_id, line_no, acct_code, cctr_code, amount, emp_code, anal_code, exch_rate, sundry_type, sundry_code, curr_code " acctSql="select tran_id, line_no, acct_code, cctr_code, amount, emp_code, anal_code, exch_rate, sundry_type, sundry_code, curr_code "
...@@ -782,7 +797,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -782,7 +797,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
} }
//System.out.println("populating account list["+rcpHnracctList+"]"); // System.out.println("populating rcpHnracctList list[4]"+rcpHnracctList+"]");
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
...@@ -812,6 +827,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -812,6 +827,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
//System.out.println("populating rcpHnradv account list[5]"+rcpHnradvList+"]");
// shiri 23/05/02 changed no. of parameters // shiri 23/05/02 changed no. of parameters
errString = gbfPostRcpDishnr(rcpHnrHdr, rcpHnrDetList, rcpHnracctList,rcpHnradvList,xtraParams,conn); errString = gbfPostRcpDishnr(rcpHnrHdr, rcpHnrDetList, rcpHnracctList,rcpHnradvList,xtraParams,conn);
...@@ -871,7 +887,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -871,7 +887,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
ls_curr="", acctCode="", cctrCode="", finEnt="", ls_keystr="", ls_auto_tran_id="", receiptNo="", itemSer="", ls_curr="", acctCode="", cctrCode="", finEnt="", ls_keystr="", ls_auto_tran_id="", receiptNo="", itemSer="",
remark="", suppCode="", acctAdv="", cctrAdv="", taxClass="", taxChap="", taxEnv="", remark="", suppCode="", acctAdv="", cctrAdv="", taxClass="", taxChap="", taxEnv="",
mcrterm="", ls_dcrterm="", acctBc="", cctrBc="", debitTo="", stationFrom="", stationTo ="", chqAmt ="", mcrterm="", ls_dcrterm="", acctBc="", cctrBc="", debitTo="", stationFrom="", stationTo ="", chqAmt ="",
autoDrNote ="", ls_var_value="",rcprefNo="",rcpAdvBkRfNo=""; autoDrNote ="", ls_var_value="",rcprefNo="",rcpAdvBkRfNo="",tranSer="";
//nvo_datastore lds_hdr, lds_misc_hdr, lds_misc_det, ds_tax_detbrow //nvo_datastore lds_hdr, lds_misc_hdr, lds_misc_det, ds_tax_detbrow
double bankCharges=0, netAmt=0 , lc_rd_net_amt=0, tax =0 , exchRate=0,advbkamount=0,epcamount=0; double bankCharges=0, netAmt=0 , lc_rd_net_amt=0, tax =0 , exchRate=0,advbkamount=0,epcamount=0;
...@@ -917,18 +933,19 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -917,18 +933,19 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
// 28-dec-2018 manoharan moved here to update after detail posting // 28-dec-2018 manoharan moved here to update after detail posting
ls_confirm = hdrMap.get("confirmed").toString(); ls_confirm = hdrMap.get("confirmed").toString();
receiptNo = hdrMap.get("receipt_no").toString(); receiptNo = hdrMap.get("receipt_no").toString();
// System.out.println("status:"+ls_confirm+"receipt no>>>"+receiptNo); tranSer=hdrMap.get("tran_ser").toString();//added by monika 15 nov 19
// System.out.println("status:"+ls_confirm+"receipt no>>>"+receiptNo);
String login_emp_code=new E12GenericUtility().getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode"); String login_emp_code=new E12GenericUtility().getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode");
if(ls_confirm==null || ls_confirm.trim().length()==0 )//prince --18-09-06 if(ls_confirm==null || ls_confirm.trim().length()==0 )//prince --18-09-06
{ {
ls_confirm="Y"; ls_confirm="Y";
} }
//ADDED BY MONIKA 30 SEPT 2019 to update reverse amount //ADDED BY MONIKA 30 SEPT 2019 to update reverse amount
else if(!("Y".equalsIgnoreCase(ls_confirm))) else if(!("Y".equalsIgnoreCase(ls_confirm)))
{ {
//System.out.println("inside the loop of confirm"); //System.out.println("inside the loop of confirm");
...@@ -959,11 +976,11 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -959,11 +976,11 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
{ {
epcamount = rs.getDouble("amount"); epcamount = rs.getDouble("amount");
rcprefNo=rs.getString("ref_no"); rcprefNo=rs.getString("ref_no");
System.out.println("epc amount"+epcamount); // System.out.println("epc amount"+epcamount);
} }
if(Math.abs(epcamount) > 0) if(Math.abs(epcamount) > 0)
{ {
//System.out.println("INSIDE ADVAMT"+epcamount); //System.out.println("INSIDE ADVAMT"+epcamount);
sql = "update export_fund set bal_amt = (case when bal_amt is null then 0 else bal_amt end -(?)) where tran_id = ? "; sql = "update export_fund set bal_amt = (case when bal_amt is null then 0 else bal_amt end -(?)) where tran_id = ? ";
pstmt1 = conn.prepareStatement(sql); pstmt1 = conn.prepareStatement(sql);
pstmt1.setDouble(1,epcamount); pstmt1.setDouble(1,epcamount);
...@@ -973,8 +990,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -973,8 +990,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
pstmt1= null; pstmt1= null;
} }
pstmt.close(); pstmt.close();
pstmt= null; pstmt= null;
...@@ -991,10 +1008,10 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -991,10 +1008,10 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
advbkamount = rs.getDouble("amount"); advbkamount = rs.getDouble("amount");
rcpAdvBkRfNo=rs.getString("ref_no"); rcpAdvBkRfNo=rs.getString("ref_no");
} }
// System.out.println("INSIDE ADVAMT"+advbkamount); // System.out.println("INSIDE ADVAMT"+advbkamount);
if(Math.abs(advbkamount) > 0) if(Math.abs(advbkamount) > 0)
{ {
// System.out.println("INSIDE ADVAMT"); // System.out.println("INSIDE ADVAMT");
sql = "update advbking set bal_amt = (case when bal_amt is null then 0 else bal_amt end +?) where tran_id = ? "; sql = "update advbking set bal_amt = (case when bal_amt is null then 0 else bal_amt end +?) where tran_id = ? ";
pstmt1= conn.prepareStatement(sql); pstmt1= conn.prepareStatement(sql);
pstmt1.setDouble(1,advbkamount); pstmt1.setDouble(1,advbkamount);
...@@ -1038,14 +1055,19 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -1038,14 +1055,19 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
// Added by fatema - 16/06/2006 // Added by fatema - 16/06/2006
// For Creating Misc Dr note or Payable voucher for Bank charges // For Creating Misc Dr note or Payable voucher for Bank charges
// Depending on reason code - Customer or supplier respectively // Depending on reason code - Customer or supplier respectively
if (errString==null || errString.length()==0)
//if( (errString==null || errString.length()==0))//commented to check transer by monika 15 nov 19
if( (errString==null || errString.length()==0) && "R".equalsIgnoreCase(tranSer))
{ {
reasonCode = hdrMap.get("reas_code").toString(); reasonCode = hdrMap.get("reas_code").toString();
// bankCharges = lds_hdr.getitemnumber(1, "bank_charges") // bankCharges = lds_hdr.getitemnumber(1, "bank_charges")
siteCode = hdrMap.get("site_code").toString(); siteCode = hdrMap.get("site_code").toString();
custCode = hdrMap.get("cust_code").toString(); custCode = hdrMap.get("cust_code").toString();
receiptNo = hdrMap.get("receipt_no").toString(); receiptNo = hdrMap.get("receipt_no").toString();
acctBc = hdrMap.get("acct_code__bc").toString(); acctBc = hdrMap.get("acct_code__bc").toString();
// System.out.println("in errstruing currcode"+acctBc);
cctrBc = hdrMap.get("cctr_code__bc").toString(); cctrBc = hdrMap.get("cctr_code__bc").toString();
tranDate = (Timestamp)hdrMap.get("tran_date"); tranDate = (Timestamp)hdrMap.get("tran_date");
lc_rd_net_amt = (Double)hdrMap.get("net_amt"); lc_rd_net_amt = (Double)hdrMap.get("net_amt");
...@@ -1230,7 +1252,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -1230,7 +1252,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
rs1=null; rs1=null;
pstmt1.close(); pstmt1.close();
pstmt1=null; pstmt1=null;
System.out.println("acount from custome..."+acctCode);
if (acctCode==null || acctCode.trim().length()==0 || cctrCode==null || cctrCode.trim().length()==0) if (acctCode==null || acctCode.trim().length()==0 || cctrCode==null || cctrCode.trim().length()==0)
{ {
sql="select acct_code__ar, cctr_code__ar from itemser where item_ser = ?"; sql="select acct_code__ar, cctr_code__ar from itemser where item_ser = ?";
...@@ -1284,6 +1306,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -1284,6 +1306,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
if(rs.next()) if(rs.next())
{ {
ls_curr=rs.getString("curr_code"); ls_curr=rs.getString("curr_code");
} }
else else
{ {
...@@ -1291,6 +1314,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -1291,6 +1314,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
errString=itmDBAccessEJB.getErrorString("", errorCode, "", "", conn); errString=itmDBAccessEJB.getErrorString("", errorCode, "", "", conn);
return errString; return errString;
} }
System.out.println("currency in fin entity.."+ls_curr);
rs.close(); rs.close();
rs=null; rs=null;
pstmt.close(); pstmt.close();
...@@ -1298,7 +1322,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -1298,7 +1322,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
} }
//String ls_today=new SimpleDateFormat(new E12GenericUtility().getApplDateFormat()) //String ls_today=new SimpleDateFormat(new E12GenericUtility().getApplDateFormat())
exchRate = Fcommon.getDailyExchRateSellBuy(ls_curr, "RS", siteCode, ld_today.toString(), "B",conn); exchRate = Fcommon.getDailyExchRateSellBuy(ls_curr, "RS", siteCode, ld_today.toString(), "B",conn);
//System.out.println("apnd act code "+acctCode);
xmlBuff.append("<acct_code><![CDATA[" + (acctCode) + "]]></acct_code>"); xmlBuff.append("<acct_code><![CDATA[" + (acctCode) + "]]></acct_code>");
xmlBuff.append("<cctr_code><![CDATA[" + (cctrCode) + "]]></cctr_code>"); xmlBuff.append("<cctr_code><![CDATA[" + (cctrCode) + "]]></cctr_code>");
xmlBuff.append("<curr_code><![CDATA[" + (ls_curr) + "]]></curr_code>"); xmlBuff.append("<curr_code><![CDATA[" + (ls_curr) + "]]></curr_code>");
...@@ -1314,6 +1338,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -1314,6 +1338,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
xmlBuff.append("<line_no>"+("1")+"</line_no>"); xmlBuff.append("<line_no>"+("1")+"</line_no>");
xmlBuff.append("<amount>"+(bankCharges)+"</amount>"); xmlBuff.append("<amount>"+(bankCharges)+"</amount>");
xmlBuff.append("<acct_code>"+(acctBc)+"</acct_code>"); xmlBuff.append("<acct_code>"+(acctBc)+"</acct_code>");
// System.out.println("aact 2 ["+acctBc);
xmlBuff.append("<cctr_code>"+(cctrBc)+"</cctr_code>"); xmlBuff.append("<cctr_code>"+(cctrBc)+"</cctr_code>");
xmlBuff.append("<reas_code>"+(reasonCode)+"</reas_code>"); xmlBuff.append("<reas_code>"+(reasonCode)+"</reas_code>");
...@@ -1514,7 +1539,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -1514,7 +1539,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
rs=null; rs=null;
pstmt.close(); pstmt.close();
pstmt=null; pstmt=null;
//System.out.println("supplier acct code::"+acctCode);
xmlBuff.append("<acct_code__ap><![CDATA[" + (acctCode) + "]]></acct_code__ap>"); xmlBuff.append("<acct_code__ap><![CDATA[" + (acctCode) + "]]></acct_code__ap>");
xmlBuff.append("<cctr_code__ap><![CDATA[" + (cctrCode) + "]]></cctr_code__ap>"); xmlBuff.append("<cctr_code__ap><![CDATA[" + (cctrCode) + "]]></cctr_code__ap>");
xmlBuff.append("<acct_code__adv><![CDATA[" + (acctAdv) + "]]></acct_code__adv>"); xmlBuff.append("<acct_code__adv><![CDATA[" + (acctAdv) + "]]></acct_code__adv>");
...@@ -1692,7 +1717,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -1692,7 +1717,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
if( errString.indexOf("Success") != -1 ) if( errString.indexOf("Success") != -1 )
{ {
ls_auto_tran_id=errString.substring( errString.indexOf("<TranID>")+8, errString.indexOf("</TranID>")); ls_auto_tran_id=errString.substring( errString.indexOf("<TranID>")+8, errString.indexOf("</TranID>"));
// System.out.println("tranIdVoucher is :"+ls_auto_tran_id); // System.out.println("tranIdVoucher is :"+ls_auto_tran_id);
//following code added by ajit on date 01-Mar-2017 Request#F16JSUN004 //following code added by ajit on date 01-Mar-2017 Request#F16JSUN004
if("Y".equalsIgnoreCase(ls_var_miscdrcr_val)) if("Y".equalsIgnoreCase(ls_var_miscdrcr_val))
{ {
...@@ -1824,7 +1849,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -1824,7 +1849,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
{ {
SimpleDateFormat sdf=new SimpleDateFormat(genericUtility.getApplDateFormat()); SimpleDateFormat sdf=new SimpleDateFormat(genericUtility.getApplDateFormat());
currCodeBc = hdrMap.get("curr_code__bc").toString(); currCodeBc = hdrMap.get("curr_code__bc").toString();
//System.out.println("currcode bc in post.."+currCodeBc);
//do while true //do while true
// put reversed entry in gltrace for bank // put reversed entry in gltrace for bank
...@@ -1837,7 +1862,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -1837,7 +1862,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
gltraceUpd.put("sundry_code", hdrMap.get("bank_code")); gltraceUpd.put("sundry_code", hdrMap.get("bank_code"));
// System.out.println("HeaderPost sundryCode" +hdrMap.get("bank_code")); //System.out.println("HeaderPost sundryCode" +hdrMap.get("bank_code"));
receiptNo=hdrMap.get("receipt_no").toString(); receiptNo=hdrMap.get("receipt_no").toString();
if ("R".equalsIgnoreCase(hdrMap.get("tran_ser").toString())) if ("R".equalsIgnoreCase(hdrMap.get("tran_ser").toString()))
...@@ -1887,13 +1912,20 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -1887,13 +1912,20 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
advAmt = 0; advAmt = 0;
//following code added by ajit on date 05-Apr-2017 //following code added by ajit on date 05-Apr-2017
sql="select misc_rcpdet.sundry_type " /*sql="select misc_rcpdet.sundry_type "
+ "from misc_receipt, misc_rcpdet,bank,customer,site " + "from misc_receipt, misc_rcpdet,bank,customer,site "
+ "where misc_receipt.tran_id = misc_rcpdet.tran_id and " + "where misc_receipt.tran_id = misc_rcpdet.tran_id and "
+ "misc_receipt.bank_code = bank.bank_code and " + "misc_receipt.bank_code = bank.bank_code and "
+ "misc_rcpdet.sundry_code = customer.cust_code (+) and " ///amish 09-11-04 + "misc_rcpdet.sundry_code = customer.cust_code (+) and " ///amish 09-11-04
+ "misc_receipt.site_code = site.site_code and " + "misc_receipt.site_code = site.site_code and "
+ "misc_receipt.tran_id = ? and " + "misc_receipt.tran_id = ? and "
+ "misc_rcpdet.line_no = 1 ";*///MONIKA 0N 15 NOV 19
sql="select misc_rcpdet.sundry_type "
+ "from misc_receipt, misc_rcpdet,bank,site "
+ "where misc_receipt.tran_id = misc_rcpdet.tran_id and "
+ "misc_receipt.bank_code = bank.bank_code and "
+ "misc_receipt.site_code = site.site_code and "
+ "misc_receipt.tran_id = ? and "
+ "misc_rcpdet.line_no = 1 "; + "misc_rcpdet.line_no = 1 ";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
pstmt.setString(1, receiptNo); pstmt.setString(1, receiptNo);
...@@ -1952,7 +1984,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -1952,7 +1984,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
netAmt =(Double) hdrMap.get("net_amt");//10000 netAmt =(Double) hdrMap.get("net_amt");//10000
exchRate = (Double) hdrMap.get("exch_rate"); exchRate = (Double) hdrMap.get("exch_rate");
gltraceUpd.put("curr_code", hdrMap.get("curr_code")) ; //added by jasmina 08/06/10-FI90ALL013 gltraceUpd.put("curr_code", hdrMap.get("curr_code")) ;//added by jasmina 08/06/10-FI90ALL013
//System.out.println("curr_code---"+ hdrMap.get("curr_code"));
} }
else else
{ {
...@@ -1960,11 +1993,14 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -1960,11 +1993,14 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
netAmt =(Double) hdrMap.get("net_amt"); netAmt =(Double) hdrMap.get("net_amt");
exchRate = 1; exchRate = 1;
gltraceUpd.put("curr_code", currCodeBc) ;//added by jasmina 08/06/10-FI90ALL013 gltraceUpd.put("curr_code", currCodeBc) ;//added by jasmina 08/06/10-FI90ALL013
//System.out.println("curr_code bs---"+ currCodeBc);
} }
///amish 27-12-04 /// end .. ///amish 27-12-04 /// end ..
gltraceUpd.put("acct_code", acctBal); gltraceUpd.put("acct_code", acctBal);
//System.out.println("account code in rcpdishrnr"+acctBal+"] net amount["+netAmt);
gltraceUpd.put("cctr_code", cctrBal); gltraceUpd.put("cctr_code", cctrBal);
gltraceUpd.put("emp_code", " "); //SetNull added by Amit for DB2 gltraceUpd.put("emp_code", " "); //SetNull added by Amit for DB2
gltraceUpd.put("anal_code", " "); //SetNull added by Amit for DB2 gltraceUpd.put("anal_code", " "); //SetNull added by Amit for DB2
...@@ -1976,7 +2012,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -1976,7 +2012,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
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("remarks", hdrMap.get("remarks")); gltraceUpd.put("remarks", hdrMap.get("remarks"));
//System.out.println("gltrace update 1 ["+gltraceUpd);
errString=Fcommon.glTraceUpdate(gltraceUpd, conn); errString=Fcommon.glTraceUpdate(gltraceUpd, conn);
if(errString!=null && errString.trim().length()>0) if(errString!=null && errString.trim().length()>0)
{ {
...@@ -1997,13 +2033,16 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -1997,13 +2033,16 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
sundryBalUpd.put("dr_amt", 0.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)
{ {
sundryBalUpd.put("cr_amt",(netAmt+bankChrgtemp) ); sundryBalUpd.put("cr_amt",(netAmt+bankChrgtemp) );
//System.out.println("inside if balupdates ["+(netAmt+bankChrgtemp));
} }
else else
{ {
sundryBalUpd.put("cr_amt",(netAmt) ); sundryBalUpd.put("cr_amt",(netAmt) );
//System.out.println("inside else balupdates ["+(netAmt));
} }
sundryBalUpd.put("adv_amt",0.0 ); sundryBalUpd.put("adv_amt",0.0 );
...@@ -2068,12 +2107,16 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2068,12 +2107,16 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
gltraceUpd.put("sundry_type", "O"); gltraceUpd.put("sundry_type", "O");
gltraceUpd.put("sundry_code", " "); gltraceUpd.put("sundry_code", " ");
gltraceUpd.put("acct_code", hdrMap.get("acct_code__bc")); gltraceUpd.put("acct_code", hdrMap.get("acct_code__bc"));
//System.out.println("account code bank in rcpdishrnr"+hdrMap.get("acct_code__bc"));
gltraceUpd.put("cctr_code", hdrMap.get("cctr_code__bc")); gltraceUpd.put("cctr_code", hdrMap.get("cctr_code__bc"));
gltraceUpd.put("curr_code", hdrMap.get("curr_code")); gltraceUpd.put("curr_code", hdrMap.get("curr_code"));
gltraceUpd.put("exch_rate", exchRate); gltraceUpd.put("exch_rate", exchRate);
gltraceUpd.put("emp_code", " "); gltraceUpd.put("emp_code", " ");
gltraceUpd.put("anal_code", " "); gltraceUpd.put("anal_code", " ");
gltraceUpd.put("anal_code", " "); gltraceUpd.put("anal_code", " ");
//System.out.println("dr amt"+hdrMap.get("bank_charges"));
gltraceUpd.put("dr_amt", hdrMap.get("bank_charges")); gltraceUpd.put("dr_amt", hdrMap.get("bank_charges"));
gltraceUpd.put("cr_amt", 0); gltraceUpd.put("cr_amt", 0);
gltraceUpd.put("ref_type", "F"); gltraceUpd.put("ref_type", "F");
...@@ -2082,6 +2125,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2082,6 +2125,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
gltraceUpd.put("sundry_type",hdrMap.get("remarks")); gltraceUpd.put("sundry_type",hdrMap.get("remarks"));
//System.out.println("gltrace update 1 ["+gltraceUpd);
errString=Fcommon.glTraceUpdate(gltraceUpd, conn); errString=Fcommon.glTraceUpdate(gltraceUpd, conn);
if(errString!=null && errString.trim().length()>0) if(errString!=null && errString.trim().length()>0)
...@@ -2096,18 +2140,22 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2096,18 +2140,22 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
gltraceUpd.put("site_code", hdrMap.get("site_code")); gltraceUpd.put("site_code", hdrMap.get("site_code"));
gltraceUpd.put("sundry_type", "B"); gltraceUpd.put("sundry_type", "B");
gltraceUpd.put("sundry_code", hdrMap.get("bank_code")); gltraceUpd.put("sundry_code", hdrMap.get("bank_code"));
//System.out.println("account cde in gltrace in rcpdishrnr11"+acctBal);
gltraceUpd.put("acct_code", acctBal); gltraceUpd.put("acct_code", acctBal);
//System.out.println("account cde in gltrace in rcpdishrnr"+acctBal);
gltraceUpd.put("cctr_code", cctrBal); gltraceUpd.put("cctr_code", cctrBal);
gltraceUpd.put("emp_code", " "); gltraceUpd.put("emp_code", " ");
gltraceUpd.put("anal_code", " "); gltraceUpd.put("anal_code", " ");
gltraceUpd.put("curr_code", hdrMap.get("curr_code")); gltraceUpd.put("curr_code", hdrMap.get("curr_code"));
gltraceUpd.put("exch_rate", hdrMap.get("exch_rate")); gltraceUpd.put("exch_rate", hdrMap.get("exch_rate"));
gltraceUpd.put("dr_amt", 0); gltraceUpd.put("dr_amt", 0);
//System.out.println("account cr_amount in rcpdishrnr"+hdrMap.get("bank_charges"));
gltraceUpd.put("cr_amt", hdrMap.get("bank_charges")); gltraceUpd.put("cr_amt", hdrMap.get("bank_charges"));
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("sundry_type",hdrMap.get("remarks"));
//System.out.println("gltrace update 3 ["+gltraceUpd);
errString=Fcommon.glTraceUpdate(gltraceUpd, conn); errString=Fcommon.glTraceUpdate(gltraceUpd, conn);
if(errString!=null && errString.trim().length()>0) if(errString!=null && errString.trim().length()>0)
...@@ -2129,6 +2177,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2129,6 +2177,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
gltraceUpd.put("site_code", hdrMap.get("site_code")); gltraceUpd.put("site_code", hdrMap.get("site_code"));
gltraceUpd.put("sundry_type", "O"); gltraceUpd.put("sundry_type", "O");
gltraceUpd.put("sundry_code", " "); gltraceUpd.put("sundry_code", " ");
gltraceUpd.put("acct_code", hdrMap.get("acct_code__cf")); gltraceUpd.put("acct_code", hdrMap.get("acct_code__cf"));
gltraceUpd.put("cctr_code", hdrMap.get("cctr_code__cf")); gltraceUpd.put("cctr_code", hdrMap.get("cctr_code__cf"));
gltraceUpd.put("emp_code", " "); gltraceUpd.put("emp_code", " ");
...@@ -2142,15 +2191,19 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2142,15 +2191,19 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
{ {
gltraceUpd.put("dr_amt", 0); gltraceUpd.put("dr_amt", 0);
gltraceUpd.put("cr_amt", hdrMap.get("diff_amt__exch")); gltraceUpd.put("cr_amt", hdrMap.get("diff_amt__exch"));
// System.out.println("diffrence exchange rate in if"+ hdrMap.get("diff_amt__exch") );
} }
else else
{ {
gltraceUpd.put("cr_amt", 0); gltraceUpd.put("cr_amt", 0);
gltraceUpd.put("dr_amt", -(Double)hdrMap.get("diff_amt__exch")); gltraceUpd.put("dr_amt", -(Double)hdrMap.get("diff_amt__exch"));
//System.out.println("diffrence exchange rate in else"+ hdrMap.get("diff_amt__exch") );
} }
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("sundry_type",hdrMap.get("remarks"));
// System.out.println("gltrace update 5 ["+gltraceUpd);
errString=Fcommon.glTraceUpdate(gltraceUpd, conn); errString=Fcommon.glTraceUpdate(gltraceUpd, conn);
if(errString!=null && errString.trim().length()>0) if(errString!=null && errString.trim().length()>0)
...@@ -2246,19 +2299,24 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2246,19 +2299,24 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
gltraceUpd.put("sundry_code", " "); gltraceUpd.put("sundry_code", " ");
netAmt=Double.parseDouble(hdrMap.get("net_amt").toString()); netAmt=Double.parseDouble(hdrMap.get("net_amt").toString());
// System.out.println("net amount in receipty"+netAmt);
netAmt=netAmt-othAmt; netAmt=netAmt-othAmt;
gltraceUpd.put("acct_code", acctCodeCr); gltraceUpd.put("acct_code", acctCodeCr);
// System.out.println("receipt...acoount code"+acctCodeCr);
gltraceUpd.put("cctr_code", cctrCodeCr); gltraceUpd.put("cctr_code", cctrCodeCr);
gltraceUpd.put("emp_code", " "); gltraceUpd.put("emp_code", " ");
gltraceUpd.put("anal_code", " "); gltraceUpd.put("anal_code", " ");
gltraceUpd.put("curr_code", hdrMap.get("curr_code")); gltraceUpd.put("curr_code", hdrMap.get("curr_code"));
gltraceUpd.put("exch_rate", hdrMap.get("exch_rate")); gltraceUpd.put("exch_rate", hdrMap.get("exch_rate"));
gltraceUpd.put("cr_amt", 0); gltraceUpd.put("cr_amt", 0);
// System.out.println("net amount in cr amount"+netAmt);
gltraceUpd.put("dr_amt", netAmt); gltraceUpd.put("dr_amt", netAmt);
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("sundry_type",hdrMap.get("remarks"));
// System.out.println("gltrace update 6 ["+gltraceUpd);
errString=Fcommon.glTraceUpdate(gltraceUpd, conn); errString=Fcommon.glTraceUpdate(gltraceUpd, conn);
...@@ -2290,12 +2348,15 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2290,12 +2348,15 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
pstmt.close(); pstmt.close();
pstmt=null; pstmt=null;
if(!siteCode.trim().equalsIgnoreCase(siteCodeFor)) // if(!siteCode.trim().equalsIgnoreCase(siteCodeFor)) commented by monika 15 nov 2019
if((siteCodeFor!=null && siteCodeFor.length() > 0 )&&( !siteCode.trim().equalsIgnoreCase(siteCodeFor)))
{ {
sql="select sundry_type__for, sundry_code__for,acct_code__ar,cctr_code__ar " sql="select sundry_type__for, sundry_code__for,acct_code__ar,cctr_code__ar "
//+ "into :lstr_gltrace.sundry_type, :lstr_gltrace.sundry_code," //+ "into :lstr_gltrace.sundry_type, :lstr_gltrace.sundry_code,"
//+ ":lstr_gltrace.acct_code, :lstr_gltrace.cctr_code" //+ ":lstr_gltrace.acct_code, :lstr_gltrace.cctr_code"
+ "FROM MISC_RECEIPT WHERE TRAN_ID = ?"; + "FROM MISC_RECEIPT WHERE TRAN_ID = ?";
pstmt=conn.prepareStatement(sql);//added by monika 15 nov 2019
pstmt.setString(1,receiptNo ); pstmt.setString(1,receiptNo );
rs=pstmt.executeQuery(); rs=pstmt.executeQuery();
if(rs.next()) if(rs.next())
...@@ -2303,6 +2364,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2303,6 +2364,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
gltraceUpd.put("sundry_type", rs.getString("sundry_type__for")); gltraceUpd.put("sundry_type", rs.getString("sundry_type__for"));
gltraceUpd.put("sundry_code", rs.getString("sundry_code__for")); gltraceUpd.put("sundry_code", rs.getString("sundry_code__for"));
gltraceUpd.put("acct_code", rs.getString("acct_code__ar")); gltraceUpd.put("acct_code", rs.getString("acct_code__ar"));
// System.out.println("coount in miscc receipt"+ rs.getString("acct_code__ar"));
gltraceUpd.put("cctr_code", rs.getString("acct_code__ar")); gltraceUpd.put("cctr_code", rs.getString("acct_code__ar"));
} }
rs.close(); rs.close();
...@@ -2313,6 +2376,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2313,6 +2376,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
sundryBalUpd.put("sundry_type", gltraceUpd.get("sundry_type")); sundryBalUpd.put("sundry_type", gltraceUpd.get("sundry_type"));
sundryBalUpd.put("sundry_code", gltraceUpd.get("sundry_code")); sundryBalUpd.put("sundry_code", gltraceUpd.get("sundry_code"));
sundryBalUpd.put("acct_code", gltraceUpd.get("acct_code")); sundryBalUpd.put("acct_code", gltraceUpd.get("acct_code"));
// System.out.println("account code in miscc receipt"+ gltraceUpd.get("acct_code"));
sundryBalUpd.put("cctr_code", gltraceUpd.get("cctr_code")); sundryBalUpd.put("cctr_code", gltraceUpd.get("cctr_code"));
// route entry through sundry type and sundry code from misc. receipt // route entry through sundry type and sundry code from misc. receipt
...@@ -2325,11 +2389,13 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2325,11 +2389,13 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
gltraceUpd.put("curr_code", hdrMap.get("curr_code")); gltraceUpd.put("curr_code", hdrMap.get("curr_code"));
gltraceUpd.put("exch_rate", hdrMap.get("exch_rate")); gltraceUpd.put("exch_rate", hdrMap.get("exch_rate"));
gltraceUpd.put("cr_amt", hdrMap.get("net_amt")); gltraceUpd.put("cr_amt", hdrMap.get("net_amt"));
//System.out.println("gl altrace cr_amt "+hdrMap.get("net_amt"));
gltraceUpd.put("dr_amt", 0); gltraceUpd.put("dr_amt", 0);
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("sundry_type",hdrMap.get("remarks"));
//System.out.println("gltrace update 7 ["+gltraceUpd);
errString=Fcommon.glTraceUpdate(gltraceUpd, conn); errString=Fcommon.glTraceUpdate(gltraceUpd, conn);
if(errString!=null && errString.trim().length()>0) if(errString!=null && errString.trim().length()>0)
...@@ -2344,6 +2410,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2344,6 +2410,8 @@ 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"));
//System.out.println("gl altrace cr_amt 2in sundry for credit"+hdrMap.get("net_amt"));
sundryBalUpd.put("cr_amt", hdrMap.get("net_amt")); sundryBalUpd.put("cr_amt", hdrMap.get("net_amt"));
sundryBalUpd.put("dr_amt", 0.0); sundryBalUpd.put("dr_amt", 0.0);
sundryBalUpd.put("adv_amt",0.0); sundryBalUpd.put("adv_amt",0.0);
...@@ -2364,11 +2432,14 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2364,11 +2432,14 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
gltraceUpd.put("curr_code", hdrMap.get("curr_code")); gltraceUpd.put("curr_code", hdrMap.get("curr_code"));
gltraceUpd.put("exch_rate", hdrMap.get("exch_rate")); gltraceUpd.put("exch_rate", hdrMap.get("exch_rate"));
gltraceUpd.put("cr_amt", 0); gltraceUpd.put("cr_amt", 0);
//System.out.println("gl altrace cr_amt for debit amount "+hdrMap.get("net_amt"));
gltraceUpd.put("dr_amt", hdrMap.get("net_amt")); gltraceUpd.put("dr_amt", hdrMap.get("net_amt"));
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("sundry_type",hdrMap.get("remarks"));
//System.out.println("gltrace update 8["+gltraceUpd);
errString=Fcommon.glTraceUpdate(gltraceUpd, conn); errString=Fcommon.glTraceUpdate(gltraceUpd, conn);
if(errString!=null && errString.trim().length()>0) if(errString!=null && errString.trim().length()>0)
...@@ -2384,6 +2455,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2384,6 +2455,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", 0.0); sundryBalUpd.put("cr_amt", 0.0);
//System.out.println("gl altrace cr_amt for debit "+hdrMap.get("net_amt"));
sundryBalUpd.put("dr_amt", hdrMap.get("net_amt")); sundryBalUpd.put("dr_amt", hdrMap.get("net_amt"));
sundryBalUpd.put("adv_amt",0.0); sundryBalUpd.put("adv_amt",0.0);
sundryBalUpd.put("contact_code"," "); sundryBalUpd.put("contact_code"," ");
...@@ -2404,41 +2477,44 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2404,41 +2477,44 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
if (bankTranLog.get("sundry_code").toString()!=null && bankTranLog.get("sundry_code").toString().trim().length()>0 ) /// amish 09-11-04 if sundry code not null then if (bankTranLog.get("sundry_code").toString()!=null && bankTranLog.get("sundry_code").toString().trim().length()>0 ) /// amish 09-11-04 if sundry code not null then
{ {
//zahid 31/03/04 //zahid 31/03/04
/*select var_value into :ls_varvalue from finparm where prd_code = '999999' /*select var_value into :ls_varvalue from finparm where prd_code = '999999'
and var_name = 'CHANGE_CR_TERM';*/ and var_name = 'CHANGE_CR_TERM';*/
ls_varvalue=Fcommon.getFinparams("999999", "CHANGE_CR_TERM", conn); if(!"E".equalsIgnoreCase(sundryType.trim()))//added by monika to check for employee-15-11-19.
if("Y".equalsIgnoreCase(ls_varvalue.trim()))
{ {
if(crTerm!=null || crTerm.trim().length()>0 ) ls_varvalue=Fcommon.getFinparams("999999", "CHANGE_CR_TERM", conn);
if("Y".equalsIgnoreCase(ls_varvalue.trim()))
{ {
//prince --moved sql from below if(crTerm!=null || crTerm.trim().length()>0 )
sql="select cr_days from crterm where cr_term = ?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,crTerm );
rs=pstmt.executeQuery();
if(rs.next())
{ {
crDays=rs.getDouble("cr_days"); //prince --moved sql from below
} sql="select cr_days from crterm where cr_term = ?";
else pstmt=conn.prepareStatement(sql);
{ pstmt.setString(1,crTerm );
errorCode = "DS000"; rs=pstmt.executeQuery();
errString=itmDBAccessEJB.getErrorString("", errorCode, "", "", conn); if(rs.next())
return errString; {
} crDays=rs.getDouble("cr_days");
rs.close(); }
rs=null; else
pstmt.close(); {
pstmt=null; errorCode = "DS000";
creditDays = crDays; //prince --14-08-06 errString=itmDBAccessEJB.getErrorString("", errorCode, "", "", conn);
//ended by prince return errString;
}
rs.close();
rs=null;
pstmt.close();
pstmt=null;
creditDays = crDays; //prince --14-08-06
//ended by prince
//credit_prd = :lc_crdays --prince --11-08-06 //credit_prd = :lc_crdays --prince --11-08-06
//following code commented by ajit on date 22-May-2017 //following code commented by ajit on date 22-May-2017
/*select credit_prd into :lc_crprd from customer /*select credit_prd into :lc_crprd from customer
where cust_code = :lstr_banktranlog.sundry_code ; where cust_code = :lstr_banktranlog.sundry_code ;
if get_sqlcode() < 0 then if get_sqlcode() < 0 then
populateerror(9999,'populateerror') populateerror(9999,'populateerror')
...@@ -2447,178 +2523,181 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2447,178 +2523,181 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
exit exit
end if*/ end if*/
//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="",colName=""; String tname="",colName="";
if("C".equalsIgnoreCase(sundryType.trim())) if("C".equalsIgnoreCase(sundryType.trim()))
{ {
tname="customer"; tname="customer";
colName="cust_code"; colName="cust_code";
} }
else if("S".equalsIgnoreCase(sundryType.trim())) else if("S".equalsIgnoreCase(sundryType.trim()))
{ {
tname="supplier"; tname="supplier";
colName="supp_code"; colName="supp_code";
} }
else if("T".equalsIgnoreCase(sundryType.trim())) else if("T".equalsIgnoreCase(sundryType.trim()))
{ {
tname="transporter"; tname="transporter";
colName="tran_code"; colName="tran_code";
} }
else if("X".equalsIgnoreCase(sundryType.trim())) else if("X".equalsIgnoreCase(sundryType.trim()))
{ {
tname="tax_authority"; tname="tax_authority";
colName="tauth_code"; colName="tauth_code";
} }
sql="select credit_prd from "+tname+" " sql="select credit_prd from "+tname+" "
+ "where "+colName+" = ?"; + "where "+colName+" = ?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,bankTranLog.get("sundry_code").toString() );
rs=pstmt.executeQuery();
if(rs.next())
{
lc_crprd=rs.getDouble("credit_prd");
}
else
{
errorCode = "DS000";
errString=itmDBAccessEJB.getErrorString("", errorCode, "", "", conn);
return errString;
}
rs.close();
rs=null;
pstmt.close();
pstmt=null;
//end of the code added by ajit on date 22-May-2017
//doubt
/*if(lc_crprd==null) pstmt=conn.prepareStatement(sql);
pstmt.setString(1,bankTranLog.get("sundry_code").toString() );
rs=pstmt.executeQuery();
if(rs.next())
{
lc_crprd=rs.getDouble("credit_prd");
}
else
{
errorCode = "DS000";
errString=itmDBAccessEJB.getErrorString("", errorCode, "", "", conn);
return errString;
}
rs.close();
rs=null;
pstmt.close();
pstmt=null;
//end of the code added by ajit on date 22-May-2017
//doubt
/*if(lc_crprd==null)
{ {
lc_crdays = lc_crprd ;//prince --14-08-06 lc_crdays = lc_crprd ;//prince --14-08-06
}*/ }*/
if(lc_crprd==0) if(lc_crprd==0)
{ {
crDays = lc_crprd; crDays = lc_crprd;
} }
//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())) 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
update customer set cr_term = :ls_crterm , credit_prd = :lc_crdays , credit_lmt = :lc_credit_limit update customer set cr_term = :ls_crterm , credit_prd = :lc_crdays , credit_lmt = :lc_credit_limit
where cust_code = :lstr_banktranlog.sundry_code ; where cust_code = :lstr_banktranlog.sundry_code ;
else else
update customer set cr_term = :ls_crterm , credit_prd = :lc_crdays update customer set cr_term = :ls_crterm , credit_prd = :lc_crdays
where cust_code = :lstr_banktranlog.sundry_code ; where cust_code = :lstr_banktranlog.sundry_code ;
end if end if
*/ */
//end of the code addded by ajit on date 22-May-2017 //end of the code addded 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
tname=""; tname="";
boolean setCrLimit=false; boolean setCrLimit=false;
if("C".equalsIgnoreCase(sundryType.trim())) if("C".equalsIgnoreCase(sundryType.trim()))
{ {
tname="customer"; tname="customer";
colName="cust_code"; colName="cust_code";
if(creditLimit>0) if(creditLimit>0)
{ {
setCrLimit=true; setCrLimit=true;
} }
} }
else if("S".equalsIgnoreCase(sundryType.trim())) else if("S".equalsIgnoreCase(sundryType.trim()))
{
tname="supplier";
colName="supp_code";
if(creditLimit>0)
{ {
setCrLimit=true; tname="supplier";
colName="supp_code";
if(creditLimit>0)
{
setCrLimit=true;
}
} }
} else if("T".equalsIgnoreCase(sundryType.trim()))
else if("T".equalsIgnoreCase(sundryType.trim()))
{
tname="transporter";
colName="tran_code";
if(creditLimit>0)
{ {
setCrLimit=true; tname="transporter";
} colName="tran_code";
} if(creditLimit>0)
else if("X".equalsIgnoreCase(sundryType.trim())) {
{ setCrLimit=true;
tname="tax_authority"; }
colName="tauth_code"; }
if(creditLimit>0) else if("X".equalsIgnoreCase(sundryType.trim()))
{ {
setCrLimit=true; tname="tax_authority";
colName="tauth_code";
if(creditLimit>0)
{
setCrLimit=true;
}
} }
} //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 "+tname+" 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 "+colName+" = ?"; sql=sql+ "where "+colName+" = ?";
// System.out.println("sql"+sql); // 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);
if(setCrLimit) if(setCrLimit)
{ {
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 else
{ {
pstmt.setString(3,bankTranLog.get("sundry_code").toString()); pstmt.setString(3,bankTranLog.get("sundry_code").toString());
} }
int updSundry=pstmt.executeUpdate(); int updSundry=pstmt.executeUpdate();
pstmt.close(); pstmt.close();
pstmt=null; pstmt=null;
//Ended By Rutuja on 20-09-2011 for FI90SUN018 //Ended By Rutuja on 20-09-2011 for FI90SUN018
/// amish 02-03-05 amish /// amish 02-03-05 amish
if(updSundry<=0) if(updSundry<=0)
{ {
errorCode = "DS000NR"; errorCode = "DS000NR";
errString=itmDBAccessEJB.getErrorString("", errorCode, "", "", conn); errString=itmDBAccessEJB.getErrorString("", errorCode, "", "", conn);
return errString; return errString;
} }
/// end by amish 02-03-05 amish /// end by amish 02-03-05 amish
lc_crprd=0; lc_crprd=0;
//doubt cursor //doubt cursor
sql="select credit_prd from customer_series " sql="select credit_prd from customer_series "
+ "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(); rs=pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
lc_crprd=rs.getDouble("credit_prd"); lc_crprd=rs.getDouble("credit_prd");
} }
rs.close(); rs.close();
rs=null; rs=null;
pstmt.close(); pstmt.close();
pstmt=null; pstmt=null;
/*declare c_custser cursor for /*declare c_custser cursor for
select credit_prd select credit_prd
from customer_series from customer_series
where cust_code = :lstr_banktranlog.sundry_code where cust_code = :lstr_banktranlog.sundry_code
...@@ -2632,47 +2711,48 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2632,47 +2711,48 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
exit exit
end if end if
close c_custser ;*/ close c_custser ;*/
////End Added to take care of 'select returned more than one row', Ruchira 17/08/2k6. ////End Added to take care of 'select returned more than one row', Ruchira 17/08/2k6.
//added by prince --16-08-06 //added by prince --16-08-06
//if isnull(lc_crprd) then //if isnull(lc_crprd) then
if(lc_crprd>0) if(lc_crprd>0)
{ {
crDays = lc_crprd; crDays = lc_crprd;
} }
//else //else
//lc_crdays = lc_creditdays //Commented Ruchira 17/08/2k6, for not to set credit period. //lc_crdays = lc_creditdays //Commented Ruchira 17/08/2k6, for not to set credit period.
//end if //end if
//ended by prince //ended by prince
sql="update customer_series set cr_term = ?,credit_prd = ? "; sql="update customer_series set cr_term = ?,credit_prd = ? ";
if(creditLimit>0) if(creditLimit>0)
{ {
sql=sql+",credit_lmt = ?"; sql=sql+",credit_lmt = ?";
} }
sql=sql + "where cust_code = ?"; sql=sql + "where cust_code = ?";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
pstmt.setString(1, crTerm); pstmt.setString(1, crTerm);
pstmt.setDouble(2, crDays); pstmt.setDouble(2, crDays);
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 else
{ {
pstmt.setString(3, bankTranLog.get("sundry_code").toString()); 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 <=0) if(updcustSer <=0)
{ {
errorCode = "DS000"; errorCode = "DS000";
errString=itmDBAccessEJB.getErrorString("", errorCode, "", "", conn); errString=itmDBAccessEJB.getErrorString("", errorCode, "", "", conn);
return errString; return errString;
}
} }
} }
} }
...@@ -2801,7 +2881,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2801,7 +2881,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
public String gbfPostRcpDishnrDet(ArrayList<HashMap> detList,ArrayList<HashMap> advList,HashMap hdrMap,String xtraParams,Connection conn) throws ITMException public String gbfPostRcpDishnrDet(ArrayList<HashMap> detList,ArrayList<HashMap> advList,HashMap hdrMap,String xtraParams,Connection conn) throws ITMException
{ {
String errString="",sql=""; String errString="",sql="",tranid="",tranSerPay="",refNoPay="";
String errorCode ="", refNo="", refSer="", salesPers="", ls_tranid="",ls_tran_ser="",sundryType="",receiptNo=""; String errorCode ="", refNo="", refSer="", salesPers="", ls_tranid="",ls_tran_ser="",sundryType="",receiptNo="";
double rcpAmt=0, adjAmt=0, Amt=0, lc_adj=0, repaidAmt=0; double rcpAmt=0, adjAmt=0, Amt=0, lc_adj=0, repaidAmt=0;
Timestamp ld_today=null; Timestamp ld_today=null;
...@@ -2816,7 +2896,45 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2816,7 +2896,45 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
{ {
ld_today =new Timestamp(System.currentTimeMillis()); ld_today =new Timestamp(System.currentTimeMillis());
rcpdetList=detList; rcpdetList=detList;
receiptNo=hdrMap.get("receipt_no").toString();
tranid=hdrMap.get("tran_id").toString();
if ("M".equalsIgnoreCase(hdrMap.get("tran_ser").toString()))
{
sql="select tran_ser__pay, ref_no__pay, adj_amt from misc_pay_rcp_trace "
+ "where tran_id__rcp = ?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1, receiptNo);
rs=pstmt.executeQuery();
while(rs.next())
{
tranSerPay=rs.getString("tran_ser__pay");
refNoPay=rs.getString("ref_no__pay");
lc_adj=rs.getDouble("adj_amt");
sql="update misc_payables set adj_amt=adj_amt+? where tran_ser=? and ref_no=?";
pstmt1=conn.prepareStatement(sql);
pstmt1.setDouble(1, lc_adj);
pstmt1.setString(2, tranSerPay);
pstmt1.setString(3, refNoPay);
int paycount=pstmt1.executeUpdate();
if(paycount<=0)
{
// System.out.println("Inside errCode");
errorCode = "DS000NR";
errString=itmDBAccessEJB.getErrorString("", errorCode, "", "", conn);
return errString;
}
pstmt1.close();
pstmt1=null;
}
rs.close();
rs=null;
pstmt.close();
pstmt=null;
}
for (HashMap eachDet :rcpdetList) for (HashMap eachDet :rcpdetList)
{ {
...@@ -2872,8 +2990,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2872,8 +2990,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
int updrcv=pstmt.executeUpdate(); int updrcv=pstmt.executeUpdate();
if(updrcv<=0) if(updrcv<=0)
{ {
// System.out.println("Inside errCode"); // System.out.println("Inside errCode");
errorCode = "DS000"; errorCode = "DS000NR";
errString=itmDBAccessEJB.getErrorString("", errorCode, "", "", conn); errString=itmDBAccessEJB.getErrorString("", errorCode, "", "", conn);
return errString; return errString;
} }
...@@ -2918,7 +3036,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2918,7 +3036,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
//ls_tranid = lds_hdr.getitemstring(1, "tran_id") //ls_tranid = lds_hdr.getitemstring(1, "tran_id")
ls_tranid=hdrMap.get("tran_id").toString(); ls_tranid=hdrMap.get("tran_id").toString();
// System.out.println("Inside recodealer"); // System.out.println("Inside recodealer");
errString = gbfMiscCreditNoteOsRecoDealer(recoFiltMap, recoDataMap, "D", "RCPDIS", ls_tranid,xtraParams,conn); errString = gbfMiscCreditNoteOsRecoDealer(recoFiltMap, recoDataMap, "D", "RCPDIS", ls_tranid,xtraParams,conn);
if(errString!=null && errString.trim().length()>0) if(errString!=null && errString.trim().length()>0)
{ {
...@@ -2932,7 +3050,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2932,7 +3050,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
// adjustment of advances knocked off in the receipt // adjustment of advances knocked off in the receipt
//ll_rows1 = lds_adv.rowcount() //ll_rows1 = lds_adv.rowcount()
// System.out.println("Inside detail posting"); // System.out.println("Inside detail posting");
for(HashMap eachAdv:advList) for(HashMap eachAdv:advList)
{ {
refSer=eachAdv.get("ref_ser").toString(); refSer=eachAdv.get("ref_ser").toString();
...@@ -2950,7 +3068,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2950,7 +3068,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
int updrcv1=pstmt.executeUpdate(); int updrcv1=pstmt.executeUpdate();
if(updrcv1<=0) if(updrcv1<=0)
{ {
errorCode = "DS000"; errorCode = "DS000NR";
errString=itmDBAccessEJB.getErrorString("", errorCode, "", "", conn); errString=itmDBAccessEJB.getErrorString("", errorCode, "", "", conn);
return errString; return errString;
} }
...@@ -2976,7 +3094,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -2976,7 +3094,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
} }
} }
// System.out.println("Post Detail"+errString); // System.out.println("Post Detail"+errString);
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -3036,8 +3154,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -3036,8 +3154,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
try try
{ {
ld_today =new Timestamp(System.currentTimeMillis()); ld_today =new Timestamp(System.currentTimeMillis());
// System.out.println("Inside acct Posting"); // System.out.println("Inside acct Posting");
// System.out.println("acctList"+acctList); // System.out.println("acctList"+acctList);
...@@ -3086,7 +3204,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -3086,7 +3204,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
//Added By Yogesh 11/07/2005 //Added By Yogesh 11/07/2005
ls_curr=eachAcct.get("curr_code").toString(); ls_curr=eachAcct.get("curr_code").toString();
// System.out.println("Inside acct header before"+hdrMap.get("curr_code")); System.out.println("Inside acct header before"+hdrMap.get("acct_code"));
if(ls_curr!=null && ls_curr.trim().length()>0) if(ls_curr!=null && ls_curr.trim().length()>0)
{ {
gltraceUpd.put("curr_code", ls_curr); gltraceUpd.put("curr_code", ls_curr);
...@@ -3098,10 +3216,10 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -3098,10 +3216,10 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
} }
//gltraceUpd.put("curr_code", eachAcct.get("curr_code")); //gltraceUpd.put("curr_code", eachAcct.get("curr_code"));
//System.out.println("gl updated list amount :["+ eachAcct.get("amount")); System.out.println("gl updated list amount :["+ eachAcct.get("amount"));
gltraceUpd.put("exch_rate", eachAcct.get("exch_rate")); gltraceUpd.put("exch_rate", eachAcct.get("exch_rate"));
advAmt=(Double)eachAcct.get("amount"); advAmt=(Double)eachAcct.get("amount");
//System.out.println("advamt in accountlist"+advAmt); System.out.println("advamt in accountlist"+advAmt);
if(advAmt>0) if(advAmt>0)
{ {
//lstr_gltrace.dr_amt = lds_det.getitemnumber(ll_ctr, "amount") //lstr_gltrace.dr_amt = lds_det.getitemnumber(ll_ctr, "amount")
...@@ -3120,7 +3238,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -3120,7 +3238,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
//gltraceUpd.put("cr_amt",( eachAcct.get("amount"))); //gltraceUpd.put("cr_amt",( eachAcct.get("amount")));
gltraceUpd.put("cr_amt", -advAmt); gltraceUpd.put("cr_amt", -advAmt);
} }
...@@ -3128,6 +3246,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -3128,6 +3246,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
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("remarks",hdrMap.get("remarks")); gltraceUpd.put("remarks",hdrMap.get("remarks"));
System.out.println("gltrace update 9 ["+gltraceUpd);
errString=Fcommon.glTraceUpdate(gltraceUpd, conn); errString=Fcommon.glTraceUpdate(gltraceUpd, conn);
if(errString!=null && errString.trim().length()>0) if(errString!=null && errString.trim().length()>0)
...@@ -3149,11 +3268,14 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis ...@@ -3149,11 +3268,14 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
sundryBalUpd.put("sundry_code", gltraceUpd.get("sundry_code")); sundryBalUpd.put("sundry_code", gltraceUpd.get("sundry_code"));
sundryBalUpd.put("curr_code", hdrMap.get("curr_code")); sundryBalUpd.put("curr_code", hdrMap.get("curr_code"));
sundryBalUpd.put("acct_code", eachAcct.get("acct_code")); sundryBalUpd.put("acct_code", eachAcct.get("acct_code"));
System.out.println("advamt in accost in where condition"+ eachAcct.get("acct_code"));
sundryBalUpd.put("cctr_code", eachAcct.get("cctr_code")); sundryBalUpd.put("cctr_code", eachAcct.get("cctr_code"));
sundryBalUpd.put("exch_rate", eachAcct.get("exch_rate")); sundryBalUpd.put("exch_rate", eachAcct.get("exch_rate"));
advAmt=(Double)eachAcct.get("amount"); advAmt=(Double)eachAcct.get("amount");
// System.out.println("advamt in accountlist in where condition"+advAmt); System.out.println("advamt in accountlist in where condition"+advAmt);
if(advAmt>0) if(advAmt>0)
{ {
sundryBalUpd.put("dr_amt", eachAcct.get("amount")); sundryBalUpd.put("dr_amt", eachAcct.get("amount"));
......
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