Skip to content

B
business-java
Commit c3b7f3e1 authored by ssalve's avatar ssalve
Browse files
Options

done changes to set igst , cgst and sgst amount values by using rate and... 

done changes to set igst , cgst and sgst amount values by using rate and taxable amount on 25JUN2017


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@106380 ce508802-f39f-4f6c-b175-0d175dae99d5
parent cc5ebfdf
Hide whitespace changes
Inline Side-by-side
Showing with 170 additions and 61 deletions
webitm-gst/ibase/webitm/ejb/gst/GstrIC.java
View file @ c3b7f3e1
......@@ -10,7 +10,7 @@ import java.sql.Timestamp;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import ibase.webitm.ejb.fin.FinCommon;
import javax.ejb.Stateless;
import org.apache.log4j.spi.ErrorCode;
......@@ -228,7 +228,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
pin = checkNull(genericUtility.getColumnValue("pin", dom)).trim();
//System.out.println("tax_reg_no["+tax_reg_no+"]"+"gst_type["+gst_type+"]"+"pin["+pin+"]");
}//end of if block for pin
//added by sarita on 21JUL2017
//added by sarita on 21JUL2017
else if("cust_name".equalsIgnoreCase(childNodeName))
{
gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)).trim();
......@@ -373,7 +373,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
// **************************** Validation for pin [end] *********************************************
// *************************** Validation for cust_name [start] *******************************************
//Added by sarita on 21JUL2017
//Added by sarita on 21JUL2017
if("S".equalsIgnoreCase(gst_type))
{
if(cust_name == null || cust_name.trim().length() == 0)
......@@ -720,8 +720,10 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
// ********************************** Validation for unit [END]**********************************************
// ********************************** Validation for taxable_amt [START]*************************************
//Added A and T by sarita on 25th JULY 2017
if("I".equalsIgnoreCase(gst_type) || "R".equalsIgnoreCase(gst_type) || "S".equalsIgnoreCase(gst_type)
|| "E".equalsIgnoreCase(gst_type) || "N".equalsIgnoreCase(gst_type))
|| "E".equalsIgnoreCase(gst_type) || "N".equalsIgnoreCase(gst_type) || "A".equalsIgnoreCase(gst_type)
|| "T".equalsIgnoreCase(gst_type))
{
if(taxable_amt == null || taxable_amt.trim().length() == 0)
{
......@@ -805,10 +807,9 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
}
cgst_amtVal = converStringToDouble(checkNull(genericUtility.getColumnValue("cgst_amt", dom)).trim());
sgst_amtVal = converStringToDouble(checkNull(genericUtility.getColumnValue("sgst_amt", dom)).trim());
cgst_percVal = converStringToDouble(checkNull(genericUtility.getColumnValue("cgst_perc", dom)).trim());
sgst_percVal = converStringToDouble(checkNull(genericUtility.getColumnValue("sgst_perc", dom)).trim());
//System.out.println("cgst_amtVal["+cgst_amtVal+"]"+"sgst_amtVal["+sgst_amtVal+"]"+"cgst_percVal["+cgst_percVal+"]"+"sgst_percVal["+sgst_percVal+"]");
if((cgst_amtVal > 0) || (sgst_amtVal > 0) || (cgst_percVal > 0) || (sgst_percVal > 0))
//changed by sarita on 25JUL2017
System.out.println("cgst_amtVal["+cgst_amtVal+"]"+"sgst_amtVal["+sgst_amtVal+"]"+"cgst_percVal["+cgst_percVal+"]"+"sgst_percVal["+sgst_percVal+"]");
if((cgst_amtVal > 0) || (sgst_amtVal > 0))
{
errCode = "INVINTRAST";
errList.add(errCode);
......@@ -858,6 +859,16 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
errCode = "INVZEROVAL";
errList.add(errCode);
errFields.add("igst_amt");
}
//added by sarita on 25JUL2017
cgst_amtVal = converStringToDouble(checkNull(genericUtility.getColumnValue("cgst_amt", dom)).trim());
sgst_amtVal = converStringToDouble(checkNull(genericUtility.getColumnValue("sgst_amt", dom)).trim());
System.out.println("cgst_amtVal["+cgst_amtVal+"]"+"sgst_amtVal["+sgst_amtVal+"]"+"cgst_percVal["+cgst_percVal+"]"+"sgst_percVal["+sgst_percVal+"]");
if((cgst_amtVal > 0) || (sgst_amtVal > 0))
{
errCode = "INVINTRAST";
errList.add(errCode);
errFields.add("igst_amt");
}
}
}
......@@ -885,9 +896,9 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
errList.add(errCode);
errFields.add("cgst_amt");
}
igst_percVal = converStringToDouble(checkNull(genericUtility.getColumnValue("igst_perc", dom)).trim());
//changes by sarita on 25JUN2017
igst_amtVal = converStringToDouble(checkNull(genericUtility.getColumnValue("igst_amt", dom)).trim());
if((igst_percVal > 0) || (igst_amtVal >0))
if(igst_amtVal >0)
{
errCode = "INVINTERST";
errList.add(errCode);
......@@ -937,6 +948,14 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
errCode = "INVZEROVAL";
errList.add(errCode);
errFields.add("cgst_amt");
}
//added by sarita on 25JUN2017
igst_amtVal = converStringToDouble(checkNull(genericUtility.getColumnValue("igst_amt", dom)).trim());
if(igst_amtVal >0)
{
errCode = "INVINTERST";
errList.add(errCode);
errFields.add("cgst_amt");
}
}
}
......@@ -965,9 +984,9 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
errList.add(errCode);
errFields.add("sgst_amt");
}
igst_percVal = converStringToDouble(checkNull(genericUtility.getColumnValue("igst_perc", dom)).trim());
//changes by sarita on 25JUN2017
igst_amtVal = converStringToDouble(checkNull(genericUtility.getColumnValue("igst_amt", dom)).trim());
if((igst_percVal > 0) || (igst_amtVal > 0))
if(igst_amtVal > 0)
{
errCode = "INVINTERST";
errList.add(errCode);
......@@ -1017,6 +1036,14 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
errCode = "INVZEROVAL";
errList.add(errCode);
errFields.add("sgst_amt");
}
//added by sarita on 25JUN2017
igst_amtVal = converStringToDouble(checkNull(genericUtility.getColumnValue("igst_amt", dom)).trim());
if(igst_amtVal > 0)
{
errCode = "INVINTERST";
errList.add(errCode);
errFields.add("sgst_amt");
}
}
}
......@@ -1143,7 +1170,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
ResultSet rs = null ;
int currentFormNo=0,ctr = 0;
StringBuffer valueXmlString = new StringBuffer();
NodeList parentNodeList = null;
NodeList parentNodeList,parentNodeList1 = null;
Node parentNode = null;
Node childNode = null;
NodeList childNodeList = null;
......@@ -1155,7 +1182,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
String sql="";
String doc_no="";
String docDateStr="";
double amount=0.0;
double amount=0.0,taxable_amt=0.0, amt = 0.0;
String recDescr ="",tranDescr="",stateDescr="",recoDescr="",siteDescr="",gst_type="",gstDescr="";
Timestamp doc_date=null;
String loginSite = "",state1="",stCode="",gst_rate="",refIdInv="",ref_date__inv="",cgst_amt="",sgst_amt="",igst_amt;
......@@ -1167,6 +1194,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
String name="",addr1="",addr2="",addr3="",city="",state="",pin="",stateCode="",stateCodeReg="";
String nameEdit="",addr1Edit="",addr2Edit="",addr3Edit="",cityEdit="",stateEdit="",pinEdit="";
String taxRegNoEdit="",docTypeEdit="",docNoEdit="",docDateEdit="",amountEdit="",gstCodeEdit="",stateDescEdit="",ecomRegEdit="",revChrEdit="",refIfInvEdit = "",refDateInvEdit="",lrNoEdit="",lrDateEdit="",orderNoEdit="",reasonCdEdit="",custNameEdit="";
double rate , igst_amount , cgst_amount, sgst_amount=0.0;
try
{
conn = getConnection();
......@@ -1262,7 +1290,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
valueXmlString.append("<doc_type protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</doc_type>");
valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</tax_reg_no>");
valueXmlString.append("<cust_name protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</cust_name>");
valueXmlString.append("<gst_code_state protect = \"1\" visible = \"1\">").append("<![CDATA[]]>").append("</gst_code_state>");
valueXmlString.append("<gst_code_state protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</gst_code_state>");
valueXmlString.append("<state_descr protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</state_descr>");
valueXmlString.append("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</doc_no>");
valueXmlString.append("<doc_date protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</doc_date>");
......@@ -1646,7 +1674,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
}
else if("A".equalsIgnoreCase(gst_type))
{
valueXmlString.append("<gst_code_state protect = \"0\" visible = \"1\">").append("<![CDATA["+gstCodeEdit+"]]>").append("</gst_code_state>");
valueXmlString.append("<gst_code_state protect = \"1\" visible = \"1\">").append("<![CDATA["+gstCodeEdit+"]]>").append("</gst_code_state>");
valueXmlString.append("<state_descr protect = \"1\" visible = \"0\">").append("<![CDATA["+stateDescEdit+"]]>").append("</state_descr>");
valueXmlString.append("<amount protect = \"0\" visible = \"1\">").append("<![CDATA["+amountEdit+"]]>").append("</amount>");
valueXmlString.append("<cust_name protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</cust_name>");
......@@ -1674,7 +1702,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
}
else if("T".equalsIgnoreCase(gst_type))
{
valueXmlString.append("<gst_code_state protect = \"0\" visible = \"1\">").append("<![CDATA["+gstCodeEdit+"]]>").append("</gst_code_state>");
valueXmlString.append("<gst_code_state protect = \"1\" visible = \"1\">").append("<![CDATA["+gstCodeEdit+"]]>").append("</gst_code_state>");
valueXmlString.append("<state_descr protect = \"0\" visible = \"0\">").append("<![CDATA["+stateDescEdit+"]]>").append("</state_descr>");
valueXmlString.append("<amount protect = \"0\" visible = \"1\">").append("<![CDATA["+amountEdit+"]]>").append("</amount>");
valueXmlString.append("<cust_name protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</cust_name>");
......@@ -1976,6 +2004,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
else if("tax_reg_no".equalsIgnoreCase(currentColumn.trim()))
{
gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom1));
tax_reg_no = checkNull(genericUtility.getColumnValue("tax_reg_no", dom));
sql = "select count(*) as cnt from gst_registration where gst_no=?";
pstmt = conn.prepareStatement(sql);
......@@ -2028,13 +2057,13 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
if((name != null && name.trim().length() >0) || (addr1 != null && addr1.trim().length()>0) || (addr2 != null && addr2.trim().length()>0) || (addr3 != null && addr3.trim().length() >0) || (city != null && city.trim().length()>0) || (state != null && state.trim().length()>0) || (pin != null && pin.trim().length()>0) )
{
System.out.println("Inside if block !!!!!1");
valueXmlString.append("<name protect = \"1\" visible = \"1\">").append("<![CDATA["+name+"]]>").append("</name>");
valueXmlString.append("<addr1 protect = \"1\" visible = \"1\">").append("<![CDATA["+addr1+"]]>").append("</addr1>");
valueXmlString.append("<addr2 protect = \"1\" visible = \"1\">").append("<![CDATA["+addr2+"]]>").append("</addr2>");
valueXmlString.append("<addr3 protect = \"1\" visible = \"1\">").append("<![CDATA["+addr3+"]]>").append("</addr3>");
valueXmlString.append("<city protect = \"1\" visible = \"1\">").append("<![CDATA["+city+"]]>").append("</city>");
valueXmlString.append("<gst_state_code protect = \"1\" visible = \"1\">").append("<![CDATA["+state+"]]>").append("</gst_state_code>");
valueXmlString.append("<pin protect = \"1\" visible = \"1\">").append("<![CDATA["+pin+"]]>").append("</pin>");
valueXmlString.append("<name protect = \"0\" visible = \"1\">").append("<![CDATA["+name+"]]>").append("</name>");
valueXmlString.append("<addr1 protect = \"0\" visible = \"1\">").append("<![CDATA["+addr1+"]]>").append("</addr1>");
valueXmlString.append("<addr2 protect = \"0\" visible = \"1\">").append("<![CDATA["+addr2+"]]>").append("</addr2>");
valueXmlString.append("<addr3 protect = \"0\" visible = \"1\">").append("<![CDATA["+addr3+"]]>").append("</addr3>");
valueXmlString.append("<city protect = \"0\" visible = \"1\">").append("<![CDATA["+city+"]]>").append("</city>");
valueXmlString.append("<gst_state_code protect = \"0\" visible = \"1\">").append("<![CDATA["+state+"]]>").append("</gst_state_code>");
valueXmlString.append("<pin protect = \"0\" visible = \"1\">").append("<![CDATA["+pin+"]]>").append("</pin>");
}
else
{
......@@ -2081,7 +2110,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
valueXmlString.append("<addr3 protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</addr3>");
valueXmlString.append("<city protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</city>");
valueXmlString.append("<gst_state_code protect = \"0\" visible = \"1\">").append("<![CDATA["+state1+"]]>").append("</gst_state_code>");
valueXmlString.append("<pin protect = \"0\" visible = \"1\">").append("<![CDATA["+pin+"]]>").append("</pin>");
valueXmlString.append("<pin protect = \"0\" visible = \"1\">").append("<![CDATA["+pin+"]]>").append("</pin>");
}
else if(tax_reg_no == null || tax_reg_no.trim().length() == 0)
{
......@@ -2091,9 +2120,24 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
valueXmlString.append("<addr3 protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</addr3>");
valueXmlString.append("<city protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</city>");
valueXmlString.append("<gst_state_code protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</gst_state_code>");
valueXmlString.append("<pin protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</pin>");
valueXmlString.append("<pin protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</pin>");
}
}
//Added by sarita on 25JUN2017 [START]
if("I".equalsIgnoreCase(gst_type) || "R".equalsIgnoreCase(gst_type))
{
if(tax_reg_no != null && tax_reg_no.trim().length() > 0)
{
String plcOfSupp = tax_reg_no.substring(0,2);
System.out.println("plcOfSupp::::["+plcOfSupp+"]");
valueXmlString.append("<gst_code_state protect = \"0\" visible = \"1\">").append("<![CDATA["+plcOfSupp+"]]>").append("</gst_code_state>");
}
else
{
valueXmlString.append("<gst_code_state protect = \"0\" visible = \"1\">").append("<![CDATA[35]]>").append("</gst_code_state>");
}
}
//Added by sarita on 25JUN2017 [END]
}//end of if block for tax_reg_no
else if("doc_date".equalsIgnoreCase(currentColumn.trim()))
......@@ -2187,6 +2231,11 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
{
valueXmlString.append("<supply_type protect = \"0\">").append("<![CDATA[OE]]>").append("</supply_type>");
}
// Added by sarita on 25JUN2017[START]
valueXmlString.append("<igst_amt protect = \"1\">").append("<![CDATA[]]>").append("</igst_amt>");
valueXmlString.append("<cgst_amt protect = \"1\">").append("<![CDATA[]]>").append("</cgst_amt>");
valueXmlString.append("<sgst_amt protect = \"1\">").append("<![CDATA[]]>").append("</sgst_amt>");
// Added by sarita on 25JUN2017[END]
}//end of if block for itm_default
if("gst_rate".equalsIgnoreCase(currentColumn.trim()))
......@@ -2195,13 +2244,17 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
state_code = checkNull(genericUtility.getColumnValue("gst_code_state", dom1));
loginSiteCode = checkNull(getStateFromLoginSite(loginSite,conn));
gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom1));
//Added by sarita on 25JUN2017[START]
rate = Double.parseDouble(gst_rate);
igst_amount = getIgst_Amt(rate, dom);
cgst_amount = getCgst_Amt(rate, dom);
sgst_amount = getSgst_Amt(rate, dom);
System.out.println("gst_rate["+gst_rate+"]"+"state_code["+state_code+"]"+"loginSiteCode["+loginSiteCode+"]"+"gst_type["+gst_type+"]");
//Added by sarita on 25JUN2017[END]
if("E".equalsIgnoreCase(gst_type))
{
System.out.println("Export Type...");
valueXmlString.append("<igst_perc>").append("<![CDATA["+gst_rate+"]]>").append("</igst_perc>");
valueXmlString.append("<igst_amt protect = \"0\">").append("<![CDATA[]]>").append("</igst_amt>");
valueXmlString.append("<igst_amt protect = \"0\">").append("<![CDATA["+igst_amount+"]]>").append("</igst_amt>");
}
else if("C".equalsIgnoreCase(gst_type) || "D".equalsIgnoreCase(gst_type))
{
......@@ -2236,27 +2289,17 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
{
if(gstCode.equalsIgnoreCase(loginSiteCode))
{
double rate = Double.parseDouble(gst_rate);
igst_amt = checkNull(genericUtility.getColumnValue("igst_amt", dom));
cgst_amt = checkNull(genericUtility.getColumnValue("cgst_amt", dom));
sgst_amt = checkNull(genericUtility.getColumnValue("sgst_amt", dom));
System.out.println("cgst_amt["+cgst_amt+"]"+"sgst_amt["+sgst_amt+"]");
//changes done by sarita on 21JUL2017
valueXmlString.append("<igst_amt protect = \"1\">").append("<![CDATA["+igst_amt+"]]>").append("</igst_amt>");
valueXmlString.append("<cgst_perc protect = \"1\">").append("<![CDATA["+rate/2+"]]>").append("</cgst_perc>");
valueXmlString.append("<sgst_perc protect = \"1\">").append("<![CDATA["+rate/2+"]]>").append("</sgst_perc>");
valueXmlString.append("<cgst_amt protect = \"0\">").append("<![CDATA["+cgst_amt+"]]>").append("</cgst_amt>");
valueXmlString.append("<sgst_amt protect = \"0\">").append("<![CDATA["+sgst_amt+"]]>").append("</sgst_amt>");
valueXmlString.append("<cgst_amt protect = \"0\">").append("<![CDATA["+cgst_amount+"]]>").append("</cgst_amt>");
valueXmlString.append("<sgst_amt protect = \"0\">").append("<![CDATA["+sgst_amount+"]]>").append("</sgst_amt>");
}
else if(!(state_code.equalsIgnoreCase(loginSiteCode)))
{
igst_amt = checkNull(genericUtility.getColumnValue("igst_amt", dom));
System.out.println("igst_amt["+igst_amt+"]");
valueXmlString.append("<igst_perc>").append("<![CDATA["+gst_rate+"]]>").append("</igst_perc>");
valueXmlString.append("<igst_amt protect = \"0\">").append("<![CDATA["+igst_amt+"]]>").append("</igst_amt>");
//changes done by sarita on 21JUL2017
valueXmlString.append("<cgst_amt protect = \"1\">").append("<![CDATA["+cgst_amt+"]]>").append("</cgst_amt>");
valueXmlString.append("<sgst_amt protect = \"1\">").append("<![CDATA["+sgst_amt+"]]>").append("</sgst_amt>");
valueXmlString.append("<igst_amt protect = \"0\">").append("<![CDATA["+igst_amount+"]]>").append("</igst_amt>");
}
}
}
......@@ -2264,34 +2307,21 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
else
{
if(state_code != null && state_code.trim().length() > 0)
{
{
if(state_code.equalsIgnoreCase(loginSiteCode))
{
double rate = Double.parseDouble(gst_rate);
igst_amt = checkNull(genericUtility.getColumnValue("igst_amt", dom));
cgst_amt = checkNull(genericUtility.getColumnValue("cgst_amt", dom));
sgst_amt = checkNull(genericUtility.getColumnValue("sgst_amt", dom));
System.out.println("cgst_amt["+cgst_amt+"]"+"sgst_amt["+sgst_amt+"]");
//changes by sarita on 21JUL2017
valueXmlString.append("<igst_amt protect = \"1\">").append("<![CDATA["+igst_amt+"]]>").append("</igst_amt>");
valueXmlString.append("<cgst_perc protect = \"1\">").append("<![CDATA["+rate/2+"]]>").append("</cgst_perc>");
valueXmlString.append("<sgst_perc protect = \"1\">").append("<![CDATA["+rate/2+"]]>").append("</sgst_perc>");
valueXmlString.append("<cgst_amt protect = \"0\">").append("<![CDATA["+cgst_amt+"]]>").append("</cgst_amt>");
valueXmlString.append("<sgst_amt protect = \"0\">").append("<![CDATA["+sgst_amt+"]]>").append("</sgst_amt>");
valueXmlString.append("<cgst_amt protect = \"0\">").append("<![CDATA["+cgst_amount+"]]>").append("</cgst_amt>");
valueXmlString.append("<sgst_amt protect = \"0\">").append("<![CDATA["+sgst_amount+"]]>").append("</sgst_amt>");
}
else if(!(state_code.equalsIgnoreCase(loginSiteCode)))
{
igst_amt = checkNull(genericUtility.getColumnValue("igst_amt", dom));
System.out.println("igst_amt["+igst_amt+"]");
{
valueXmlString.append("<igst_perc>").append("<![CDATA["+gst_rate+"]]>").append("</igst_perc>");
valueXmlString.append("<igst_amt protect = \"0\">").append("<![CDATA["+igst_amt+"]]>").append("</igst_amt>");
//changes by sarita on 21JUL2017
valueXmlString.append("<cgst_amt protect = \"1\">").append("<![CDATA["+cgst_amt+"]]>").append("</cgst_amt>");
valueXmlString.append("<sgst_amt protect = \"1\">").append("<![CDATA["+sgst_amt+"]]>").append("</sgst_amt>");
valueXmlString.append("<igst_amt protect = \"0\">").append("<![CDATA["+igst_amount+"]]>").append("</igst_amt>");
}
}//end of if block if state_code is not null
}
}
}//end of if block for gst_rate
valueXmlString.append("</Detail2>");
break;
......@@ -2630,4 +2660,83 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
cpChars = null;
}
}
//Added method by sarita on 25JUN2017
public double getIgst_Amt(double rate,Document dom)
{
double igst_amt = 0.0;
try
{
double taxable_amt = Double.valueOf(checkNull(genericUtility.getColumnValue("taxable_amt", dom)));
igst_amt = (taxable_amt * rate)/100;
}
catch(Exception e)
{
e.printStackTrace();
}
return igst_amt;
}
//Added method by sarita on 25JUN2017
public double getCgst_Amt(double rate, Document dom)
{
System.out.println("Rate is :::["+rate+"]");
double cgst_amt = 0.0,finalRate=0.0;
String cgst_sgst_val;
FinCommon finCommon = null;
Connection conn = null;
try
{
conn = getConnection();
finCommon = new FinCommon();
double taxable_amt = Double.valueOf(checkNull(genericUtility.getColumnValue("taxable_amt", dom)));
System.out.println("taxable_amt::["+taxable_amt+"]");
cgst_sgst_val = finCommon.getFinparams("999999", "CGST_SGST_RATIO_VAL", conn);
System.out.println("cgst_sgst_val::["+cgst_sgst_val+"]");
String[] retVal = cgst_sgst_val.split(":");
String a = retVal[0];
String b = retVal[1];
Double num = Double.valueOf(a);
Double den = Double.valueOf(b);
finalRate = (rate * num)/(num+den);
System.out.println("finalRate :::::::::["+finalRate+"]");
cgst_amt = (taxable_amt * finalRate)/100;
System.out.println("cgst_amt:::["+cgst_amt+"]");
}
catch(Exception e)
{
e.printStackTrace();
}
return cgst_amt;
}
//Added method by sarita on 25JUN2017
public double getSgst_Amt(double rate, Document dom)
{
System.out.println("Rate is :::["+rate+"]");
double sgst_amt = 0.0,finalRate=0.0;
String cgst_sgst_val;
FinCommon finCommon = null;
Connection conn = null;
try
{
conn = getConnection();
finCommon = new FinCommon();
double taxable_amt = Double.valueOf(checkNull(genericUtility.getColumnValue("taxable_amt", dom)));
System.out.println("taxable_amt for SGST::["+taxable_amt+"]");
cgst_sgst_val = finCommon.getFinparams("999999", "CGST_SGST_RATIO_VAL", conn);
System.out.println("cgst_sgst_val::["+cgst_sgst_val+"]");
String[] retVal = cgst_sgst_val.split(":");
String a = retVal[0];
String b = retVal[1];
Double num = Double.valueOf(a);
Double den = Double.valueOf(b);
finalRate = (rate * den)/(num+den);
System.out.println("finalRate :::::::::["+finalRate+"]");
sgst_amt = (taxable_amt * finalRate)/100;
System.out.println("sgst_amt:::["+sgst_amt+"]");
}
catch(Exception e)
{
e.printStackTrace();
}
return sgst_amt;
}
}
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