Commit a8c894c3 authored by msingh's avatar msingh

Changes in purchase order for exchange rate and tax environment


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@99993 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 59df6779
......@@ -816,7 +816,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
Connection conn = null, conn2 = null;
PreparedStatement pstmt = null, pstmt2 = null,pstmt1 = null;
ResultSet rs = null,rs1 = null, rs2 = null;
GenericUtility genericUtility = GenericUtility.getInstance();
FinCommon finCommon = new FinCommon();
......@@ -956,10 +956,14 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
pstmt.setString(1,extra);
}
//Changed by Samadhan on 25/06/2015 D15CKAT026 start
if(field.equals("supp_code")||field.equals("item_ser"))
if(field.equals("item_ser"))
{
pstmt.setString(1,extra);
}
if(field.equals("supp_code"))
{
pstmt.setString(1,extras[0]);
}
//Changed by Samadhan on 25/06/2015 D15CKAT026 end
rs = pstmt.executeQuery();
......@@ -1010,6 +1014,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
//conn2 = connDriver.getConnectDB("DriverITM");
sql2 = " SELECT EXCH_RATE__BUY FROM DAILY_EXCH_RATE_SELL_BUY WHERE CURR_CODE = ? ";
//sql2 = "SELECT CURR_CODE FROM FINENT WHERE FIN_ENTITY = (SELECT FIN_ENTITY FROM SITE WHERE SITE_CODE = ?)";
pstmt2 = conn.prepareStatement(sql2);
pstmt2.setString(1,fieldId);
rs2 = pstmt2.executeQuery();
......@@ -1058,7 +1063,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
sql2 = " SELECT FIN_ENTITY FROM SITE WHERE SITE_CODE = ? ";
pstmt2 = conn.prepareStatement(sql2);
pstmt2.setString(1,extra);
pstmt2.setString(1,extras[1]);
rs2 = pstmt2.executeQuery();
while (rs2.next())
......@@ -1110,9 +1115,15 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
java.util.Date currDate = new java.util.Date();
String currDateStr = dateFormat.format(currDate);
System.out.println("tODAY IS="+currDateStr);
System.out.println("Order Site="+extra);
Double exchRateFinn = finCommon.getDailyExchRateSellBuy(otherField4.trim(),"",extra.trim(),currDateStr.trim(),"B", conn);
System.out.println("TODAY IS="+currDateStr);
System.out.println("Order Site="+extras[1]);
Double exchRateFinn = finCommon.getDailyExchRateSellBuy(otherField4.trim(),"",extras[1].trim(),currDateStr.trim(),"B", conn);
DistCommon distcommon = new DistCommon();
if(exchRateFinn != null)
{
exchRateFinn = distcommon.getRndamt(exchRateFinn, "R", 0.000001);
}
exchRate = String.valueOf(exchRateFinn);
System.out.println("Exch Rate from FinnCommon="+exchRate);
......@@ -1304,7 +1315,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
double quan=Double.parseDouble(quantity);
String dlvleadTime = "";
String taxClass = "", taxChap = "", taxEnv = "";
String taxClass = "", taxChap = "", taxEnv = "", taxEnvfun = "", taxEnvQry = "", stationFrom = "", stationTo = "";
try
{
......@@ -1401,13 +1412,55 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
acctCodeAp = checkNullAndTrim(rs.getString("ACCT_CODE__AP"));
cctrCodeAp = checkNullAndTrim(rs.getString("CCTR_CODE__AP"));
taxClass = checkNullAndTrim(rs.getString("TAX_CLASS"));
taxChap = checkNullAndTrim(rs.getString("TAX_CHAP"));
taxEnv = checkNullAndTrim(rs.getString("TAX_ENV"));
/*taxClass = checkNullAndTrim(rs.getString("TAX_CLASS"));
taxChap = checkNullAndTrim(rs.getString("TAX_CHAP"));*/
taxEnvQry = checkNullAndTrim(rs.getString("TAX_ENV"));
}
rs.close();rs = null;
pstmt.close();pstmt = null;
//Changed by manish on 21/01/16 for getting tax class, tax chap and tax env [start]
taxClass = distComm.getTaxClass("S", suppCode, itemCode, dlvSiteCode, conn);
taxChap = distComm.getTaxChap(itemCode, itemSer, "S", suppCode, dlvSiteCode, conn);
sql = "SELECT STAN_CODE FROM SITE WHERE SITE_CODE = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, ordSiteCode);
rs = pstmt.executeQuery();
if ( rs.next() )
{
stationFrom = checkNullAndTrim(rs.getString(1));
}
rs.close();rs = null;
pstmt.clearParameters();
pstmt.setString(1, dlvSiteCode);
rs = pstmt.executeQuery();
if ( rs.next() )
{
stationTo = checkNullAndTrim(rs.getString(1));
}
rs.close();rs = null;
pstmt.close();pstmt = null;
taxEnvfun = distComm.getTaxEnv(stationFrom, stationTo, taxChap, taxClass, dlvSiteCode, conn);
if(taxEnvfun != null && taxEnvfun.trim().length()> 0)
{
System.out.println("tax env function");
taxEnv = taxEnvfun;
}
else
{
System.out.println("tax env query");
taxEnv = taxEnvQry;
}
System.out.println("taxClass = ["+taxClass+"]");
System.out.println("taxChap = ["+taxChap+"]");
System.out.println("taxEnv = ["+taxEnv+"]");
//Changed by manish on 21/01/16 for getting tax class, tax chap and tax env [end]
valueXmlString.append("<Detail3 domID='"+ctr+"' selected = 'Y'>\r\n");
sql = "SELECT I.UNIT,I.DESCR, I.LOC_CODE, I.ITEM_SER, I.PACK_CODE,I.GROSS_WEIGHT,I.NET_WEIGHT "
......
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