Commit 280d6807 authored by vvengurlekar's avatar vvengurlekar

MiscVoucherIC.java - ADded code for taking round to and round off value from sundry master


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@191314 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d52b11a8
...@@ -2693,7 +2693,7 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M ...@@ -2693,7 +2693,7 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
{ {
try try
{ {
payRndTo = Double.parseDouble(payRndTo)+""; payRndTo = Integer.parseInt(payRndTo)+"";
} }
catch (NumberFormatException | NullPointerException nfe) catch (NumberFormatException | NullPointerException nfe)
{ {
...@@ -3071,6 +3071,10 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M ...@@ -3071,6 +3071,10 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
} }
//end //end
fldName = "CUST_TYPE"; fldName = "CUST_TYPE";
//ADded by Varsha V on 27-09-18 for taking round to from sundry master
payRndTo = findValue(conn, "round_to" , "customer", "cust_code", sundryCode);
System.out.println("payRndTo is ["+payRndTo+"]");
//Ended by Varsha V on 27-09-18 for taking round to from sundry master
} }
else if("R".equalsIgnoreCase(sundryType)) else if("R".equalsIgnoreCase(sundryType))
{ {
...@@ -3465,6 +3469,28 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M ...@@ -3465,6 +3469,28 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
{ {
lsSiteCodePay= findValue(conn, "site_code__pay" , "site_transporter", "TRAN_CODE", sundryCode); lsSiteCodePay= findValue(conn, "site_code__pay" , "site_transporter", "TRAN_CODE", sundryCode);
}//end }//end
//ADded by Varsha V on 27-09-18 for taking round to from sundry master
sql = "select round_off, round_to from transporter where tran_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, sundryCode);
rs = pstmt.executeQuery();
if(rs.next())
{
payRndOff = rs.getString("round_off");
payRndTo = rs.getString("round_to");
System.out.println("payRndOff is ["+payRndOff+"] payRndTo is ["+payRndTo+"]");
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
//Ended by Varsha V on 27-09-18 for taking round to from sundry master
} }
else if("O".equalsIgnoreCase(sundryType)) else if("O".equalsIgnoreCase(sundryType))
{ {
...@@ -3547,6 +3573,10 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M ...@@ -3547,6 +3573,10 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
{ {
lsSiteCodePay= findValue(conn, "site_code__pay" , "site_supplier", "supp_code", sundryCode); lsSiteCodePay= findValue(conn, "site_code__pay" , "site_supplier", "supp_code", sundryCode);
}//end }//end
//ADded by Varsha V on 27-09-18 for taking round to from sundry master
payRndOff = findValue(conn, "round_off" , "supplier", "supp_code", sundryCode);
System.out.println("payRndOff is ["+payRndOff+"]");
//Ended by Varsha V on 27-09-18 for taking round to from sundry master
} }
else if("X".equalsIgnoreCase(sundryType)) else if("X".equalsIgnoreCase(sundryType))
{ {
...@@ -3830,7 +3860,34 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M ...@@ -3830,7 +3860,34 @@ public class MiscVoucherIC extends ValidatorEJB implements MiscVoucherICLocal, M
mdescrSite = findValue(conn, "descr" ,"site", "site_code", lsSiteCodePay); mdescrSite = findValue(conn, "descr" ,"site", "site_code", lsSiteCodePay);
valueXmlString.append("<site_descr__pay>").append("<![CDATA[" + mdescrSite + "]]>").append("</site_descr__pay>"); valueXmlString.append("<site_descr__pay>").append("<![CDATA[" + mdescrSite + "]]>").append("</site_descr__pay>");
//End //End
//ADded by Varsha V on 27-09-18 for taking round to from sundry master
if(payRndOff == null || payRndOff.trim().length() == 0)
{
payRndOff = finCommon.getFinparams("999999","PAY_RND_OFF",conn);
if(payRndOff == null || payRndOff.trim().equals("NULLFOUND"))
{
payRndOff = "N";
}
}
if(payRndTo == null || payRndTo.trim().length() == 0)
{
payRndTo = finCommon.getFinparams("999999","PAY_RND_TO",conn);
if(payRndTo == null || payRndTo.trim().equals("NULLFOUND") || payRndTo.trim().length() == 0)
{
payRndTo = "1";
}
}
try
{
payRndTo = Integer.parseInt(payRndTo)+"";
}
catch (NumberFormatException | NullPointerException nfe)
{
payRndTo = "1";
}
valueXmlString.append("<rnd_off>").append("<![CDATA[" + payRndOff + "]]>").append("</rnd_off>");
valueXmlString.append("<rnd_to>").append("<![CDATA[" + payRndTo + "]]>").append("</rnd_to>");
//Ended by Varsha V on 27-09-18 for taking round to from sundry master
} }
else if(currentColumn.trim().equalsIgnoreCase("order_ref")) else if(currentColumn.trim().equalsIgnoreCase("order_ref"))
{ {
......
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