Skip to content

B
business-java
Commit c5011e77 authored by arawankar's avatar arawankar
Browse files
Options

SalesOrderIC.java 

- Changes made in exchRateProtect method to return xmlString
- Changes made to protect exch rate in case of customer currency and base currency is same

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@190369 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 2430d08b
Show whitespace changes
Inline Side-by-side
Showing with 87 additions and 17 deletions
webitm-dis/ibase/webitm/ejb/dis/SalesOrderIC.java
View file @ c5011e77
...@@ -4451,7 +4451,11 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -4451,7 +4451,11 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
if (lsCurrcodeBase != null && lsCurrcodeBase.trim().length() > 0) { //Modified by Anjali R. on [04/09/2018][To protect exchange rate if curr_code and base currency is same][Start]
//if (lsCurrcodeBase != null && lsCurrcodeBase.trim().length() > 0) {
System.out.println("lsCurrcodeBase--["+lsCurrcodeBase+"]lsCurrCode--["+lsCurrCode+"]");
if ((lsCurrcodeBase != null && lsCurrcodeBase.trim().length() > 0) && lsCurrCode.equalsIgnoreCase(lsCurrcodeBase)) {
//Modified by Anjali R. on [04/09/2018][To protect exchange rate if curr_code and base currency is same][End]
valueXmlString.append("<exch_rate protect = \"1\">") valueXmlString.append("<exch_rate protect = \"1\">")
.append("<![CDATA[" + lcExchRate + "]]>").append("</exch_rate>"); .append("<![CDATA[" + lcExchRate + "]]>").append("</exch_rate>");
valueXmlString.append("<exch_rate__frt protect = \"1\">") valueXmlString.append("<exch_rate__frt protect = \"1\">")
...@@ -5637,7 +5641,12 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -5637,7 +5641,12 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
chgDtStr = sdf.format(orderDate); chgDtStr = sdf.format(orderDate);
mNum = finCommon.getDailyExchRateSellBuy(mCurr, "", lsSiteCode, chgDtStr, "S", conn); mNum = finCommon.getDailyExchRateSellBuy(mCurr, "", lsSiteCode, chgDtStr, "S", conn);
valueXmlString.append("<exch_rate>").append("<![CDATA[" + mNum + "]]>").append("</exch_rate>"); valueXmlString.append("<exch_rate>").append("<![CDATA[" + mNum + "]]>").append("</exch_rate>");
exchangeRateProtect(mCurr, lsSiteCode, "exch_rate", conn); //Modified by Anjali R. on [04/09/2018][To protect exchange rate if curr_code and base currency is same][Start]
//exchangeRateProtect(mCurr, lsSiteCode, "exch_rate", conn);
String retVal = exchangeRateProtect(mCurr, lsSiteCode, "exch_rate", conn);
System.out.println("retVal--455["+retVal+"]");
valueXmlString.append(retVal);
//Modified by Anjali R. on [04/09/2018][To protect exchange rate if curr_code and base currency is same][End]
if (lbOrdFlag) { if (lbOrdFlag) {
valueXmlString.append("<cust_code__dlv>").append("<![CDATA[" + custCodeBill + "]]>") valueXmlString.append("<cust_code__dlv>").append("<![CDATA[" + custCodeBill + "]]>")
...@@ -5747,7 +5756,12 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -5747,7 +5756,12 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
conn); conn);
valueXmlString.append("<exch_rate__frt>").append("<![CDATA[" + mNum + "]]>") valueXmlString.append("<exch_rate__frt>").append("<![CDATA[" + mNum + "]]>")
.append("</exch_rate__frt>"); .append("</exch_rate__frt>");
exchangeRateProtect(lsCurrCodeFrt, lsSiteCode, "exch_rate__frt", conn); //Modified by Anjali R. on [04/09/2018][To protect exchange rate if curr_code and base currency is same][Start]
//exchangeRateProtect(lsCurrCodeFrt, lsSiteCode, "exch_rate__frt", conn);
String retVal = exchangeRateProtect(lsCurrCodeFrt, lsSiteCode, "exch_rate__frt", conn);
System.out.println("retVal--455["+retVal+"]");
valueXmlString.append(retVal);
//Modified by Anjali R. on [04/09/2018][To protect exchange rate if curr_code and base currency is same][End]
} else if (currentColumn.trim().equalsIgnoreCase("cust_code__dlv")) { } else if (currentColumn.trim().equalsIgnoreCase("cust_code__dlv")) {
String custName = "", addr1 = "", addr2 = "", addr3 = "", city = "", pin = "", countCode = "", String custName = "", addr1 = "", addr2 = "", addr3 = "", city = "", pin = "", countCode = "",
stanCode = "", tranCode = "", stateCode = "", tele1 = "", tele2 = "", tele3 = "", fax1 = "", stanCode = "", tranCode = "", stateCode = "", tele1 = "", tele2 = "", tele3 = "", fax1 = "",
...@@ -6165,6 +6179,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -6165,6 +6179,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
String lsDescrCl = "", orderTypeLs=""; String lsDescrCl = "", orderTypeLs="";
double mNum = 0.00; double mNum = 0.00;
String retVal = "";//Modified by Anjali R. on [04/09/2018][To protect exchange rate if curr_code and base currency is same]
custCode = checkNull(genericUtility.getColumnValue("cust_code", dom)); custCode = checkNull(genericUtility.getColumnValue("cust_code", dom));
System.out.println("custCode getting from dom["+custCode+"]"); System.out.println("custCode getting from dom["+custCode+"]");
lsItemser = checkNull(genericUtility.getColumnValue("item_ser", dom)); lsItemser = checkNull(genericUtility.getColumnValue("item_ser", dom));
...@@ -7117,8 +7134,12 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -7117,8 +7134,12 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
mNum = finCommon.getDailyExchRateSellBuy(mcurr, "", lsSiteCode, ordDate, "S", conn); mNum = finCommon.getDailyExchRateSellBuy(mcurr, "", lsSiteCode, ordDate, "S", conn);
valueXmlString.append("<exch_rate>").append("<![CDATA[" + mNum + "]]>").append("</exch_rate>"); valueXmlString.append("<exch_rate>").append("<![CDATA[" + mNum + "]]>").append("</exch_rate>");
setNodeValue(dom, "exch_rate", getAbsString(String.valueOf(mNum))); setNodeValue(dom, "exch_rate", getAbsString(String.valueOf(mNum)));
exchangeRateProtect(mcurr, lsSiteCode, "exch_rate", conn); //Modified by Anjali R. on [04/09/2018][To protect exchange rate if curr_code and base currency is same][Start]
//exchangeRateProtect(mcurr, lsSiteCode, "exch_rate", conn);
retVal = exchangeRateProtect(mcurr, lsSiteCode, "exch_rate", conn);
System.out.println("retVal--["+retVal+"]");
valueXmlString.append(retVal);
//Modified by Anjali R. on [04/09/2018][To protect exchange rate if curr_code and base currency is same][End]
// mNum = finCommon.getDailyExchRateSellBuy(lsCurrcdFrt, "", lsSiteCode, // mNum = finCommon.getDailyExchRateSellBuy(lsCurrcdFrt, "", lsSiteCode,
// orderDate.toString(), "S", conn); // orderDate.toString(), "S", conn);
mNum = finCommon.getDailyExchRateSellBuy(lsCurrcdFrt, "", lsSiteCode, ordDate.toString(), "S", mNum = finCommon.getDailyExchRateSellBuy(lsCurrcdFrt, "", lsSiteCode, ordDate.toString(), "S",
...@@ -7126,7 +7147,12 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -7126,7 +7147,12 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
valueXmlString.append("<exch_rate__frt>").append("<![CDATA[" + mNum + "]]>") valueXmlString.append("<exch_rate__frt>").append("<![CDATA[" + mNum + "]]>")
.append("</exch_rate__frt>"); .append("</exch_rate__frt>");
setNodeValue(dom, "exch_rate__frt", getAbsString(String.valueOf(mNum))); setNodeValue(dom, "exch_rate__frt", getAbsString(String.valueOf(mNum)));
exchangeRateProtect(lsCurrcdFrt, lsSiteCode, "exch_rate__frt", conn); //Modified by Anjali R. on [04/09/2018][To protect exchange rate if curr_code and base currency is same][Start]
//exchangeRateProtect(mcurr, lsSiteCode, "exch_rate", conn);
retVal = exchangeRateProtect(lsCurrcdFrt, lsSiteCode, "exch_rate__frt", conn);
System.out.println("retVal--111["+retVal+"]");
valueXmlString.append(retVal);
//Modified by Anjali R. on [04/09/2018][To protect exchange rate if curr_code and base currency is same][End]
// mNum = finCommon.getDailyExchRateSellBuy(lsCurrcdIns, "", lsSiteCode, // mNum = finCommon.getDailyExchRateSellBuy(lsCurrcdIns, "", lsSiteCode,
// orderDate.toString(), "S", conn); // orderDate.toString(), "S", conn);
...@@ -7135,7 +7161,12 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -7135,7 +7161,12 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
valueXmlString.append("<exch_rate__ins>").append("<![CDATA[" + mNum + "]]>") valueXmlString.append("<exch_rate__ins>").append("<![CDATA[" + mNum + "]]>")
.append("</exch_rate__ins>"); .append("</exch_rate__ins>");
setNodeValue(dom, "exch_rate__ins", getAbsString(String.valueOf(mNum))); setNodeValue(dom, "exch_rate__ins", getAbsString(String.valueOf(mNum)));
exchangeRateProtect(lsCurrcdIns, lsSiteCode, "exch_rate__ins", conn); //Modified by Anjali R. on [04/09/2018][To protect exchange rate if curr_code and base currency is same][Start]
//exchangeRateProtect(lsCurrcdIns, lsSiteCode, "exch_rate__ins", conn);
retVal = exchangeRateProtect(lsCurrcdIns, lsSiteCode, "exch_rate__ins", conn);
System.out.println("retVal--125["+retVal+"]");
valueXmlString.append(retVal);
//Modified by Anjali R. on [04/09/2018][To protect exchange rate if curr_code and base currency is same][End]
valueXmlString.append("<currency_descr>").append("<![CDATA[" + mcurrdescr + "]]>") valueXmlString.append("<currency_descr>").append("<![CDATA[" + mcurrdescr + "]]>")
.append("</currency_descr>"); .append("</currency_descr>");
...@@ -7188,7 +7219,12 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -7188,7 +7219,12 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
valueXmlString.append("<exch_rate__frt>").append("<![CDATA[" + mNum + "]]>") valueXmlString.append("<exch_rate__frt>").append("<![CDATA[" + mNum + "]]>")
.append("</exch_rate__frt>"); .append("</exch_rate__frt>");
setNodeValue(dom, "exch_rate__frt", getAbsString(String.valueOf(mNum))); setNodeValue(dom, "exch_rate__frt", getAbsString(String.valueOf(mNum)));
exchangeRateProtect(mcurr, lsSiteCode, "exch_rate__frt", conn); //Modified by Anjali R. on [04/09/2018][To protect exchange rate if curr_code and base currency is same][Start]
//exchangeRateProtect(mcurr, lsSiteCode, "exch_rate__frt", conn);
retVal = exchangeRateProtect(mcurr, lsSiteCode, "exch_rate__frt", conn);
System.out.println("retVal--451["+retVal+"]");
valueXmlString.append(retVal);
//Modified by Anjali R. on [04/09/2018][To protect exchange rate if curr_code and base currency is same][End]
} }
lsPlistDisc = priceListDiscount(lsSiteCode, lsCustCode, conn); lsPlistDisc = priceListDiscount(lsSiteCode, lsCustCode, conn);
...@@ -11785,7 +11821,13 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -11785,7 +11821,13 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
mNum = finCommon.getDailyExchRateSellBuy(lsCurrCodeIns, "", lsSiteCode, orderDate, "S", conn); mNum = finCommon.getDailyExchRateSellBuy(lsCurrCodeIns, "", lsSiteCode, orderDate, "S", conn);
valueXmlString.append("<exch_rate__ins>").append("<![CDATA[" + mNum + "]]>").append("</exch_rate__ins>"); valueXmlString.append("<exch_rate__ins>").append("<![CDATA[" + mNum + "]]>").append("</exch_rate__ins>");
exchangeRateProtect(lsCurrCodeIns, lsSiteCode, "exch_rate__ins", conn); //Modified by Anjali R. on [04/09/2018][To protect exchange rate if curr_code and base currency is same][Start]
//exchangeRateProtect(lsCurrCodeIns, lsSiteCode, "exch_rate__ins", conn);
String retVal = exchangeRateProtect(lsCurrCodeIns, lsSiteCode, "exch_rate__ins", conn);
System.out.println("retVal--455["+retVal+"]");
valueXmlString.append(retVal);
//Modified by Anjali R. on [04/09/2018][To protect exchange rate if curr_code and base currency is same][End]
} catch (ITMException e) { } catch (ITMException e) {
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();
...@@ -11825,7 +11867,12 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -11825,7 +11867,12 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
valueXmlString.append("<exch_rate__comm2>").append("<![CDATA[" + mNum + "]]>") valueXmlString.append("<exch_rate__comm2>").append("<![CDATA[" + mNum + "]]>")
.append("</exch_rate__comm2>"); .append("</exch_rate__comm2>");
exchangeRateProtect(lsCurrCodeComm2, lsSiteCode, "exch_rate__comm2", conn); //Modified by Anjali R. on [04/09/2018][To protect exchange rate if curr_code and base currency is same][Start]
//exchangeRateProtect(lsCurrCodeComm2, lsSiteCode, "exch_rate__comm2", conn);
String retVal = exchangeRateProtect(lsCurrCodeComm2, lsSiteCode, "exch_rate__comm2", conn);
System.out.println("retVal--455["+retVal+"]");
valueXmlString.append(retVal);
//Modified by Anjali R. on [04/09/2018][To protect exchange rate if curr_code and base currency is same][End]
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();
...@@ -11868,7 +11915,12 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -11868,7 +11915,12 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
valueXmlString.append("<exch_rate__comm1>").append("<![CDATA[" + mNum + "]]>") valueXmlString.append("<exch_rate__comm1>").append("<![CDATA[" + mNum + "]]>")
.append("</exch_rate__comm1>"); .append("</exch_rate__comm1>");
exchangeRateProtect(lsCurrCodeComm1, lsSiteCode, "exch_rate__comm1", conn); //Modified by Anjali R. on [04/09/2018][To protect exchange rate if curr_code and base currency is same][Start]
//exchangeRateProtect(lsCurrCodeComm1, lsSiteCode, "exch_rate__comm1", conn);
String retVal = exchangeRateProtect(lsCurrCodeComm1, lsSiteCode, "exch_rate__comm1", conn);
System.out.println("retVal--455["+retVal+"]");
valueXmlString.append(retVal);
//Modified by Anjali R. on [04/09/2018][To protect exchange rate if curr_code and base currency is same][End]
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();
...@@ -11907,7 +11959,12 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -11907,7 +11959,12 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
} }
valueXmlString.append("<exch_rate__comm>").append("<![CDATA[" + mNum + "]]>").append("</exch_rate__comm>"); valueXmlString.append("<exch_rate__comm>").append("<![CDATA[" + mNum + "]]>").append("</exch_rate__comm>");
exchangeRateProtect(lsCurrCodeComm, lsSiteCode, "exch_rate__comm", conn); //Modified by Anjali R. on [04/09/2018][To protect exchange rate if curr_code and base currency is same][Start]
//exchangeRateProtect(lsCurrCodeComm, lsSiteCode, "exch_rate__comm", conn);
String retVal = exchangeRateProtect(lsCurrCodeComm, lsSiteCode, "exch_rate__comm", conn);
System.out.println("retVal--455["+retVal+"]");
valueXmlString.append(retVal);
//Modified by Anjali R. on [04/09/2018][To protect exchange rate if curr_code and base currency is same][End]
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();
...@@ -14091,27 +14148,40 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -14091,27 +14148,40 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null; ResultSet rs = null;
String sql = ""; String sql = "";
String curCode = ""; //Modified by Anjali R. on [04/09/2018][To protect exchange rate if curr_code and base currency is same][Start]
String curCodeBase = "";
StringBuffer valueXmlString = null;
//Modified by Anjali R. on [04/09/2018][To protect exchange rate if curr_code and base currency is same][End]
try { try {
if (currCode != null && currCode.trim().length() > 0) { valueXmlString = new StringBuffer();
if (currCode != null && currCode.trim().length() > 0)
{
sql = "select a.curr_code from finent a, site b where b.fin_entity = a.fin_entity and b.site_code = ?"; sql = "select a.curr_code from finent a, site b where b.fin_entity = a.fin_entity and b.site_code = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, siteCode); pstmt.setString(1, siteCode);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) { if (rs.next())
curCode = rs.getString("curr_code"); {
curCodeBase = checkNull(rs.getString("curr_code"));
} }
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
//Modified by Anjali R. on [04/09/2018][To protect exchange rate if curr_code and base currency is same][Start]
System.out.println("currCode---["+currCode+"]curCodeBase--["+curCodeBase+"]");
if(curCodeBase.equalsIgnoreCase(currCode))
{
valueXmlString.append("<"+exchangeRateCol+" protect = \"1\">").append("<![CDATA[1.0]]>").append("</"+exchangeRateCol+">");
}
//Modified by Anjali R. on [04/09/2018][To protect exchange rate if curr_code and base currency is same][End]
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
throw new ITMException(e); throw new ITMException(e);
} }
return curCode; return valueXmlString.toString();//Modified by Anjali R.
} }
// gbf_get_scheme_code // gbf_get_scheme_code
......
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