Commit 5be7ddd1 authored by msingh's avatar msingh

Changed by Manish on 28/03/16 for DDUK .


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@101007 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 4876d8f7
...@@ -645,7 +645,8 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -645,7 +645,8 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
invoiceDetailsMap.put("remarks","Advance receipt against SO No. "+saleOrderL); invoiceDetailsMap.put("remarks","Advance receipt against SO No. "+saleOrderL);
invoiceDetailsMap.put("bank_code",bankCode);//Need to discuss invoiceDetailsMap.put("bank_code",bankCode);//Need to discuss
invoiceDetailsMap.putAll(custDetail(custCode, bankCode, conn)); // invoiceDetailsMap.putAll(custDetail(custCode, bankCode, conn));
invoiceDetailsMap.putAll(custDetail(custCode, bankCode, siteCodeDesp, conn));
System.out.println("invoiceDetailsMap from custDetail------>>"+invoiceDetailsMap); System.out.println("invoiceDetailsMap from custDetail------>>"+invoiceDetailsMap);
SimpleDateFormat sdf1 = new SimpleDateFormat(genericUtility.getApplDateFormat()); SimpleDateFormat sdf1 = new SimpleDateFormat(genericUtility.getApplDateFormat());
String trDate = sdf1.format(currDate).toString(); String trDate = sdf1.format(currDate).toString();
...@@ -2620,20 +2621,31 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -2620,20 +2621,31 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
} }
return stdExchRate; return stdExchRate;
} }
private HashMap custDetail(String custCode,String bankCode,Connection conn )throws ITMException, SQLException private HashMap custDetail(String custCode,String bankCode,String siteCode,Connection conn )throws ITMException, SQLException
{ {
ResultSet rs = null; ResultSet rs = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
String sql = "",custDetail = ""; String sql = "",custDetail = "";
String custName = "",acctCodeAr = "",cctrCodeAr = "",currCode = "",rcpMode = ""; String custName = "",acctCodeAr = "",cctrCodeAr = "",currCode = "",rcpMode = "",finCurrCode = "";
String acctCodeAdv = "",cctrCodeAdv = "",finEntity = "",bankName = "",acctCodeBal = ""; String acctCodeAdv = "",cctrCodeAdv = "",finEntity = "",bankName = "",acctCodeBal = "";
String cctrCodeBal = "",acctCodeCf = "",cctrCodeCf = "",custBankRef = "",acctCodeCfAr = ""; String cctrCodeBal = "",acctCodeCf = "",cctrCodeCf = "",custBankRef = "",acctCodeCfAr = "";
String lineNo = "",cctrCodeCfAr = ""; String lineNo = "",cctrCodeCfAr = "";
HashMap rcpMap = new HashMap (); HashMap rcpMap = new HashMap ();
double stdExchRate = 0; double stdExchRate = 0;
boolean flag = false; boolean flag = false;
String exchRate = "";
FinCommon finCommon = new FinCommon();
DistCommon discommon = new DistCommon();
GenericUtility genericUtility = GenericUtility.getInstance();
java.sql.Timestamp currDate = null;
try try
{ {
//Changed by manish on 28/03/16 for getting current date [start]
currDate = new java.sql.Timestamp(System.currentTimeMillis());
SimpleDateFormat sdfAppl = new SimpleDateFormat(genericUtility.getApplDateFormat());
String currDateStr = sdfAppl.format(currDate);
//Changed by manish on 28/03/16 for getting current date [end]
if(custCode != null && custCode.length() > 0) if(custCode != null && custCode.length() > 0)
{ {
sql = "SELECT CUST_NAME,ACCT_CODE__AR,CCTR_CODE__AR,CURR_CODE,RCP_MODE,ACCT_CODE__ADV," sql = "SELECT CUST_NAME,ACCT_CODE__AR,CCTR_CODE__AR,CURR_CODE,RCP_MODE,ACCT_CODE__ADV,"
...@@ -2723,9 +2735,68 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -2723,9 +2735,68 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
rcpMap.put("cctr_code__cf",cctrCodeCf); rcpMap.put("cctr_code__cf",cctrCodeCf);
rcpMap.put("curr_code",currCode); rcpMap.put("curr_code",currCode);
String exchangeRate = getColumnDescr(conn, "std_exrt", "currency", "curr_code", currCode); // String exchangeRate = getColumnDescr(conn, "std_exrt", "currency", "curr_code", currCode);
System.out.println("exchangeRate-------->>"+exchangeRate);
rcpMap.put("exch_rate",exchangeRate); //Changed by manish on 28/03/16 for setting Exchange Rate from FinnCommon [start]
sql = " SELECT FIN_ENTITY FROM SITE WHERE SITE_CODE = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCode);
rs = pstmt.executeQuery();
while (rs.next())
{
finEntity = checkNull(rs.getString("FIN_ENTITY"));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
sql = " SELECT CURR_CODE FROM FINENT WHERE FIN_ENTITY = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,finEntity);
rs = pstmt.executeQuery();
while (rs.next())
{
finCurrCode = checkNull(rs.getString("CURR_CODE"));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if(currCode.equals(finCurrCode))
{
exchRate = "1";
}
else
{
System.out.println("TODAY IS="+currDateStr);
System.out.println("Order Site="+siteCode);
Double exchRateFinn = finCommon.getDailyExchRateSellBuy(currCode.trim(),"",siteCode.trim(),currDateStr.trim(),"S", conn);
if(exchRateFinn != null)
{
exchRateFinn = discommon.getRndamt(exchRateFinn, "R", 0.000001);
}
exchRate = String.valueOf(exchRateFinn);
System.out.println("Exch Rate from FinnCommon="+exchRate);
if(exchRate != null && exchRate.equals(""))
{
exchRate = getColumnDescr(conn, "std_exrt", "currency", "curr_code", currCode);
}
}
//Changed by manish on 28/03/16 for setting Exchange Rate from FinnCommon [end]
System.out.println("exchangeRate-------->>"+exchRate);
rcpMap.put("exch_rate",exchRate );
} }
/* if(siteCode != null && currCode!=null) /* if(siteCode != null && currCode!=null)
......
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