Skip to content

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

GstrIC updated code for Document Date Validation & doc_date changes for Nil... 

GstrIC updated code for Document Date Validation & doc_date changes for Nil Rated, Advance Receipt and Advance Adjusted


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@106298 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 6ac74bd0
Hide whitespace changes
Inline Side-by-side
Showing with 105 additions and 350 deletions
webitm-gst/ibase/webitm/ejb/gst/GstrIC.java
View file @ b0d9f7f1
......@@ -84,15 +84,16 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
String errCode = "";
ArrayList<String> errList = new ArrayList<String>();
ArrayList<String> errFields = new ArrayList<String>();
String tran_type="",gst_type="",gst_rate="";
String tran_type="",gst_type="",gst_rate="",finalCode="",rec_type="";
String state_code="",tax_reg_no = "",itc_type="",state_code_cdn="";
StringBuffer errStringXml = new StringBuffer("<?xml version = \"1.0\"?> \r\n <Root> <Errors>");
String doc_type="",doc_date="",amount="",doc_no="",ecom_reg_no="",loginSite="",gs_code="",gs_descr="";
String quantity="",unit="",taxable_amt="",igst_perc="",igst_amt="",cgst_amt="",sgst_amt="",cess_amt="";
String ref_id__inv="",ref_date__inv="",lr_no="",lr_date="",supply_type="",cgst_perc="",sgst_perc="",reverse_chrg="";
String name="",addr1="",addr2="",addr3="",city="",state="",pin="",loginSiteCode="",ecomRegNo="",orderNo="";
double cgst_amtVal=0,sgst_amtVal=0,cgst_percVal=0,sgst_percVal=0;
double igst_percVal=0,igst_amtVal=0;
double cgst_amtVal=0.0,sgst_amtVal=0.0,cgst_percVal=0.0,sgst_percVal=0.0;
double igst_percVal=0.0,igst_amtVal=0.0,gstRate=0.0;
Timestamp refInvDateDate = null,invDate = null;
try
{
......@@ -375,8 +376,20 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
// *************************** Validation for DOC_TYPE [end] ****************************************
// *************************** Validation for tax_reg_no [start] ************************************
if("I".equalsIgnoreCase(gst_type) || "R".equalsIgnoreCase(gst_type) || "S".equalsIgnoreCase(gst_type)
|| "D".equalsIgnoreCase(gst_type) || "C".equalsIgnoreCase(gst_type)||"E".equalsIgnoreCase(gst_type))
//Added by sarita on 14/07/2017 [START]
if("I".equalsIgnoreCase(gst_type))
{
System.out.println("Customer GSTIN Number is ["+tax_reg_no+"]");
if(tax_reg_no == null || tax_reg_no.trim().length() == 0)
{
errCode = "VTNLGSTIN";
errList.add(errCode);
errFields.add("tax_reg_no");
}
}
//Added by sarita on 14/07/2017 [END]
if("I".equalsIgnoreCase(gst_type) || "R".equalsIgnoreCase(gst_type)
|| "D".equalsIgnoreCase(gst_type) || "C".equalsIgnoreCase(gst_type)||"E".equalsIgnoreCase(gst_type))
{
System.out.println("Customer GSTIN Number is ["+tax_reg_no+"]");
if(tax_reg_no != null && tax_reg_no.trim().length() > 0)
......@@ -391,7 +404,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
}
}
}
// *************************** Validation for tax_reg_no [end] ***************************************
// *************************** Validation for tax_reg_no [end] ***************************************
// *************************** Validation for name [start] *******************************************
if(tax_reg_no != null && tax_reg_no.trim().length() > 0)
......@@ -470,7 +483,8 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
// ************************** Validation for Document Date [start] ***********************************
if("I".equalsIgnoreCase(gst_type) || "R".equalsIgnoreCase(gst_type) || "S".equalsIgnoreCase(gst_type)
|| "E".equalsIgnoreCase(gst_type) || "D".equalsIgnoreCase(gst_type) || "C".equalsIgnoreCase(gst_type))
|| "E".equalsIgnoreCase(gst_type) || "D".equalsIgnoreCase(gst_type) || "C".equalsIgnoreCase(gst_type)
|| "L".equalsIgnoreCase(gst_type) || "A".equalsIgnoreCase(gst_type) || "T".equalsIgnoreCase(gst_type))
{
//System.out.println("Document Date is ["+doc_date+"]");
if(doc_date == null || doc_date.trim().length() == 0)
......@@ -479,12 +493,50 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
errList.add(errCode);
errFields.add("doc_date");
}
// Added by sarita on 14/07/2017 [start]
else if(doc_date != null && doc_date.trim().length() > 0)
{
System.out.println("Selected doc Date is ::::["+doc_date+"]");
finalCode = checkNull(genericUtility.getColumnValue("prd_code", dom));
rec_type = checkNull(genericUtility.getColumnValue("rec_type", dom));
System.out.println("finalCode::["+finalCode+"]");
System.out.println("loginSiteCode ::["+loginSite+"]");
sql = "select count(*) as cnt from gst_data_hdr where prd_code=? and rec_type=? and site_code=? and submit_status=?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,finalCode);
pstmt.setString(2,rec_type);
pstmt.setString(3,loginSite);
pstmt.setString(4,"S");
rs = pstmt.executeQuery();
if(rs.next())
{
cnt = rs.getInt("cnt");
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(rs != null)
{
rs.close();
rs = null;
}
if(cnt > 0)
{
errCode = "INVTRANACT";
errList.add(errCode);
errFields.add("doc_date");
}
}
// Added by sarita on 14/07/2017 [END]
}
// ************************** Validation for Document Date [end] *************************************
// ************************** Validation for Amount [start] ******************************************
if("I".equalsIgnoreCase(gst_type) || "R".equalsIgnoreCase(gst_type) || "S".equalsIgnoreCase(gst_type)
|| "E".equalsIgnoreCase(gst_type) || "D".equalsIgnoreCase(gst_type) || "C".equalsIgnoreCase(gst_type))
|| "E".equalsIgnoreCase(gst_type) || "D".equalsIgnoreCase(gst_type) || "C".equalsIgnoreCase(gst_type)
|| "A".equalsIgnoreCase(gst_type) || "T".equalsIgnoreCase(gst_type))
{
//System.out.println("Document Amount is ["+amount+"]");
if(amount == null || amount.trim().length() == 0)
......@@ -618,6 +670,8 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
{
gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom1)).trim();
gst_rate = checkNull(genericUtility.getColumnValue("gst_rate", dom)).trim();
// Added by sarita on 14/07/2017
gstRate = converStringToDouble(checkNull(genericUtility.getColumnValue("gst_rate", dom)).trim());
taxable_amt = checkNull(genericUtility.getColumnValue("taxable_amt", dom)).trim();
System.out.println("gst_rate::::["+gst_rate+"]");
//System.out.println("Taxable Amount is:::::["+taxable_amt+"]");
......@@ -783,70 +837,18 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
errList.add(errCode);
errFields.add("gst_rate");
}
//Added by sarita on 14/07/2017 [start]
else if(gstRate ==0)
{
errCode = "INVZEROVAL";
errList.add(errCode);
errFields.add("gst_rate");
}
//Added by sarita on 14/07/2017 [end]
}
// *********************************** Validation for gst_rate [END]******************************************
// *********************************** Validation for igst_perc [START]***************************************
if("I".equalsIgnoreCase(gst_type) || "R".equalsIgnoreCase(gst_type) || "S".equalsIgnoreCase(gst_type)
|| "E".equalsIgnoreCase(gst_type) || "D".equalsIgnoreCase(gst_type)
|| "C".equalsIgnoreCase(gst_type) || "A".equalsIgnoreCase(gst_type) || "T".equalsIgnoreCase(gst_type))
{
if(!(state_code.equalsIgnoreCase(loginSiteCode)))
{
if(igst_perc == null || igst_perc.trim().length() == 0)
{
errCode = "NULLIGSTRT";
errList.add(errCode);
errFields.add("igst_perc");
}
else if(igst_percVal == 0)
{
errCode = "INVZEROVAL";
errList.add(errCode);
errFields.add("igst_perc");
}
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))
{
errCode = "INVINTRAST";
errList.add(errCode);
errFields.add("igst_perc");
}
}
}
else if("E".equalsIgnoreCase(gst_type))
{
if(!(state_code_cdn.equalsIgnoreCase(loginSiteCode)))
{
if(igst_perc == null || igst_perc.trim().length() == 0)
{
errCode = "NULLIGSTPC";
errList.add(errCode);
errFields.add("igst_perc");
}
else if(igst_percVal == 0)
{
errCode = "INVZEROVAL";
errList.add(errCode);
errFields.add("igst_perc");
}
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))
{
errCode = "INVINTRAST";
errList.add(errCode);
errFields.add("igst_perc");
}
}
}
// *********************************** Validation for igst_perc [START]*****************************************
// *********************************** Validation for igst_perc [END]********************************************
// *********************************** Validation for igst_amt [END]*********************************************
......@@ -881,97 +883,14 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
}
}
}
else if("E".equalsIgnoreCase(gst_type))
{
if((state_code != null) && !(state_code_cdn.equalsIgnoreCase(loginSiteCode)))
{
if(igst_amt == null || igst_amt.trim().length() == 0)
{
errCode = "NULLIGSTAM";
errList.add(errCode);
errFields.add("igst_amt");
}
else if(igst_amtVal == 0)
{
errCode = "INVZEROVAL";
errList.add(errCode);
errFields.add("igst_amt");
}
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))
{
errCode = "INVINTRAST";
errList.add(errCode);
errFields.add("igst_amt");
}
}
}
// ************************************ Validation for igst_amt [END]*******************************************
// ************************************ Validation for cgst_perc [START]****************************************
if("I".equalsIgnoreCase(gst_type) || "R".equalsIgnoreCase(gst_type) || "S".equalsIgnoreCase(gst_type)
|| "E".equalsIgnoreCase(gst_type) || "D".equalsIgnoreCase(gst_type)
|| "C".equalsIgnoreCase(gst_type) || "A".equalsIgnoreCase(gst_type) || "T".equalsIgnoreCase(gst_type))
{
if((state_code.equalsIgnoreCase(loginSiteCode)))
{
if(cgst_perc == null || cgst_perc.trim().length() == 0)
{
errCode = "NULLCGSTPC";
errList.add(errCode);
errFields.add("cgst_perc");
}
else if(cgst_percVal == 0)
{
errCode = "INVZEROVAL";
errList.add(errCode);
errFields.add("cgst_perc");
}
igst_percVal = converStringToDouble(checkNull(genericUtility.getColumnValue("igst_perc", dom)).trim());
igst_amtVal = converStringToDouble(checkNull(genericUtility.getColumnValue("igst_amt", dom)).trim());
if((igst_percVal > 0) || (igst_amtVal >0))
{
errCode = "INVINTERST";
errList.add(errCode);
errFields.add("cgst_perc");
}
}
}
else if("E".equalsIgnoreCase(gst_type))
{
if((state_code_cdn.equalsIgnoreCase(loginSiteCode)))
{
if(cgst_perc == null || cgst_perc.trim().length() == 0)
{
errCode = "NULLCGSTPC";
errList.add(errCode);
errFields.add("cgst_perc");
}
else if(cgst_percVal == 0)
{
errCode = "INVZEROVAL";
errList.add(errCode);
errFields.add("cgst_perc");
}
igst_percVal = converStringToDouble(checkNull(genericUtility.getColumnValue("igst_perc", dom)).trim());
igst_amtVal = converStringToDouble(checkNull(genericUtility.getColumnValue("igst_amt", dom)).trim());
if((igst_percVal > 0) || (igst_amtVal >0))
{
errCode = "INVINTERST";
errList.add(errCode);
errFields.add("cgst_perc");
}
}
}
// ************************************ Validation for cgst_perc [START]*****************************************
// ************************************ Validation for cgst_perc [END]*******************************************
// ************************************ Validation for cgst_amt [START]******************************************
if("I".equalsIgnoreCase(gst_type) || "R".equalsIgnoreCase(gst_type) || "S".equalsIgnoreCase(gst_type)
|| "E".equalsIgnoreCase(gst_type) || "D".equalsIgnoreCase(gst_type)
|| "D".equalsIgnoreCase(gst_type)
|| "C".equalsIgnoreCase(gst_type) || "A".equalsIgnoreCase(gst_type) || "T".equalsIgnoreCase(gst_type))
{
if((state_code != null) && (state_code.equalsIgnoreCase(loginSiteCode)))
......@@ -998,94 +917,14 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
}
}
}
else if("E".equalsIgnoreCase(gst_type))
{
if((state_code_cdn.equalsIgnoreCase(loginSiteCode)))
{
if(cgst_amt == null || cgst_amt.trim().length() == 0)
{
errCode = "NULLCGSTAM";
errList.add(errCode);
errFields.add("cgst_amt");
}
else if(cgst_amtVal == 0)
{
errCode = "INVZEROVAL";
errList.add(errCode);
errFields.add("cgst_amt");
}
igst_percVal = converStringToDouble(checkNull(genericUtility.getColumnValue("igst_perc", dom)).trim());
igst_amtVal = converStringToDouble(checkNull(genericUtility.getColumnValue("igst_amt", dom)).trim());
if((igst_percVal > 0) || (igst_amtVal >0))
{
errCode = "INVINTERST";
errList.add(errCode);
errFields.add("cgst_amt");
}
}
}
// ********************************** Validation for cgst_amt [END]********************************************
// ********************************** Validation for sgst_perc [START]*****************************************
if("I".equalsIgnoreCase(gst_type) || "R".equalsIgnoreCase(gst_type) || "S".equalsIgnoreCase(gst_type)
|| "E".equalsIgnoreCase(gst_type) || "D".equalsIgnoreCase(gst_type)
|| "C".equalsIgnoreCase(gst_type) || "A".equalsIgnoreCase(gst_type) || "T".equalsIgnoreCase(gst_type))
{
if((state_code.equalsIgnoreCase(loginSiteCode)))
{
if(sgst_perc == null || sgst_perc.trim().length() == 0)
{
errCode = "NULLSGSTPC";
errList.add(errCode);
errFields.add("sgst_perc");
}
else if(sgst_percVal == 0)
{
errCode = "INVZEROVAL";
errList.add(errCode);
errFields.add("sgst_perc");
}
igst_percVal = converStringToDouble(checkNull(genericUtility.getColumnValue("igst_perc", dom)).trim());
igst_amtVal = converStringToDouble(checkNull(genericUtility.getColumnValue("igst_amt", dom)).trim());
if((igst_percVal > 0) || (igst_amtVal >0))
{
errCode = "INVINTERST";
errList.add(errCode);
errFields.add("sgst_perc");
}
}
}
else if("E".equalsIgnoreCase(gst_type))
{
if((state_code_cdn.equalsIgnoreCase(loginSiteCode)))
{
if(sgst_perc == null || sgst_perc.trim().length() == 0)
{
errCode = "NULLSGSTPC";
errList.add(errCode);
errFields.add("sgst_perc");
}
else if(sgst_percVal == 0)
{
errCode = "INVZEROVAL";
errList.add(errCode);
errFields.add("sgst_perc");
}
igst_percVal = converStringToDouble(checkNull(genericUtility.getColumnValue("igst_perc", dom)).trim());
igst_amtVal = converStringToDouble(checkNull(genericUtility.getColumnValue("igst_amt", dom)).trim());
if((igst_percVal > 0) || (igst_amtVal >0))
{
errCode = "INVINTERST";
errList.add(errCode);
errFields.add("sgst_perc");
}
}
}
// ************************** Validation for sgst_perc [END]****************************
// ************************** Validation for sgst_perc [END]***************************************************
// ************************** Validation for sgst_amt [START]****************************
// ************************** Validation for sgst_amt [START]**************************************************
if("I".equalsIgnoreCase(gst_type) || "R".equalsIgnoreCase(gst_type) || "S".equalsIgnoreCase(gst_type)
|| "E".equalsIgnoreCase(gst_type) || "D".equalsIgnoreCase(gst_type)
|| "D".equalsIgnoreCase(gst_type)
|| "C".equalsIgnoreCase(gst_type) || "A".equalsIgnoreCase(gst_type) || "T".equalsIgnoreCase(gst_type))
{
if((state_code != null) && (state_code.equalsIgnoreCase(loginSiteCode)))
......@@ -1112,33 +951,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
}
}
}
else if("E".equalsIgnoreCase(gst_type))
{
if((state_code_cdn.equalsIgnoreCase(loginSiteCode)))
{
if(sgst_amt == null || sgst_amt.trim().length() == 0)
{
errCode = "NULLSGSTAM";
errList.add(errCode);
errFields.add("sgst_amt");
}
else if(sgst_amtVal == 0)
{
errCode = "INVZEROVAL";
errList.add(errCode);
errFields.add("sgst_amt");
}
igst_percVal = converStringToDouble(checkNull(genericUtility.getColumnValue("igst_perc", dom)).trim());
igst_amtVal = converStringToDouble(checkNull(genericUtility.getColumnValue("igst_amt", dom)).trim());
if((igst_percVal > 0) || (igst_amtVal > 0))
{
errCode = "INVINTERST";
errList.add(errCode);
errFields.add("sgst_amt");
}
}
}
// ************************** Validation for sgst_amt [END]****************************
// ************************** Validation for sgst_amt [END]*****************************************************
}//end of case2
break;
}//end of switch statement
......@@ -1381,7 +1194,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
valueXmlString.append("<tran_type protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</tran_type>");
valueXmlString.append("<doc_type protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_type>");
valueXmlString.append("<doc_no protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_no>");
valueXmlString.append("<doc_date protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_date>");
valueXmlString.append("<doc_date protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_date>");
valueXmlString.append("<amount protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</amount>");
valueXmlString.append("<gst_code_state protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</gst_code_state>");
valueXmlString.append("<state_descr protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</state_descr>");
......@@ -1566,10 +1379,8 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
}
if("S".equalsIgnoreCase(gst_type))
{
if(taxRegNoEdit == null || taxRegNoEdit.trim().length()== 0)
{
valueXmlString.append("<doc_type protect = \"0\" visible = \"0\">").append("<![CDATA["+docTypeEdit+"]]>").append("</doc_type>");
valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA["+taxRegNoEdit+"]]>").append("</tax_reg_no>");
valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</tax_reg_no>");
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("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA["+docNoEdit+"]]>").append("</doc_no>");
......@@ -1582,42 +1393,15 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
valueXmlString.append("<ref_date__inv protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</ref_date__inv>");
valueXmlString.append("<lr_no protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</lr_no>");
valueXmlString.append("<lr_date protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</lr_date>");
valueXmlString.append("<name protect = \"0\" visible = \"0\">").append("<![CDATA["+nameEdit+"]]>").append("</name>");
valueXmlString.append("<addr1 protect = \"0\" visible = \"0\">").append("<![CDATA["+addr1Edit+"]]>").append("</addr1>");
valueXmlString.append("<addr2 protect = \"0\" visible = \"0\">").append("<![CDATA["+addr2Edit+"]]>").append("</addr2>");
valueXmlString.append("<addr3 protect = \"0\" visible = \"0\">").append("<![CDATA["+addr3Edit+"]]>").append("</addr3>");
valueXmlString.append("<city protect = \"0\" visible = \"0\">").append("<![CDATA["+cityEdit+"]]>").append("</city>");
valueXmlString.append("<gst_state_code protect = \"0\" visible = \"0\">").append("<![CDATA["+stateEdit+"]]>").append("</gst_state_code>");
valueXmlString.append("<pin protect = \"0\" visible = \"0\">").append("<![CDATA["+pinEdit+"]]>").append("</pin>");
valueXmlString.append("<name protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</name>");
valueXmlString.append("<addr1 protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</addr1>");
valueXmlString.append("<addr2 protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</addr2>");
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("<order_no protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</order_no>");
valueXmlString.append("<reas_code protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</reas_code>");
}
else
{
valueXmlString.append("<doc_type protect = \"0\" visible = \"0\">").append("<![CDATA["+docTypeEdit+"]]>").append("</doc_type>");
valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA["+taxRegNoEdit+"]]>").append("</tax_reg_no>");
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("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA["+docNoEdit+"]]>").append("</doc_no>");
valueXmlString.append("<doc_date protect = \"0\" visible = \"1\">").append("<![CDATA["+docDateEdit+"]]>").append("</doc_date>");
valueXmlString.append("<amount protect = \"0\" visible = \"1\">").append("<![CDATA["+amountEdit+"]]>").append("</amount>");
valueXmlString.append("<reverse_chrg protect = \"0\" visible = \"1\">").append("<![CDATA["+revChrEdit+"]]>").append("</reverse_chrg>");
valueXmlString.append("<ecom_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA["+ecomRegEdit+"]]>").append("</ecom_reg_no>");
valueXmlString.append("<gst_code protect = \"0\" visible = \"1\">").append("<![CDATA["+gstCodeEdit+"]]>").append("</gst_code>");
valueXmlString.append("<ref_id__inv protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</ref_id__inv>");
valueXmlString.append("<ref_date__inv protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</ref_date__inv>");
valueXmlString.append("<lr_no protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</lr_no>");
valueXmlString.append("<lr_date protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</lr_date>");
valueXmlString.append("<name protect = \"0\" visible = \"1\">").append("<![CDATA["+nameEdit+"]]>").append("</name>");
valueXmlString.append("<addr1 protect = \"0\" visible = \"1\">").append("<![CDATA["+addr1Edit+"]]>").append("</addr1>");
valueXmlString.append("<addr2 protect = \"0\" visible = \"1\">").append("<![CDATA["+addr2Edit+"]]>").append("</addr2>");
valueXmlString.append("<addr3 protect = \"0\" visible = \"1\">").append("<![CDATA["+addr3Edit+"]]>").append("</addr3>");
valueXmlString.append("<city protect = \"0\" visible = \"1\">").append("<![CDATA["+cityEdit+"]]>").append("</city>");
valueXmlString.append("<gst_state_code protect = \"0\" visible = \"1\">").append("<![CDATA["+stateEdit+"]]>").append("</gst_state_code>");
valueXmlString.append("<pin protect = \"0\" visible = \"1\">").append("<![CDATA["+pinEdit+"]]>").append("</pin>");
valueXmlString.append("<order_no protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</order_no>");
valueXmlString.append("<reas_code protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</reas_code>");
}
valueXmlString.append("<reas_code protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</reas_code>");
}
else if("E".equalsIgnoreCase(gst_type))
{
......@@ -1676,58 +1460,29 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
}
else if("L".equalsIgnoreCase(gst_type))
{
if(taxRegNoEdit == null || taxRegNoEdit.trim().length()== 0)
{
valueXmlString.append("<doc_type protect = \"0\" visible = \"0\">").append("<![CDATA["+docTypeEdit+"]]>").append("</doc_type>");
valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA["+taxRegNoEdit+"]]>").append("</tax_reg_no>");
valueXmlString.append("<gst_code_state protect = \"0\" visible = \"1\">").append("<![CDATA["+gstCodeEdit+"]]>").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["+docNoEdit+"]]>").append("</doc_no>");
valueXmlString.append("<doc_date protect = \"0\" visible = \"1\">").append("<![CDATA["+docDateEdit+"]]>").append("</doc_date>");
valueXmlString.append("<amount protect = \"0\" visible = \"1\">").append("<![CDATA["+amountEdit+"]]>").append("</amount>");
valueXmlString.append("<reverse_chrg protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</reverse_chrg>");
valueXmlString.append("<ecom_reg_no protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</ecom_reg_no>");
valueXmlString.append("<gst_code protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</gst_code>");
valueXmlString.append("<ref_id__inv protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</ref_id__inv>");
valueXmlString.append("<ref_date__inv protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</ref_date__inv>");
valueXmlString.append("<name protect = \"0\" visible = \"0\">").append("<![CDATA["+nameEdit+"]]>").append("</name>");
valueXmlString.append("<addr1 protect = \"0\" visible = \"0\">").append("<![CDATA["+addr1Edit+"]]>").append("</addr1>");
valueXmlString.append("<addr2 protect = \"0\" visible = \"0\">").append("<![CDATA["+addr2Edit+"]]>").append("</addr2>");
valueXmlString.append("<addr3 protect = \"0\" visible = \"0\">").append("<![CDATA["+addr3Edit+"]]>").append("</addr3>");
valueXmlString.append("<city protect = \"0\" visible = \"0\">").append("<![CDATA["+cityEdit+"]]>").append("</city>");
valueXmlString.append("<gst_state_code protect = \"0\" visible = \"0\">").append("<![CDATA["+stateEdit+"]]>").append("</gst_state_code>");
valueXmlString.append("<pin protect = \"0\" visible = \"0\">").append("<![CDATA["+pinEdit+"]]>").append("</pin>");
valueXmlString.append("<reas_code protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</reas_code>");
valueXmlString.append("<order_no protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</order_no>");
valueXmlString.append("<lr_no protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</lr_no>");
valueXmlString.append("<lr_date protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</lr_date>");
}
else
{
valueXmlString.append("<doc_type protect = \"0\" visible = \"0\">").append("<![CDATA["+docTypeEdit+"]]>").append("</doc_type>");
valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA["+taxRegNoEdit+"]]>").append("</tax_reg_no>");
valueXmlString.append("<gst_code_state protect = \"0\" visible = \"1\">").append("<![CDATA["+gstCodeEdit+"]]>").append("</gst_code_state>");
valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</tax_reg_no>");
valueXmlString.append("<gst_code_state protect = \"0\" visible = \"0\">").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["+docNoEdit+"]]>").append("</doc_no>");
valueXmlString.append("<doc_no protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_no>");
valueXmlString.append("<doc_date protect = \"0\" visible = \"1\">").append("<![CDATA["+docDateEdit+"]]>").append("</doc_date>");
valueXmlString.append("<amount protect = \"0\" visible = \"1\">").append("<![CDATA["+amountEdit+"]]>").append("</amount>");
valueXmlString.append("<amount protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</amount>");
valueXmlString.append("<reverse_chrg protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</reverse_chrg>");
valueXmlString.append("<ecom_reg_no protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</ecom_reg_no>");
valueXmlString.append("<gst_code protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</gst_code>");
valueXmlString.append("<ref_id__inv protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</ref_id__inv>");
valueXmlString.append("<ref_date__inv protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</ref_date__inv>");
valueXmlString.append("<name protect = \"0\" visible = \"1\">").append("<![CDATA["+nameEdit+"]]>").append("</name>");
valueXmlString.append("<addr1 protect = \"0\" visible = \"1\">").append("<![CDATA["+addr1Edit+"]]>").append("</addr1>");
valueXmlString.append("<addr2 protect = \"0\" visible = \"1\">").append("<![CDATA["+addr2Edit+"]]>").append("</addr2>");
valueXmlString.append("<addr3 protect = \"0\" visible = \"1\">").append("<![CDATA["+addr3Edit+"]]>").append("</addr3>");
valueXmlString.append("<city protect = \"0\" visible = \"1\">").append("<![CDATA["+cityEdit+"]]>").append("</city>");
valueXmlString.append("<gst_state_code protect = \"0\" visible = \"1\">").append("<![CDATA["+stateEdit+"]]>").append("</gst_state_code>");
valueXmlString.append("<pin protect = \"1\" visible = \"1\">").append("<![CDATA["+pinEdit+"]]>").append("</pin>");
valueXmlString.append("<name protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</name>");
valueXmlString.append("<addr1 protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</addr1>");
valueXmlString.append("<addr2 protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</addr2>");
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("<reas_code protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</reas_code>");
valueXmlString.append("<order_no protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</order_no>");
valueXmlString.append("<lr_no protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</lr_no>");
valueXmlString.append("<lr_date protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</lr_date>");
}
valueXmlString.append("<lr_date protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</lr_date>");
}
else if("D".equalsIgnoreCase(gst_type))
{
......@@ -1863,7 +1618,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
valueXmlString.append("<lr_date protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</lr_date>");
valueXmlString.append("<tax_reg_no protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</tax_reg_no>");
valueXmlString.append("<doc_no protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_no>");
valueXmlString.append("<doc_date protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_date>");
valueXmlString.append("<doc_date protect = \"0\" visible = \"1\">").append("<![CDATA["+docDateEdit+"]]>").append("</doc_date>");
valueXmlString.append("<doc_type protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_type>");
}
else if("T".equalsIgnoreCase(gst_type))
......@@ -1890,7 +1645,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
valueXmlString.append("<lr_date protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</lr_date>");
valueXmlString.append("<tax_reg_no protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</tax_reg_no>");
valueXmlString.append("<doc_no protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_no>");
valueXmlString.append("<doc_date protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_date>");
valueXmlString.append("<doc_date protect = \"1\" visible = \"0\">").append("<![CDATA["+docDateEdit+"]]>").append("</doc_date>");
valueXmlString.append("<doc_type protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_type>");
}
}//end of item_defaultedit
......@@ -1976,7 +1731,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
if("S".equalsIgnoreCase(gst_type))
{
valueXmlString.append("<doc_type protect = \"0\" visible = \"0\">").append("<![CDATA[R]]>").append("</doc_type>");
valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</tax_reg_no>");
valueXmlString.append("<tax_reg_no protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</tax_reg_no>");
valueXmlString.append("<gst_code_state protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</gst_code_state>");
valueXmlString.append("<state_descr protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</state_descr>");
valueXmlString.append("<doc_no protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</doc_no>");
......@@ -2032,7 +1787,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
valueXmlString.append("<gst_code_state protect = \"0\" visible = \"0\">").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 = \"0\">").append("<![CDATA[]]>").append("</doc_no>");
valueXmlString.append("<doc_date protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_date>");
valueXmlString.append("<doc_date protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</doc_date>");
valueXmlString.append("<amount protect = \"0\" visible = \"0\">").append("<![CDATA[]]>").append("</amount>");
valueXmlString.append("<reverse_chrg protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</reverse_chrg>");
valueXmlString.append("<ecom_reg_no protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</ecom_reg_no>");
......@@ -2127,7 +1882,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
valueXmlString.append("<lr_date protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</lr_date>");
valueXmlString.append("<tax_reg_no protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</tax_reg_no>");
valueXmlString.append("<doc_no protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_no>");
valueXmlString.append("<doc_date protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_date>");
valueXmlString.append("<doc_date protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</doc_date>");
valueXmlString.append("<doc_type protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_type>");
}
else if("T".equalsIgnoreCase(gst_type))
......@@ -2154,7 +1909,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
valueXmlString.append("<lr_date protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</lr_date>");
valueXmlString.append("<tax_reg_no protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</tax_reg_no>");
valueXmlString.append("<doc_no protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_no>");
valueXmlString.append("<doc_date protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_date>");
valueXmlString.append("<doc_date protect = \"0\" visible = \"1\">").append("<![CDATA[]]>").append("</doc_date>");
valueXmlString.append("<doc_type protect = \"1\" visible = \"0\">").append("<![CDATA[]]>").append("</doc_type>");
}
}// end of gst_type
......
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