Commit 9f6ca7eb authored by caluka's avatar caluka

Currency code is set from customer code[F14ISUN014]


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@98650 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 86f5b1f1
......@@ -583,7 +583,7 @@ public class EcollectionIC extends ValidatorEJB implements EcollectionICLocal, E
if (rs.next())
{
bankName = checkNull(rs.getString("BANK_NAME"));
currencyCode = checkNull(rs.getString("CURR_CODE"));
//currencyCode = checkNull(rs.getString("CURR_CODE"));
}
rs.close();
rs = null;
......@@ -598,9 +598,8 @@ public class EcollectionIC extends ValidatorEJB implements EcollectionICLocal, E
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+"]");
//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");
}
......@@ -617,35 +616,39 @@ public class EcollectionIC extends ValidatorEJB implements EcollectionICLocal, E
if( rs.next() )
{
bankName = checkNull(rs.getString( "BANK_NAME" ));
currencyCode = checkNull(rs.getString("CURR_CODE"));
//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+"]");
//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");
//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" ) )
{
custCode = checkNull(genericUtility.getColumnValue("cust_code",dom));
sql = "SELECT CUST_NAME FROM CUSTOMER WHERE CUST_CODE = ?";
sql = "SELECT CUST_NAME,CURR_CODE FROM CUSTOMER WHERE CUST_CODE = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, custCode);
rs = pstmt.executeQuery();
if( rs.next() )
{
custName = checkNull(rs.getString( "CUST_NAME" ));
currencyCode = rs.getString("CURR_CODE");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
System.out.println("custName["+custName+"]");
exchangeRate = finCommon.getDailyExchRateSellBuy(currencyCode,"",loginSite, checkNull(sysDate), "S", conn);
System.out.println("exchangeRate in (cust_code) :"+exchangeRate);
valueXmlString.append("<exch_rate>").append("<![CDATA["+exchangeRate+"]]>").append("</exch_rate>\r\n");
valueXmlString.append("<curr_code><![CDATA[").append(currencyCode).append("]]></curr_code>\r\n");
valueXmlString.append("<cust_name><![CDATA[").append(custName).append("]]></cust_name>\r\n");
......@@ -674,20 +677,20 @@ public class EcollectionIC extends ValidatorEJB implements EcollectionICLocal, E
if (rs.next())
{
bankName = checkNull(rs.getString("BANK_NAME"));
currencyCode = checkNull(rs.getString("CURR_CODE"));
//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+"]");
//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("<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