Commit 08fefb36 authored by caluka's avatar caluka

add CURR_CODE,EXCH_RATE in RECEIPT_FORM table


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@97956 ce508802-f39f-4f6c-b175-0d175dae99d5
parent f8401867
......@@ -525,8 +525,8 @@ public class EcollectionIC extends ValidatorEJB implements EcollectionICLocal, E
String columnValue="";
String loginSite="",loginSiteDesc="",siteCodeDesc="",hdrCustCode="",hdrSiteCode="";
String bankCode="",siteCode="",custCode="",bankName="",custName="",refNo="",refSer="";
double rcpAmt1=0;
String bankCode="",siteCode="",custCode="",bankName="",custName="",refNo="",refSer="",currencyCode="";
double rcpAmt1=0, exchangeRate= 0.0;
try
{
......@@ -536,6 +536,7 @@ public class EcollectionIC extends ValidatorEJB implements EcollectionICLocal, E
conn = connDriver.getConnectDB("DriverITM");
conn.setAutoCommit(false);
connDriver = null;
FinCommon finCommon= new FinCommon();
if(objContext != null && objContext.trim().length()>0)
{
......@@ -575,13 +576,14 @@ public class EcollectionIC extends ValidatorEJB implements EcollectionICLocal, E
rs = null;
pstmt.close();
pstmt = null;
sql = "SELECT BANK_NAME FROM BANK WHERE BANK_CODE =?";
sql = "SELECT BANK_NAME,CURR_CODE FROM BANK WHERE BANK_CODE =?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, bankCode);
rs = pstmt.executeQuery();
if (rs.next())
{
bankName = checkNull(rs.getString("BANK_NAME"));
currencyCode = checkNull(rs.getString("CURR_CODE"));
}
rs.close();
rs = null;
......@@ -595,26 +597,38 @@ public class EcollectionIC extends ValidatorEJB implements EcollectionICLocal, E
valueXmlString.append("<status><![CDATA[").append("E").append("]]></status>\r\n");
valueXmlString.append("<tran_type><![CDATA[").append("E").append("]]></tran_type>\r\n");
valueXmlString.append("<bank_name>").append("<![CDATA["+bankName+"]]>").append("</bank_name>\r\n");
valueXmlString.append("<curr_code>").append("<![CDATA["+currencyCode+"]]>").append("</curr_code>\r\n");
//exchangeRate = finCommon.getDailyExchRateSellBuy(currencyCode,"",loginSite, genericUtility.getColumnValue("tran_date", dom), "S", conn);
exchangeRate = finCommon.getDailyExchRateSellBuy(currencyCode,"",loginSite, checkNull(sysDate), "S", conn);
System.out.println("exchangeRate>>>>["+exchangeRate+"]");
valueXmlString.append("<exch_rate>").append("<![CDATA["+exchangeRate+"]]>").append("</exch_rate>\r\n");
}
else if( currentColumn.trim().equalsIgnoreCase( "bank_code" ) )
{
bankCode = checkNull(genericUtility.getColumnValue("bank_code",dom));
currencyCode = checkNull(genericUtility.getColumnValue("curr_code",dom));
siteCode = checkNull(genericUtility.getColumnValue("site_code",dom));
sql = "SELECT BANK_NAME FROM BANK WHERE BANK_CODE =?";
sql = "SELECT BANK_NAME,CURR_CODE FROM BANK WHERE BANK_CODE =?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, bankCode);
rs = pstmt.executeQuery();
if( rs.next() )
{
bankName = checkNull(rs.getString( "BANK_NAME" ));
currencyCode = checkNull(rs.getString("CURR_CODE"));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
System.out.println("date>>>>>>"+genericUtility.getColumnValue("tran_date", dom));
exchangeRate = finCommon.getDailyExchRateSellBuy(currencyCode,"",siteCode, genericUtility.getColumnValue("tran_date", dom), "S", conn);
System.out.println("exchangeRate>>>>@@@@@@@@@["+exchangeRate+"]");
valueXmlString.append("<bank_name>").append("<![CDATA["+bankName+"]]>").append("</bank_name>\r\n");
valueXmlString.append("<curr_code>").append("<![CDATA["+currencyCode+"]]>").append("</curr_code>\r\n");
valueXmlString.append("<exch_rate>").append("<![CDATA["+exchangeRate+"]]>").append("</exch_rate>\r\n");
}else if( currentColumn.trim().equalsIgnoreCase( "cust_code" ) )
{
......@@ -653,21 +667,27 @@ public class EcollectionIC extends ValidatorEJB implements EcollectionICLocal, E
rs = null;
pstmt.close();
pstmt = null;
sql = "SELECT BANK_NAME FROM BANK WHERE BANK_CODE =?";
sql = "SELECT BANK_NAME,CURR_CODE FROM BANK WHERE BANK_CODE =?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, bankCode);
rs = pstmt.executeQuery();
if (rs.next())
{
bankName = checkNull(rs.getString("BANK_NAME"));
currencyCode = checkNull(rs.getString("CURR_CODE"));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
System.out.println("date>>>>>>"+genericUtility.getColumnValue("tran_date", dom));
exchangeRate = finCommon.getDailyExchRateSellBuy(currencyCode,"",siteCode, genericUtility.getColumnValue("tran_date", dom), "S", conn);
System.out.println("exchangeRate>>>>@@@@@@@@@>>>>>>>>>["+exchangeRate+"]");
valueXmlString.append("<descr><![CDATA[").append(siteCodeDesc).append("]]></descr>\r\n");
valueXmlString.append("<bank_code><![CDATA[").append(bankCode).append("]]></bank_code>\r\n");
valueXmlString.append("<bank_name><![CDATA[").append(bankName).append("]]></bank_name>\r\n");
valueXmlString.append("<curr_code>").append("<![CDATA["+currencyCode+"]]>").append("</curr_code>\r\n");
valueXmlString.append("<exch_rate>").append("<![CDATA["+exchangeRate+"]]>").append("</exch_rate>\r\n");
}
valueXmlString.append("</Detail1>");
break;
......
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