Skip to content

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

:On confirmation of receipt dishonor system is giving error of coin difference... 

:On confirmation of receipt dishonor system is giving error of coin difference error. the receipt includes packing credit adjustment and taxes in details

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@212239 ce508802-f39f-4f6c-b175-0d175dae99d5
parent b4cee4aa
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 19 deletions
webitm-fin/src/ibase/webitm/ejb/fin/adv/ReceiptDishonourConf.java
View file @ 0727570e
......@@ -299,8 +299,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
}
//end
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("acct_code__cf",rs.getString("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_date",rs.getTimestamp("ref_date"));
rcpHnrHdr.put("cctr_code__cf",checkNull(rs.getString("cctr_code__cf")));
......@@ -707,8 +707,6 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
rs = pstmt.executeQuery();
while(rs.next())
{
refSer =rs.getString("ref_ser");
refNo = rs.getString("ref_no");
totAmt = rs.getDouble("tot_amt");
......@@ -742,14 +740,13 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
pstmt1.setDouble(8, diffAmtExch);
pstmt1.setString(9, acctCode);
pstmt1.setString(10, cctrCode);
int insAdv=pstmt1.executeUpdate();
pstmt1.clearParameters();
pstmt1.close();
pstmt1 = null;
if (insAdv<=0)
{
errorCode = "DS000" ;
errString=itmDBAccessEJB.getErrorString("", errorCode, "", "", conn);
return errString;
......@@ -794,9 +791,7 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
rcpHnrDeta.put("sundry_code", checkNull(rs.getString("sundry_code")));
rcpHnrDeta.put("curr_code", checkNull(rs.getString("curr_code")));
rcpHnracctList.add(rcpHnrDeta);
}
// System.out.println("populating rcpHnracctList list[4]"+rcpHnracctList+"]");
rs.close();
rs = null;
......@@ -828,12 +823,10 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
pstmt.close();
pstmt = null;
//System.out.println("populating rcpHnradv account list[5]"+rcpHnradvList+"]");
// shiri 23/05/02 changed no. of parameters
errString = gbfPostRcpDishnr(rcpHnrHdr, rcpHnrDetList, rcpHnracctList,rcpHnradvList,xtraParams,conn);
//prince --22-09-06
//ended by prince
if (errString!=null && errString.trim().length()>0)
{
//conn.rollback();
......@@ -894,13 +887,15 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
Timestamp ld_today=null, tranDate=null;
String ls_comm_calc_on_off="",ls_conf_drcr_opt="",ls_conf_jv_opt="";
String ls_var_miscdrcr_val="";
//following code added by ajit on date 03-mar-2017
StringBuffer xmlBuff = new StringBuffer();
//nvo_business_object_misc_drcrrcp nvo_misc
MiscDrCrRcpConf miscdrcr=new MiscDrCrRcpConf();
FinCommon Fcommon=new FinCommon();
DistCommon distcommon=new DistCommon();
ResultSet rs=null,rs1=null,rs2=null;
PreparedStatement pstmt=null,pstmt1=null,pstmt2=null;
try
......@@ -1148,7 +1143,6 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
if("Y".equalsIgnoreCase(autoDrNote.trim()) || "C".equalsIgnoreCase(debitTo))// For reason_code = Customer //auto_debit_note added by Rutuja on 20-09-2011 for FI90SUN004 check check flag value
{
xmlBuff.append("<?xml version='1.0' encoding='ISO-8859-1'?>\n");
xmlBuff.append("<DocumentRoot>");
xmlBuff.append("<description>").append("Datawindow Root").append("</description>");
......@@ -1320,14 +1314,17 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
pstmt.close();
pstmt=null;
}
//String ls_today=new SimpleDateFormat(new E12GenericUtility().getApplDateFormat())
exchRate = Fcommon.getDailyExchRateSellBuy(ls_curr, "RS", siteCode, ld_today.toString(), "B",conn);
//System.out.println("apnd act code "+acctCode);
System.out.println("apnd act code "+acctCode);
xmlBuff.append("<acct_code><![CDATA[" + (acctCode) + "]]></acct_code>");
xmlBuff.append("<cctr_code><![CDATA[" + (cctrCode) + "]]></cctr_code>");
xmlBuff.append("<curr_code><![CDATA[" + (ls_curr) + "]]></curr_code>");
xmlBuff.append("<exch_rate><![CDATA[" + (exchRate) + "]]></exch_rate>");
xmlBuff.append("<fin_entity><![CDATA[" + (finEnt) + "]]></fin_entity>");
xmlBuff.append("<amount>"+(netAmt)+"</amount>");
xmlBuff.append("<amount__bc>"+((netAmt*exchRate))+"</amount__bc>");
xmlBuff.append("</Detail1>");
......@@ -1338,10 +1335,10 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
xmlBuff.append("<line_no>"+("1")+"</line_no>");
xmlBuff.append("<amount>"+(bankCharges)+"</amount>");
xmlBuff.append("<acct_code>"+(acctBc)+"</acct_code>");
// System.out.println("aact 2 ["+acctBc);
System.out.println("aact 2 ["+acctBc);
xmlBuff.append("<cctr_code>"+(cctrBc)+"</cctr_code>");
xmlBuff.append("<reas_code>"+(reasonCode)+"</reas_code>");
//Added by Rutuja on 24-01-13 for FI2B008
sql="select stan_code from site where site_code = ? ";
pstmt=conn.prepareStatement(sql);
......@@ -1381,9 +1378,9 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
pstmt.close();
pstmt=null;
taxClass = distcommon.getTaxClass("C", custCode, "", siteCode,conn);
taxChap = distcommon.getTaxChap("", itemSer, "C", custCode, siteCode,conn);
taxEnv = distcommon.getTaxEnv(stationFrom, stationTo, taxChap, taxClass, siteCode,conn);
taxClass= distcommon.getTaxClass("C", custCode, "", siteCode,conn);
taxChap= distcommon.getTaxChap("", itemSer, "C", custCode, siteCode,conn);
taxEnv= distcommon.getTaxEnv(stationFrom, stationTo, taxChap, taxClass, siteCode,conn);
xmlBuff.append("<tax_class>"+(taxClass)+"</tax_class>");
......@@ -1539,7 +1536,8 @@ public class ReceiptDishonourConf extends ActionHandlerEJB implements ReceiptDis
rs=null;
pstmt.close();
pstmt=null;
//System.out.println("supplier acct code::"+acctCode);
System.out.println("supplier acct code::"+acctCode);
xmlBuff.append("<acct_code__ap><![CDATA[" + (acctCode) + "]]></acct_code__ap>");
xmlBuff.append("<cctr_code__ap><![CDATA[" + (cctrCode) + "]]></cctr_code__ap>");
xmlBuff.append("<acct_code__adv><![CDATA[" + (acctAdv) + "]]></acct_code__adv>");
......
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