Skip to content

B
business-java
Commit 21684624 authored by mchauhan's avatar mchauhan
Browse files
Options

If curr code and curr code base is equal then exchange rate to be set as 1 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@215727 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d915040b
Show whitespace changes
Inline Side-by-side
Showing with 85 additions and 11 deletions
webitm-dis/src/ibase/webitm/ejb/dis/SalesReturn.java
View file @ 21684624
......@@ -599,7 +599,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
{
valueXmlString.append("<exch_rate protect =\"0\">").append(sExchRate).append("</exch_rate>");
}
else
if(currCode.trim().length()>0 && ( currCode.trim().equalsIgnoreCase( currCodeBase.trim() )))//Added if condition by Mukesh Chauhan on 24/01/20
{
valueXmlString.append("<exch_rate protect =\"1\">").append("1").append("</exch_rate>");
}
......@@ -821,14 +821,15 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
}
//Pavan Rane 11jun19 end
reStr = itemChanged(dom, dom1, dom2, objContext, "curr_code", editFlag, xtraParams);
// commented by nandkumar gadkari on 23/01/20
/*reStr = itemChanged(dom, dom1, dom2, objContext, "curr_code", editFlag, xtraParams);
//System.out.println("modified string [" + reStr + "]");
//<?xml version="1.0"?><Root><header><editFlag>E</editFlag></header><Detail2><item_ser__prom><![CDATA[CO]]></item_ser__prom><descr><![CDATA[FERTIGYN 5000FERTIGYN]]></descr><item_ser><![CDATA[ZT]]></item_ser><unit><![CDATA[A01]]></unit><loc_type><![CDATA[C1]]></loc_type><curr_stk><![CDATA[200000.0]]></curr_stk><st_scheme><![CDATA[]]></st_scheme><st_scheme><![CDATA[Integral Quantity :4.0]]></st_scheme><cust_item__ref><![CDATA[0132 ]]></cust_item__ref><cust_item_ref_descr><![CDATA[SAWAN TEST ]]></cust_item_ref_descr></Detail2></Root>
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
reStr = reStr.substring(0,pos);
valueXmlString.append(reStr);
valueXmlString.append(reStr);*/
//System.out.println("modified string after [" + reStr + "]");
valueXmlString.append("<tran_mode>").append("<![CDATA["+ getAbsString( tranMode ) +"]]>").append("</tran_mode>");
......@@ -948,9 +949,27 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
pstmt = null;
rs = null;
valueXmlString.append("<tran_name>").append("<![CDATA["+ getAbsString( tranName ) +"]]>").append("</tran_name>");
// added by nandkumar gadkari on 23/01/20----------start------------
sql = " select a.curr_code from finent a, site b "
+ " where a.fin_entity = b.fin_entity "
+ " and b.site_code = ?";
pstmt= conn.prepareStatement( sql );
pstmt.setString( 1, siteCode );
rs = pstmt.executeQuery();
if( rs.next() )
{
currCodeBase = rs.getString(1);
}
rs.close();
pstmt.close();
pstmt = null;
rs = null;
// added by nandkumar gadkari on 23/01/20----------end------------
currCodeBase = currCodeBase == null ?"" : currCodeBase.trim();
sql = " select descr from currency where curr_code = ? ";
pstmt= conn.prepareStatement( sql );
pstmt.setString( 1, currCode );
pstmt.setString( 1, currCodeBase );//hange currency to baase currency
rs = pstmt.executeQuery();
if( rs.next() )
{
......@@ -962,8 +981,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
rs = null;
valueXmlString.append("<currency_descr>").append("<![CDATA["+getAbsString(descr)+"]]>").append("</currency_descr>");
valueXmlString.append("<curr_code__bc>").append("<![CDATA["+getAbsString(currCode)+"]]>").append("</curr_code__bc>");
//valueXmlString.append("<curr_code__bc>").append("<![CDATA["+getAbsString(currCode)+"]]>").append("</curr_code__bc>");
valueXmlString.append("<curr_code__bc>").append("<![CDATA["+getAbsString(currCodeBase)+"]]>").append("</curr_code__bc>");//commented and added by nandkumar gadkari on 23/01/20
// Changed by Sneha on 22-07-2016 for exchange rate [Start]
Double exchRateFinn = finCommon.getDailyExchRateSellBuy(currCode.trim(),"",siteCode.trim(),currDateStr.trim(),"S", conn);
//valueXmlString.append("<exch_rate>").append("<![CDATA["+ exchRate +"]]>").append("</exch_rate>");
......@@ -1254,7 +1273,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
}
else if (currentColumn.trim().equals("curr_code") )
{
currCode = genericUtility.getColumnValue("curr_code",dom);
/*currCode = genericUtility.getColumnValue("curr_code",dom);
sql = " select descr, std_exrt from currency where curr_code = ?";
pstmt= conn.prepareStatement( sql );
pstmt.setString( 1, currCode );
......@@ -1296,6 +1315,61 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
{
valueXmlString.append("<exch_rate protect =\"1\">").append("<![CDATA[1]]>").append("</exch_rate>");
}
*/
// commented by nandkumar gadkari on 23/01/20
//added by nandkumar gadkari on 23/01/20
currCode = genericUtility.getColumnValue("curr_code",dom);
currCode = currCode == null ?"" : currCode.trim();
siteCode = genericUtility.getColumnValue("site_code",dom);
sql = " select a.curr_code from finent a, site b "
+ " where a.fin_entity = b.fin_entity "
+ " and b.site_code = ?";
pstmt= conn.prepareStatement( sql );
pstmt.setString( 1, siteCode );
rs = pstmt.executeQuery();
if( rs.next() )
{
currCodeBase = rs.getString(1);
}
rs.close();
pstmt.close();
pstmt = null;
rs = null;
currCodeBase = currCodeBase == null ?"" : currCodeBase.trim();
tranDate = genericUtility.getColumnValue("tran_date",dom);
exchRate = finCommon.getDailyExchRateSellBuy(currCode, "", siteCode,tranDate , "S", conn);
sql = "select descr from currency where curr_code = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, currCodeBase);
rs = pstmt.executeQuery();
if (rs.next()) {
descr = rs.getString("descr");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
valueXmlString.append("<currency_descr>").append("<![CDATA[" + getAbsString( descr ) + "]]>").append("</currency_descr>");
valueXmlString.append("<curr_code__bc>").append("<![CDATA[" + getAbsString( currCodeBase ) + "]]>").append("</curr_code__bc>");
if ( currCode != null && !currCode.trim().equalsIgnoreCase(currCodeBase.trim()))
{
valueXmlString.append("<exch_rate protect =\"0\">").append("<![CDATA[" + exchRate + "]]>").append("</exch_rate>");
}
else
{
valueXmlString.append("<exch_rate protect =\"1\">").append("<![CDATA[1]]>").append("</exch_rate>");
}
}
else if (currentColumn.trim().equals("tran_code") )
{
......@@ -6365,9 +6439,9 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
//tempNode = null;
reStr = itemChanged(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams);
pos = reStr.indexOf("<Detail1>");
pos = reStr.indexOf("<Detail2>");//chnage Detail1 to 2 by nandkumar gadkari on 23/01/20
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
pos = reStr.indexOf("</Detail2>");//chnage Detail1 to 2 by nandkumar gadkari on 23/01/20
reStr = reStr.substring(0,pos);
valueXmlString.append(reStr);
......@@ -6391,9 +6465,9 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
setNodeValue( dom, "quantity", Double.toString( mquantity ) );
reStr = itemChanged(dom, dom1, dom2, objContext, "quantity", editFlag, xtraParams);
pos = reStr.indexOf("<Detail1>");
pos = reStr.indexOf("<Detail2>");//chnage Detail1 to 2 by nandkumar gadkari on 23/01/20
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
pos = reStr.indexOf("</Detail2>");//chnage Detail1 to 2 by nandkumar gadkari on 23/01/20
reStr = reStr.substring(0,pos);
valueXmlString.append(reStr);
}
......
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