solving sorting problem

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94249 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dis/ibase/webitm/ejb/dis/TaxFormRecoMulti.java

@@ -141,8 +141,15 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
 		String resultString = "";
 		ResultSet rs1 = null;
 		PreparedStatement pstmt = null;
-		StringBuffer retTabSepStrBuff = new StringBuffer();
-		
+		//StringBuffer retTabSepStrBuff = new StringBuffer();  //comment by cpatil 12/02/14
+		//added by cpatil
+		StringBuffer retTabSepStrBuff = new StringBuffer("<?xml version = \"1.0\"?>");
+		retTabSepStrBuff.append("<DocumentRoot>");
+		retTabSepStrBuff.append("<description>").append("Datawindow Root").append("</description>");
+		retTabSepStrBuff.append("<group0>");
+		retTabSepStrBuff.append("<description>").append("Group0 description").append("</description>");
+		retTabSepStrBuff.append("<Header0>");
+		//end by cpatil
 		//==========new variables====================
 		String sundryType = null;
 		String refSeriesFr = null;
@@ -554,8 +561,10 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
 						{
 							getDataSql="SELECT T.TRAN_CODE,T.TRAN_ID,T.LINE_NO,T.LINE_NO__TAX,T.TAX_FORM,T.TAX_FORM_DATE,"
 										+"T.TAX_CLASS,T.TAX_PERC,T.TAX_ENV,T.TAXABLE_AMT,T.TAX_CODE,T.TAX_CHAP,"
-										+" sum( T.TAX_AMT ) as tax_amt,S.SUPP_NAME,P.TRAN_DATE,P.SUPP_CODE,P.EXCISE_REF,P.EXCISE_REF_DATE, " 
-										+" DDF_GET_SUNDRY_DETAILS(S.SUPP_TYPE,S.SUPP_CODE) as CITY,P.SITE_CODE,P.TOT_AMT FROM TAXTRAN T,TAX T1,PORCP P," 
+										+" sum( T.TAX_AMT ) as tax_amt,S.SUPP_NAME,P.TRAN_DATE,P.SUPP_CODE," +
+										"P.EXCISE_REF,P.EXCISE_REF_DATE, " 
+										+" DDF_GET_SUNDRY_DETAILS(S.SUPP_TYPE,S.SUPP_CODE) as CITY,P.SITE_CODE," +
+										"P.TOT_AMT FROM TAXTRAN T,TAX T1,PORCP P," 
 										+"SUPPLIER S WHERE ( T1.TAX_CODE = T.TAX_CODE ) and  "
 										+"( S.SUPP_CODE = P.SUPP_CODE ) and " 
 										+"( T.TRAN_ID = P.TRAN_ID ) and ( ( T.TRAN_CODE = ? ) AND  "
@@ -653,7 +662,8 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
 						{
 					    	getDataSql="SELECT A.TRAN_CODE,A.TRAN_ID,A.LINE_NO,A.LINE_NO__TAX,A.TAX_FORM,A.TAX_FORM_DATE,"
 									+"A.TAX_CLASS,A.TAX_PERC,A.TAX_ENV,A.TAXABLE_AMT,A.TAX_CODE,A.TAX_CHAP,"
-									+" sum( A.TAX_AMT ) as tax_amt,D.CUST_NAME,C.TRAN_DATE,C.CUST_CODE,'  ',' ' ,DDF_GET_SUNDRY_DETAILS(D.CUST_TYPE,D.CUST_CODE) as CITY,C.SITE_CODE,C.NET_AMT"  
+									+" sum( A.TAX_AMT ) as tax_amt,D.CUST_NAME,C.TRAN_DATE,C.CUST_CODE,'  ',' ' ," +
+									"DDF_GET_SUNDRY_DETAILS(D.CUST_TYPE,D.CUST_CODE) as CITY,C.SITE_CODE,C.NET_AMT"  
 									+" FROM TAXTRAN A,TAX B,INVOICE C,CUSTOMER D WHERE ( B.TAX_CODE = A.TAX_CODE ) and "  
 									+" ( A.TRAN_ID = C.INVOICE_ID ) and ( C.CUST_CODE = D.CUST_CODE ) and "  
 									+"( ( A.TRAN_CODE =? ) AND ( C.site_code = ? ) AND "  
@@ -844,7 +854,8 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
 							
 								getDataSql="SELECT A.TRAN_CODE,A.TRAN_ID,A.LINE_NO,A.LINE_NO__TAX,A.TAX_FORM,A.TAX_FORM_DATE,"
 										+" A.TAX_CLASS,A.TAX_PERC,A.TAX_ENV,A.TAXABLE_AMT,A.TAX_CODE,A.TAX_CHAP,"
-										+" sum( A.TAX_AMT ) as tax_amt,D.CUST_NAME,C.TRAN_DATE,C.CUST_CODE,'  ',' ',DDF_GET_SUNDRY_DETAILS(D.CUST_TYPE,D.CUST_CODE) as CITY,C.SITE_CODE,C.NET_AMT "  
+										+" sum( A.TAX_AMT ) as tax_amt,D.CUST_NAME,C.TRAN_DATE,C.CUST_CODE,'  ',' '," +
+										"DDF_GET_SUNDRY_DETAILS(D.CUST_TYPE,D.CUST_CODE) as CITY,C.SITE_CODE,C.NET_AMT "  
 										+" FROM TAXTRAN A,TAX B,INVOICE C,CUSTOMER D WHERE ( B.TAX_CODE = A.TAX_CODE ) and "  
 										+" ( A.TRAN_ID = C.INVOICE_ID ) and ( C.CUST_CODE = D.CUST_CODE ) and "  
 										+"( ( A.TRAN_CODE =? ) AND ( C.site_code = ? ) AND "  
@@ -864,7 +875,8 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
 								+"TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_PERC,"
 								+"TAXTRAN.TAX_ENV,TAXTRAN.TAXABLE_AMT,TAXTRAN.TAX_CODE,"
 								+"TAXTRAN.TAX_CHAP,SUM( TAXTRAN.TAX_AMT) AS TAX_AMT,"
-								+"SUPPLIER.SUPP_NAME,VOUCHER.TRAN_DATE,VOUCHER.SUPP_CODE,VOUCHER.BILL_NO,VOUCHER.BILL_DATE,DDF_GET_SUNDRY_DETAILS(SUPPLIER.SUPP_TYPE,SUPPLIER.SUPP_CODE) as CITY,VOUCHER.SITE_CODE,VOUCHER.NET_AMT "
+								+"SUPPLIER.SUPP_NAME,VOUCHER.TRAN_DATE,VOUCHER.SUPP_CODE,VOUCHER.BILL_NO,VOUCHER.BILL_DATE," +
+								"DDF_GET_SUNDRY_DETAILS(SUPPLIER.SUPP_TYPE,SUPPLIER.SUPP_CODE) as CITY,VOUCHER.SITE_CODE,VOUCHER.NET_AMT "
 								+" FROM TAX,TAXTRAN,SUPPLIER,VOUCHER WHERE ( TAXTRAN.TAX_CODE = TAX.TAX_CODE ) AND "
 								+"( VOUCHER.SUPP_CODE = SUPPLIER.SUPP_CODE ) AND ( TAXTRAN.TRAN_ID = VOUCHER.TRAN_ID )"
 								+"AND ( ( TAXTRAN.TRAN_CODE = ? ) AND (VOUCHER.SITE_CODE = ? ) AND "
@@ -887,7 +899,8 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
 									+" SUM(TAXTRAN.TAX_AMT) AS TAX_AMT,"
 									+" FN_SUNDRY_NAME(MISC_VOUCHER.SUNDRY_TYPE,MISC_VOUCHER.SUNDRY_CODE,' ') AS SUNDRY_NAME,"
 									+"MISC_VOUCHER.TRAN_DATE,MISC_VOUCHER.SUNDRY_CODE,"
-									+"MISC_VOUCHER.BILL_NO,MISC_VOUCHER.BILL_DATE,DDF_GET_SUNDRY_DETAILS(MISC_VOUCHER.SUNDRY_TYPE,MISC_VOUCHER.SUNDRY_CODE) as CITY,MISC_VOUCHER.SITE_CODE,MISC_VOUCHER.NET_AMT"
+									+"MISC_VOUCHER.BILL_NO,MISC_VOUCHER.BILL_DATE,DDF_GET_SUNDRY_DETAILS(MISC_VOUCHER.SUNDRY_TYPE," +
+									"MISC_VOUCHER.SUNDRY_CODE) as CITY,MISC_VOUCHER.SITE_CODE,MISC_VOUCHER.NET_AMT"
 									+"  FROM TAX,TAXTRAN,MISC_VOUCHER WHERE"
 									+" ( TAXTRAN.TAX_CODE = TAX.TAX_CODE ) AND ( TAXTRAN.TRAN_ID = MISC_VOUCHER.TRAN_ID ) AND"
 									+"( ( TAXTRAN.TRAN_CODE = ? ) AND (MISC_VOUCHER.SITE_CODE = ? ) AND "
@@ -930,66 +943,127 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
 				System.out.println("QUERY  PROCESS FINISED.......");
 				while(rs1.next()) 
 				{
-					
+						count++;
+						retTabSepStrBuff.append("<Detail2>");
 						//TRAN_CODE
-						retTabSepStrBuff.append((rs1.getString(1)==null?" ":rs1.getString(1))).append("\t");						
+						//retTabSepStrBuff.append((rs1.getString(1)==null?" ":rs1.getString(1))).append("\t");	
+						retTabSepStrBuff.append("<tran_code>").append("<![CDATA[" +(rs1.getString("TRAN_CODE")) +"]]>").append("</tran_code>");
 						//TRAN_ID
-						retTabSepStrBuff.append((rs1.getString(2)==null?" ":rs1.getString(2))).append("\t");
+						//retTabSepStrBuff.append((rs1.getString(2)==null?" ":rs1.getString(2))).append("\t");
+						retTabSepStrBuff.append("<tran_id>").append("<![CDATA[" +(rs1.getString("TRAN_ID")) +"]]>").append("</tran_id>");
 						//LINE_NO
-						retTabSepStrBuff.append((rs1.getString(3)==null?" ":rs1.getString(3))).append("\t");
-						//LINE_NO__TAX
-						retTabSepStrBuff.append((rs1.getString(4)==null?" ":rs1.getString(4))).append("\t");
-						//TAX_FORM
-						retTabSepStrBuff.append((rs1.getString(5)==null?" ":rs1.getString(5))).append("\t");
-						//TAX_FORM_DATE
-						if(rs1.getTimestamp(6)!=null)
+						//retTabSepStrBuff.append((rs1.getString(3)==null?" ":rs1.getString(3))).append("\t");
+						retTabSepStrBuff.append("<line_no>").append("<![CDATA[" +(rs1.getString("LINE_NO")) +"]]>").append("</line_no>");
+						//TRANDATE
+						/*
+						if(rs1.getTimestamp(15)!=null)
 						{
-							retTabSepStrBuff.append(this.genericUtility.getValidDateString(rs1.getTimestamp(6).toString(),this.genericUtility.getDBDateFormat(),this.genericUtility.getApplDateFormat())).append("\t");
+							retTabSepStrBuff.append(this.genericUtility.getValidDateString(rs1.getTimestamp(15).toString(),this.genericUtility.getDBDateFormat(),this.genericUtility.getApplDateFormat())).append("\t");
+							retTabSepStrBuff.append("<tran_id>").append("<![CDATA[" +(rs1.getString("TRAN_ID")) +"]]>").append("</tran_id>");
 						}
 						else
 						{
-								retTabSepStrBuff.append(" ").append("\t");
+							retTabSepStrBuff.append(" ").append("\t");
+							retTabSepStrBuff.append("<tran_id>").append("<![CDATA[" +(rs1.getString("TRAN_ID")) +"]]>").append("</tran_id>");
 						}
-						//TAX_CLASS
-						retTabSepStrBuff.append((rs1.getString(7)==null?" ":rs1.getString(7))).append("\t");
-						//TAX_PERC
-						retTabSepStrBuff.append((rs1.getString(8)==null?" ":rs1.getString(8))).append("\t");
-						//TAX_ENV
-						retTabSepStrBuff.append((rs1.getString(9)==null?" ":rs1.getString(9))).append("\t");
-						//TAXABLE_AMT
-						retTabSepStrBuff.append((rs1.getString(10)==null?" ":rs1.getString(10))).append("\t");
-						//TRAN_CODE
-						retTabSepStrBuff.append((rs1.getString(11)==null?" ":rs1.getString(11))).append("\t");
-						//TRAN_CHAP
-						retTabSepStrBuff.append((rs1.getString(12)==null?" ":rs1.getString(12))).append("\t");
-						//TAX_AMT
-						retTabSepStrBuff.append((rs1.getString(13)==null?" ":rs1.getString(13))).append("\t");
-						//SUNDRY_NAME
-						retTabSepStrBuff.append((rs1.getString(14)==null?" ":rs1.getString(14))).append("\t");
-						//TRANDATE
-						if(rs1.getTimestamp(15)!=null)
+						*/
+						if(rs1.getTimestamp("tran_date")!=null)
+			            {
+							retTabSepStrBuff.append("<tran_date>").append("<![CDATA[" +(this.genericUtility.getValidDateString(rs1.getTimestamp("tran_date").toString(),this.genericUtility.getDBDateFormat(),this.genericUtility.getApplDateFormat())) +"]]>").append("</tran_date>");
+			            }
+						else
 						{
-							retTabSepStrBuff.append(this.genericUtility.getValidDateString(rs1.getTimestamp(15).toString(),this.genericUtility.getDBDateFormat(),this.genericUtility.getApplDateFormat())).append("\t");
+							retTabSepStrBuff.append("<tran_date>").append(" ").append("</tran_date>");
 						}
+						
+						//EXCISE_REF_NO	  ////EXCISE_REF_DATE
+					if( refSer.equals("S-RET"))
+					{
+						retTabSepStrBuff.append("<excise_ref_no>").append("<![CDATA[" +(rs1.getString("excise_ref_no")) +"]]>").append("</excise_ref_no>");
+						
+						if(rs1.getTimestamp("excise_ref_date")!=null )
+			            {
+							retTabSepStrBuff.append("<excise_ref_date>").append("<![CDATA[" +(this.genericUtility.getValidDateString(rs1.getTimestamp("excise_ref_date").toString(),this.genericUtility.getDBDateFormat(),this.genericUtility.getApplDateFormat())) +"]]>").append("</excise_ref_date>");
+			            }
 						else
 						{
-							retTabSepStrBuff.append(" ").append("\t");
+							retTabSepStrBuff.append("<excise_ref_date>").append(" ").append("</excise_ref_date>");
 						}
-						//SUNDRY_CODE
-						retTabSepStrBuff.append((rs1.getString(16)==null?" ":rs1.getString(16))).append("\t");
-						//EXCISE_REF_NO
-						retTabSepStrBuff.append((rs1.getString(17)==null?" ":rs1.getString(17))).append("\t");
-						//EXCISE_REF_DATE
-						//if(rs1.getTimestamp(18)!=null)
+					}	
+					else if ( refSer.equals("P-RCP") || refSer.equals("P-RET") )
+					{
+						retTabSepStrBuff.append("<excise_ref_no>").append("<![CDATA[" +(rs1.getString("excise_ref")) +"]]>").append("</excise_ref_no>");
 						
-						if(rs1.getString(18) != null && rs1.getString(18).trim().length()>0)
+						if(rs1.getTimestamp("excise_ref_date")!=null )
+			            {
+							retTabSepStrBuff.append("<excise_ref_date>").append("<![CDATA[" +(this.genericUtility.getValidDateString(rs1.getTimestamp("excise_ref_date").toString(),this.genericUtility.getDBDateFormat(),this.genericUtility.getApplDateFormat())) +"]]>").append("</excise_ref_date>");
+			            }
+						else
 						{
-							retTabSepStrBuff.append(this.genericUtility.getValidDateString(rs1.getTimestamp(18).toString(),this.genericUtility.getDBDateFormat(),this.genericUtility.getApplDateFormat())).append("\t");
+							retTabSepStrBuff.append("<excise_ref_date>").append(" ").append("</excise_ref_date>");
 						}
+					}
+					else if( refSer.equals("D-RCP") || refSer.equals("D-ISS") || refSer.equals("S-DSP") )
+					{
+						retTabSepStrBuff.append("<excise_ref_no>").append("<![CDATA[" +(rs1.getString("gp_no")) +"]]>").append("</excise_ref_no>");
+						
+						if(rs1.getTimestamp("gp_date")!=null )
+			            {
+							retTabSepStrBuff.append("<excise_ref_date>").append("<![CDATA[" +(this.genericUtility.getValidDateString(rs1.getTimestamp("gp_date").toString(),this.genericUtility.getDBDateFormat(),this.genericUtility.getApplDateFormat())) +"]]>").append("</excise_ref_date>");
+			            }
 						else
 						{
-							retTabSepStrBuff.append(" ").append("\t");
+							retTabSepStrBuff.append("<excise_ref_date>").append(" ").append("</excise_ref_date>");
 						}
+					}
+					else if ( refSer.equals("S-INV") )
+					{
+
+						retTabSepStrBuff.append("<excise_ref_no>").append(" ").append("</excise_ref_no>");
+						retTabSepStrBuff.append("<excise_ref_date>").append(" ").append("</excise_ref_date>");
+					
+						
+					}
+					else if( refSer.equals("VOUCH") || refSer.equals("M-VOUCH") )
+					{
+						retTabSepStrBuff.append("<excise_ref_no>").append("<![CDATA[" +(rs1.getString("bill_no")) +"]]>").append("</excise_ref_no>");
+						
+						if(rs1.getTimestamp("bill_date")!=null )
+			            {
+							retTabSepStrBuff.append("<excise_ref_date>").append("<![CDATA[" +(this.genericUtility.getValidDateString(rs1.getTimestamp("bill_date").toString(),this.genericUtility.getDBDateFormat(),this.genericUtility.getApplDateFormat())) +"]]>").append("</excise_ref_date>");
+			            }
+						else
+						{
+							retTabSepStrBuff.append("<excise_ref_date>").append(" ").append("</excise_ref_date>");
+						}
+					}
+						
+						
+						
+						
+					
+						//sundry_code  // //sundry_name
+					if( refSer.equals("S-RET") ||  refSer.equals("S-DSP") ||  refSer.equals("S-INV"))
+					{
+						retTabSepStrBuff.append("<sundry_code>").append("<![CDATA[" +(rs1.getString("cust_code")) +"]]>").append("</sundry_code>");
+						retTabSepStrBuff.append("<sundry_name>").append("<![CDATA[" +(rs1.getString("cust_name")) +"]]>").append("</sundry_name>");
+					}
+					else if( refSer.equals("P-RCP") ||  refSer.equals("P-RET") ||  refSer.equals("VOUCH"))
+					{
+						retTabSepStrBuff.append("<sundry_code>").append("<![CDATA[" +(rs1.getString("supp_code")) +"]]>").append("</sundry_code>");
+						retTabSepStrBuff.append("<sundry_name>").append("<![CDATA[" +(rs1.getString("supp_name")) +"]]>").append("</sundry_name>");
+					}
+					else if( refSer.equals("D-RCP") ||  refSer.equals("D-ISS") ||  refSer.equals("M-VOUCH"))
+					{
+						retTabSepStrBuff.append("<sundry_code>").append("<![CDATA[" +(rs1.getString("sundry_code")) +"]]>").append("</sundry_code>");
+						retTabSepStrBuff.append("<sundry_name>").append("<![CDATA[" +(rs1.getString("sundry_name")) +"]]>").append("</sundry_name>");
+					}
+					
+					//retTabSepStrBuff.append((rs1.getString(14)==null?" ":rs1.getString(14))).append("\t");
+						//retTabSepStrBuff.append("<sundry_code>").append("<![CDATA[" +(rs1.getString("sundry_code")) +"]]>").append("</sundry_code>");
+						//sundry_name
+						//retTabSepStrBuff.append((rs1.getString(16)==null?" ":rs1.getString(16))).append("\t");
+						//retTabSepStrBuff.append("<sundry_name>").append("<![CDATA[" +(rs1.getString("sundry_name")) +"]]>").append("</sundry_name>");
 						
 						//added by chandrakant patil start 29 March
 						//CITY
@@ -997,15 +1071,18 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
 						//
 						//if( (refSer.equals("D-RCP")) || (refSer.equals("D-ISS")) || (refSer.equals("M-VOUC")) || (refSer.equals("D-RCP")) || (refSer.equals("D-ISS")) || (refSer.equals("M-VOUC")))
 						//{
-						  String str=rs1.getString(19)==null?" ":rs1.getString(19);
+						  String str=rs1.getString("CITY")==null?" ":rs1.getString("CITY");
 						    if (str.equalsIgnoreCase(null) || str.equalsIgnoreCase(" ") || str.equalsIgnoreCase(""))
 						    {
-						    	retTabSepStrBuff.append(" ").append("\t");
+						    	// retTabSepStrBuff.append(" ").append("\t");
+						    	retTabSepStrBuff.append("<city>").append(" ").append("</city>");
 						    }
 						    else
 						    {
 						    	String strArr[] = str.split("~n");
-							    retTabSepStrBuff.append((strArr[4]==null?" ":strArr[4])).append("\t");
+							  //  retTabSepStrBuff.append((strArr[4]==null?" ":strArr[4])).append("\t");
+						    	System.out.println("@@@@ city ["+strArr[4]==null?" ":strArr[4]+"]");
+							    retTabSepStrBuff.append("<city>").append("<![CDATA[" +(strArr[4]==null?" ":strArr[4]) +"]]>").append("</city>");
 						    }	
 						/* }
 						else
@@ -1014,17 +1091,100 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
 						}
 						*/
 						//SITE CODE
-						retTabSepStrBuff.append((rs1.getString(20)==null?" ":rs1.getString(20))).append("\t");
+						//retTabSepStrBuff.append((rs1.getString(20)==null?" ":rs1.getString(20))).append("\t");
+						retTabSepStrBuff.append("<site_code>").append("<![CDATA[" +(rs1.getString("site_code")) +"]]>").append("</site_code>");
 						//NET AMOUNT
-						retTabSepStrBuff.append((rs1.getString(21)==null?" ":rs1.getString(21))).append("\t");
+						//retTabSepStrBuff.append((rs1.getString(21)==null?" ":rs1.getString(21))).append("\t");
+						retTabSepStrBuff.append("<net_amount>").append("<![CDATA[" +(rs1.getString("NET_AMT")) +"]]>").append("</net_amount>");
 						//chandrakant Finish
 						
+						//TAX_FORM
+						//retTabSepStrBuff.append((rs1.getString(5)==null?" ":rs1.getString(5))).append("\t");
+						retTabSepStrBuff.append("<tax_form>").append("<![CDATA[" +(rs1.getString("tax_form")) +"]]>").append("</tax_form>");
 						
+						//TAX_FORM_DATE
+						/*
+						if(rs1.getTimestamp(6)!=null)
+						{
+							retTabSepStrBuff.append(this.genericUtility.getValidDateString(rs1.getTimestamp(6).toString(),this.genericUtility.getDBDateFormat(),this.genericUtility.getApplDateFormat())).append("\t");
+							retTabSepStrBuff.append("<tran_id>").append("<![CDATA[" +(rs1.getString("TRAN_ID")) +"]]>").append("</tran_id>");
+						}
+						else
+						{
+								retTabSepStrBuff.append(" ").append("\t");
+								retTabSepStrBuff.append("<tran_id>").append("<![CDATA[" +(rs1.getString("TRAN_ID")) +"]]>").append("</tran_id>");
+						}
+						*/
+						if(rs1.getTimestamp("tax_form_date")!=null )
+			            {
+							retTabSepStrBuff.append("<tax_form_date>").append("<![CDATA[" +(this.genericUtility.getValidDateString(rs1.getTimestamp("tax_form_date").toString(),this.genericUtility.getDBDateFormat(),this.genericUtility.getApplDateFormat())) +"]]>").append("</tax_form_date>");
+			            }
+						else
+						{
+							retTabSepStrBuff.append("<tax_form_date>").append(" ").append("</tax_form_date>");
+						}
+
 						
+						/*
 						
-						retTabSepStrBuff.append("\n");				
-						count++;
-						System.out.println("#####Counter"+count);
+						
+						//TAX_FORM
+						retTabSepStrBuff.append((rs1.getString(5)==null?" ":rs1.getString(5))).append("\t");
+						retTabSepStrBuff.append("<tran_id>").append("<![CDATA[" +(rs1.getString("TRAN_ID")) +"]]>").append("</tran_id>");
+						//TAX_FORM_DATE
+						if(rs1.getTimestamp(6)!=null)
+						{
+							retTabSepStrBuff.append(this.genericUtility.getValidDateString(rs1.getTimestamp(6).toString(),this.genericUtility.getDBDateFormat(),this.genericUtility.getApplDateFormat())).append("\t");
+							retTabSepStrBuff.append("<tran_id>").append("<![CDATA[" +(rs1.getString("TRAN_ID")) +"]]>").append("</tran_id>");
+						}
+						else
+						{
+								retTabSepStrBuff.append(" ").append("\t");
+								retTabSepStrBuff.append("<tran_id>").append("<![CDATA[" +(rs1.getString("TRAN_ID")) +"]]>").append("</tran_id>");
+						}
+						
+					
+						
+						*/
+						//TRAN_CODE  //tax_code
+						//retTabSepStrBuff.append((rs1.getString(11)==null?" ":rs1.getString(11))).append("\t");
+						retTabSepStrBuff.append("<tax_code>").append("<![CDATA[" +(rs1.getString("tax_code")) +"]]>").append("</tax_code>");
+						
+						//LINE_NO__TAX
+						//retTabSepStrBuff.append((rs1.getString(4)==null?" ":rs1.getString(4))).append("\t");
+						retTabSepStrBuff.append("<line_no__tax>").append("<![CDATA[" +(rs1.getString("line_no__tax")) +"]]>").append("</line_no__tax>");
+						
+						//taxable_amt
+						//TAXABLE_AMT
+						//retTabSepStrBuff.append((rs1.getString(10)==null?" ":rs1.getString(10))).append("\t");
+						retTabSepStrBuff.append("<taxable_amt>").append("<![CDATA[" +(rs1.getString("taxable_amt")) +"]]>").append("</taxable_amt>");
+						
+						//TAX_AMT
+						//retTabSepStrBuff.append((rs1.getString(13)==null?" ":rs1.getString(13))).append("\t");
+						retTabSepStrBuff.append("<tax_amt>").append("<![CDATA[" +(rs1.getString("tax_amt")) +"]]>").append("</tax_amt>");
+						
+						//TAX_PERC
+						//retTabSepStrBuff.append((rs1.getString(8)==null?" ":rs1.getString(8))).append("\t");
+						retTabSepStrBuff.append("<tax_perc>").append("<![CDATA[" +(rs1.getString("tax_perc")) +"]]>").append("</tax_perc>");
+						
+						
+						//TAX_CLASS
+						//retTabSepStrBuff.append((rs1.getString(7)==null?" ":rs1.getString(7))).append("\t");
+						retTabSepStrBuff.append("<tax_class>").append("<![CDATA[" +(rs1.getString("tax_class")) +"]]>").append("</tax_class>");
+						//TRAN_CHAP
+						//retTabSepStrBuff.append((rs1.getString(12)==null?" ":rs1.getString(12))).append("\t");
+						retTabSepStrBuff.append("<tax_chap>").append("<![CDATA[" +(rs1.getString("tax_chap")) +"]]>").append("</tax_chap>");
+						//TAX_ENV
+						//retTabSepStrBuff.append((rs1.getString(9)==null?" ":rs1.getString(9))).append("\t");
+						retTabSepStrBuff.append("<tax_env>").append("<![CDATA[" +(rs1.getString("tax_env")) +"]]>").append("</tax_env>");
+						
+						
+						retTabSepStrBuff.append("</Detail2>");
+
+						
+						//retTabSepStrBuff.append("\n");				
+						//count++;
+						//System.out.println("#####Counter"+count);
 				}//END WHILE
 				rs1.close();
 				pstmt.close();
@@ -1055,7 +1215,8 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
 						{
 							getDataSql = "SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,"
 							+"TAXTRAN.TAX_ENV,SRETURN.TRAN_DATE,SRETURN.CUST_CODE,CUSTOMER.CUST_NAME,SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT,"
-							+"SRETURN.EXCISE_REF_NO,SRETURN.EXCISE_REF_DATE,DDF_GET_SUNDRY_DETAILS(CUSTOMER.CUST_TYPE,CUSTOMER.CUST_CODE) as CITY,SRETURN.SITE_CODE,SRETURN.NET_AMT FROM TAXTRAN,TAX,CUSTOMER,SRETURN WHERE "
+							+"SRETURN.EXCISE_REF_NO,SRETURN.EXCISE_REF_DATE,DDF_GET_SUNDRY_DETAILS(CUSTOMER.CUST_TYPE,CUSTOMER.CUST_CODE) as CITY," +
+							"SRETURN.SITE_CODE,SRETURN.NET_AMT FROM TAXTRAN,TAX,CUSTOMER,SRETURN WHERE "
 							+"( TAX.TAX_CODE = TAXTRAN.TAX_CODE ) AND  ( CUSTOMER.CUST_CODE = SRETURN.CUST_CODE ) AND "
 							+"( TAXTRAN.TRAN_ID = SRETURN.TRAN_ID ) AND  ( ( TAXTRAN.TRAN_CODE = ? ) AND  ( SRETURN.SITE_CODE = ? ) AND"
 							+" ( SRETURN.TRAN_DATE BETWEEN ? AND ?   ) AND ( SRETURN.CUST_CODE BETWEEN ? AND ?  ) AND "
@@ -1211,7 +1372,9 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
 						{
 							getDataSql = "SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS"
 							+",TAXTRAN.TAX_ENV,SRETURN.TRAN_DATE,SRETURN.CUST_CODE,CUSTOMER.CUST_NAME,SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT,"
-							+"SRETURN.EXCISE_REF_NO,SRETURN.EXCISE_REF_DATE,DDF_GET_SUNDRY_DETAILS(CUSTOMER.CUST_TYPE,CUSTOMER.CUST_CODE) as CITY,SRETURN.SITE_CODE,SRETURN.NET_AMT FROM TAX,TAXTRAN,CUSTOMER,SRETURN WHERE ( TAXTRAN.TAX_CODE = TAX.TAX_CODE )"
+							+"SRETURN.EXCISE_REF_NO,SRETURN.EXCISE_REF_DATE,DDF_GET_SUNDRY_DETAILS(CUSTOMER.CUST_TYPE,CUSTOMER.CUST_CODE) as CITY," +
+							"SRETURN.SITE_CODE,SRETURN.NET_AMT " +
+							"FROM TAX,TAXTRAN,CUSTOMER,SRETURN WHERE ( TAXTRAN.TAX_CODE = TAX.TAX_CODE )"
 							+" AND ( CUSTOMER.CUST_CODE = SRETURN.CUST_CODE ) AND ( TAXTRAN.TRAN_ID = SRETURN.TRAN_ID ) AND ( ( TAXTRAN.TRAN_CODE = ? )"
 							+" AND (SRETURN.SITE_CODE = ? ) AND (SRETURN.TRAN_DATE BETWEEN ? AND ? ) AND "
 							+"(SRETURN.CUST_CODE BETWEEN ? AND ? ) AND ( TAXTRAN.TAX_CODE BETWEEN ? AND ? ) AND"
@@ -1319,7 +1482,8 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
 						{
 							getDataSql = "SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,"
 							+"TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,VOUCHER.TRAN_DATE,VOUCHER.SUPP_CODE,SUPPLIER.SUPP_NAME,"
-							+"SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT,VOUCHER.BILL_NO,VOUCHER.BILL_DATE,DDF_GET_SUNDRY_DETAILS(SUPPLIER.SUPP_TYPE,SUPPLIER.SUPP_CODE) as CITY,VOUCHER.SITE_CODE,VOUCHER.NET_AMT FROM TAX,TAXTRAN,SUPPLIER,"
+							+"SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT,VOUCHER.BILL_NO,VOUCHER.BILL_DATE,DDF_GET_SUNDRY_DETAILS(SUPPLIER.SUPP_TYPE,SUPPLIER.SUPP_CODE) as CITY," +
+							"VOUCHER.SITE_CODE,VOUCHER.NET_AMT FROM TAX,TAXTRAN,SUPPLIER,"
 							+" VOUCHER WHERE ( TAXTRAN.TAX_CODE = TAX.TAX_CODE ) AND ( TAXTRAN.TRAN_ID = VOUCHER.TRAN_ID ) AND "
 							+" ( VOUCHER.SUPP_CODE = SUPPLIER.SUPP_CODE ) AND ( ( TAXTRAN.TRAN_CODE = ? ) AND "
 							+" (VOUCHER.SITE_CODE = ? ) AND (VOUCHER.TRAN_DATE BETWEEN ? AND ? ) AND "
@@ -1337,7 +1501,9 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
 							+" TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,MISC_VOUCHER.TRAN_DATE,MISC_VOUCHER.SUNDRY_CODE,"
 							+" FN_SUNDRY_NAME(MISC_VOUCHER.SUNDRY_TYPE,MISC_VOUCHER.SUNDRY_CODE,' ') AS SUNDRY_NAME "
 							+" ,SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT"
-							+",MISC_VOUCHER.BILL_NO,MISC_VOUCHER.BILL_DATE,DDF_GET_SUNDRY_DETAILS(MISC_VOUCHER.SUNDRY_TYPE,MISC_VOUCHER.SUNDRY_CODE) as CITY,MISC_VOUCHER.SITE_CODE,MISC_VOUCHER.NET_AMT "
+							+",MISC_VOUCHER.BILL_NO,MISC_VOUCHER.BILL_DATE," +
+							"DDF_GET_SUNDRY_DETAILS(MISC_VOUCHER.SUNDRY_TYPE,MISC_VOUCHER.SUNDRY_CODE) as CITY," +
+							"MISC_VOUCHER.SITE_CODE,MISC_VOUCHER.NET_AMT "
 							+" FROM TAX,TAXTRAN,MISC_VOUCHER WHERE ( TAXTRAN.TAX_CODE = TAX.TAX_CODE ) AND "
 							+" ( TAXTRAN.TRAN_ID = MISC_VOUCHER.TRAN_ID ) AND ( ( TAXTRAN.TRAN_CODE = ? ) AND "
 							+" (MISC_VOUCHER.SITE_CODE = ? ) AND (MISC_VOUCHER.TRAN_DATE BETWEEN ? AND ? ) AND "
@@ -1375,18 +1541,191 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
 				System.out.println("QUERY  PROCESS FINISED.......");
 				while(rs1.next()) 
 				{
+					//////////////////cpatil
+
+					count++;
+					retTabSepStrBuff.append("<Detail2>");
+					//TRAN_CODE
+					retTabSepStrBuff.append("<tran_code>").append("<![CDATA[" +(rs1.getString("TRAN_CODE")) +"]]>").append("</tran_code>");
+					//TRAN_ID
+					retTabSepStrBuff.append("<tran_id>").append("<![CDATA[" +(rs1.getString("TRAN_ID")) +"]]>").append("</tran_id>");
+					//LINE_NO
+					retTabSepStrBuff.append("<line_no>").append("0").append("</line_no>");
+					//TRANDATE
+					if(rs1.getTimestamp("tran_date")!=null)
+		            {
+						retTabSepStrBuff.append("<tran_date>").append("<![CDATA[" +(this.genericUtility.getValidDateString(rs1.getTimestamp("tran_date").toString(),this.genericUtility.getDBDateFormat(),this.genericUtility.getApplDateFormat())) +"]]>").append("</tran_date>");
+		            }
+					else
+					{
+						retTabSepStrBuff.append("<tran_date>").append(" ").append("</tran_date>");
+					}
 					
-						//TRAN_CODE
+					/*
+					//EXCISE_REF_NO
+					retTabSepStrBuff.append("<excise_ref_no>").append("<![CDATA[" +(rs1.getString("BILL_NO")) +"]]>").append("</excise_ref_no>");
+					//EXCISE_REF_DATE
+					if(rs1.getTimestamp("BILL_DATE")!=null )
+		            {
+						retTabSepStrBuff.append("<excise_ref_date>").append("<![CDATA[" +(this.genericUtility.getValidDateString(rs1.getTimestamp("BILL_DATE").toString(),this.genericUtility.getDBDateFormat(),this.genericUtility.getApplDateFormat())) +"]]>").append("</excise_ref_date>");
+		            }
+					else
+					{
+						retTabSepStrBuff.append("<excise_ref_date>").append(" ").append("</excise_ref_date>");
+					}
+					*/
+					
+					//EXCISE_REF_NO	  ////EXCISE_REF_DATE
+					if( refSer.equals("S-RET"))
+					{
+						retTabSepStrBuff.append("<excise_ref_no>").append("<![CDATA[" +(rs1.getString("excise_ref_no")) +"]]>").append("</excise_ref_no>");
+						
+						if(rs1.getTimestamp("excise_ref_date")!=null )
+			            {
+							retTabSepStrBuff.append("<excise_ref_date>").append("<![CDATA[" +(this.genericUtility.getValidDateString(rs1.getTimestamp("excise_ref_date").toString(),this.genericUtility.getDBDateFormat(),this.genericUtility.getApplDateFormat())) +"]]>").append("</excise_ref_date>");
+			            }
+						else
+						{
+							retTabSepStrBuff.append("<excise_ref_date>").append(" ").append("</excise_ref_date>");
+						}
+					}	
+					else if ( refSer.equals("P-RCP") || refSer.equals("P-RET") )
+					{
+						retTabSepStrBuff.append("<excise_ref_no>").append("<![CDATA[" +(rs1.getString("excise_ref")) +"]]>").append("</excise_ref_no>");
+						
+						if(rs1.getTimestamp("excise_ref_date")!=null )
+			            {
+							retTabSepStrBuff.append("<excise_ref_date>").append("<![CDATA[" +(this.genericUtility.getValidDateString(rs1.getTimestamp("excise_ref_date").toString(),this.genericUtility.getDBDateFormat(),this.genericUtility.getApplDateFormat())) +"]]>").append("</excise_ref_date>");
+			            }
+						else
+						{
+							retTabSepStrBuff.append("<excise_ref_date>").append(" ").append("</excise_ref_date>");
+						}
+					}
+					else if( refSer.equals("D-RCP") || refSer.equals("D-ISS") || refSer.equals("S-DSP") )
+					{
+						retTabSepStrBuff.append("<excise_ref_no>").append("<![CDATA[" +(rs1.getString("gp_no")) +"]]>").append("</excise_ref_no>");
+						
+						if(rs1.getTimestamp("gp_date")!=null )
+			            {
+							retTabSepStrBuff.append("<excise_ref_date>").append("<![CDATA[" +(this.genericUtility.getValidDateString(rs1.getTimestamp("gp_date").toString(),this.genericUtility.getDBDateFormat(),this.genericUtility.getApplDateFormat())) +"]]>").append("</excise_ref_date>");
+			            }
+						else
+						{
+							retTabSepStrBuff.append("<excise_ref_date>").append(" ").append("</excise_ref_date>");
+						}
+					}
+					else if ( refSer.equals("S-INV") )
+					{
+
+						retTabSepStrBuff.append("<excise_ref_no>").append(" ").append("</excise_ref_no>");
+						retTabSepStrBuff.append("<excise_ref_date>").append(" ").append("</excise_ref_date>");
+					}
+					else if( refSer.equals("VOUCH") || refSer.equals("M-VOUCH") )
+					{
+						retTabSepStrBuff.append("<excise_ref_no>").append("<![CDATA[" +(rs1.getString("bill_no")) +"]]>").append("</excise_ref_no>");
+						
+						if(rs1.getTimestamp("bill_date")!=null )
+			            {
+							retTabSepStrBuff.append("<excise_ref_date>").append("<![CDATA[" +(this.genericUtility.getValidDateString(rs1.getTimestamp("bill_date").toString(),this.genericUtility.getDBDateFormat(),this.genericUtility.getApplDateFormat())) +"]]>").append("</excise_ref_date>");
+			            }
+						else
+						{
+							retTabSepStrBuff.append("<excise_ref_date>").append(" ").append("</excise_ref_date>");
+						}
+					}
+						
+
+					
+					
+					
+					
+					//sundry_code  // //sundry_name
+					if( refSer.equals("S-RET") ||  refSer.equals("S-DSP") ||  refSer.equals("S-INV"))
+					{
+						retTabSepStrBuff.append("<sundry_code>").append("<![CDATA[" +(rs1.getString("cust_code")) +"]]>").append("</sundry_code>");
+						retTabSepStrBuff.append("<sundry_name>").append("<![CDATA[" +(rs1.getString("cust_name")) +"]]>").append("</sundry_name>");
+					}
+					else if( refSer.equals("P-RCP") ||  refSer.equals("P-RET") ||  refSer.equals("VOUCH"))
+					{
+						retTabSepStrBuff.append("<sundry_code>").append("<![CDATA[" +(rs1.getString("supp_code")) +"]]>").append("</sundry_code>");
+						retTabSepStrBuff.append("<sundry_name>").append("<![CDATA[" +(rs1.getString("supp_name")) +"]]>").append("</sundry_name>");
+					}
+					else if( refSer.equals("D-RCP") ||  refSer.equals("D-ISS") ||  refSer.equals("M-VOUCH"))
+					{
+						retTabSepStrBuff.append("<sundry_code>").append("<![CDATA[" +(rs1.getString("sundry_code")) +"]]>").append("</sundry_code>");
+						retTabSepStrBuff.append("<sundry_name>").append("<![CDATA[" +(rs1.getString("sundry_name")) +"]]>").append("</sundry_name>");
+					}
+					
+					/*
+					//sundry_code
+					retTabSepStrBuff.append("<sundry_code>").append("<![CDATA[" +(rs1.getString("sundry_code")) +"]]>").append("</tran_id>");
+					//sundry_name
+					retTabSepStrBuff.append("<sundry_name>").append("<![CDATA[" +(rs1.getString("sundry_name")) +"]]>").append("</sundry_name>");
+					*/
+					
+					//CITY
+					  String str=rs1.getString("CITY")==null?" ":rs1.getString("CITY");
+					    if (str.equalsIgnoreCase(null) || str.equalsIgnoreCase(" ") || str.equalsIgnoreCase(""))
+					    {
+					    	retTabSepStrBuff.append("<city>").append(" ").append("</city>");
+					    }
+					    else
+					    {
+					    	String strArr[] = str.split("~n");
+					    	System.out.println("@@@@2 city ["+strArr[4]==null?" ":strArr[4]+"]");
+						    retTabSepStrBuff.append("<city>").append("<![CDATA[" +(strArr[4]==null?" ":strArr[4]) +"]]>").append("</city>");
+					    }	
+				    //SITE CODE
+					retTabSepStrBuff.append("<site_code>").append("<![CDATA[" +(rs1.getString("site_code")) +"]]>").append("</site_code>");
+					//NET AMOUNT
+					retTabSepStrBuff.append("<net_amount>").append("<![CDATA[" +(rs1.getString("NET_AMT")) +"]]>").append("</net_amount>");
+					//TAX_FORM
+					retTabSepStrBuff.append("<tax_form>").append("<![CDATA[" +( rs1.getString("tax_form")) +"]]>").append("</tax_form>");
+					//TAX_FORM_DATE
+					if(rs1.getTimestamp("tax_form_date")!=null )
+		            {
+						retTabSepStrBuff.append("<tax_form_date>").append("<![CDATA[" +(this.genericUtility.getValidDateString(rs1.getTimestamp("tax_form_date").toString(),this.genericUtility.getDBDateFormat(),this.genericUtility.getApplDateFormat())) +"]]>").append("</tax_form_date>");
+		            }
+					else
+					{
+						retTabSepStrBuff.append("<tax_form_date>").append(" ").append("</tax_form_date>");
+					}
+					//TRAN_CODE  //tax_code
+					retTabSepStrBuff.append("<tax_code>").append(" ").append("</tax_code>");
+					//LINE_NO__TAX
+					retTabSepStrBuff.append("<line_no__tax>").append("0").append("</line_no__tax>");
+					//taxable_amt
+					retTabSepStrBuff.append("<taxable_amt>").append("0").append("</taxable_amt>");
+					//TAX_AMT
+					retTabSepStrBuff.append("<tax_amt>").append("<![CDATA[" +(rs1.getString("tax_amt")) +"]]>").append("</tax_amt>");
+					//TAX_PERC
+					retTabSepStrBuff.append("<tax_perc>").append("0").append("</tax_perc>");
+					//TAX_CLASS
+					retTabSepStrBuff.append("<tax_class>").append("<![CDATA[" +(rs1.getString("tax_class")) +"]]>").append("</tax_class>");
+					//TRAN_CHAP
+					retTabSepStrBuff.append("<tax_chap>").append(" ").append("</tax_chap>");
+					//TAX_ENV
+					retTabSepStrBuff.append("<tax_env>").append("<![CDATA[" +(rs1.getString("tax_env")) +"]]>").append("</tax_env>");
+					
+					retTabSepStrBuff.append("</Detail2>");
+					
+					
+					/////////////// cpatil
+				
+				/*	
+					
+						//TRAN_CODE ok 
 						retTabSepStrBuff.append((rs1.getString(1)==null?" ":rs1.getString(1))).append("\t");						
-						//TRAN_ID
+						//TRAN_ID    ok
 						retTabSepStrBuff.append((rs1.getString(2)==null?" ":rs1.getString(2))).append("\t");
-						//LINE_NO
+						//LINE_NO    ok
 						retTabSepStrBuff.append("0").append("\t");
-						//LINE_NO__TAX
+						//LINE_NO__TAX    ok
 						retTabSepStrBuff.append("0").append("\t");
-						//TAX_FORM
+						//TAX_FORM     ok
 						retTabSepStrBuff.append((rs1.getString(3)==null?" ":rs1.getString(3))).append("\t");
-						//TAX_FORM_DATE
+						//TAX_FORM_DATE     ok
 						if(rs1.getTimestamp(4)!=null)
 						{
 							retTabSepStrBuff.append(this.genericUtility.getValidDateString(rs1.getTimestamp(4).toString(),this.genericUtility.getDBDateFormat(),this.genericUtility.getApplDateFormat())).append("\t");
@@ -1395,23 +1734,23 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
 						{
 								retTabSepStrBuff.append(" ").append("\t");
 						}
-						//TAX_CLASS
+						//TAX_CLASS    ok
 						retTabSepStrBuff.append((rs1.getString(5)==null?" ":rs1.getString(5))).append("\t");
-						//TAX_PERC
+						//TAX_PERC     ok
 						retTabSepStrBuff.append("0").append("\t");
-						//TAX_ENV
+						//TAX_ENV     ok
 						retTabSepStrBuff.append((rs1.getString(6)==null?" ":rs1.getString(6))).append("\t");
-						//TAXABLE_AMT
+						//TAXABLE_AMT     ok
 						retTabSepStrBuff.append("0").append("\t");
-						//TAX_CODE
+						//TAX_CODE   ok
 						retTabSepStrBuff.append(" ").append("\t");
-						//TRAN_CHAP
+						//TRAN_CHAP    ok
 						retTabSepStrBuff.append(" ").append("\t");
-						//TAX_AMT
+						//TAX_AMT     ok
 						retTabSepStrBuff.append((rs1.getString(10)==null?" ":rs1.getString(10))).append("\t");
-						//SUNDRY_NAME
+						//SUNDRY_NAME    ok
 						retTabSepStrBuff.append((rs1.getString(9)==null?" ":rs1.getString(9))).append("\t");
-						//TRANDATE
+						//TRANDATE    ok
 						if(rs1.getTimestamp(7)!=null)
 						{
 							retTabSepStrBuff.append(this.genericUtility.getValidDateString(rs1.getTimestamp(7).toString(),this.genericUtility.getDBDateFormat(),this.genericUtility.getApplDateFormat())).append("\t");
@@ -1420,11 +1759,11 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
 						{
 								retTabSepStrBuff.append(" ").append("\t");
 						}
-						//SUNDRY_CODE
+						//SUNDRY_CODE     ok
 						retTabSepStrBuff.append((rs1.getString(8)==null?" ":rs1.getString(8))).append("\t");
-						//EXCISE_REF_NO
+						//EXCISE_REF_NO    ok
 						retTabSepStrBuff.append((rs1.getString(11)==null?" ":rs1.getString(11))).append("\t");
-						//EXCISE_REF_DATE
+						//EXCISE_REF_DATE    ok
 						if (refSer.equals("S-INV"))//Condition added by Jaimin 11/09/2007 requst-ID :DI78DIS028
 						{
 							retTabSepStrBuff.append((rs1.getString(12)==null?" ":rs1.getString(12))).append("\t");
@@ -1442,10 +1781,12 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
 						}		
 						
 						//added by chandrakant patil start 29 March
-						//CITY
+						//CITY      ok
 						//if( (refSer.equals("D-RCP")) || (refSer.equals("D-ISS")) || (refSer.equals("M-VOUC")))
 						//{
-						  String str=rs1.getString(13)==null?" ":rs1.getString(13);
+						 
+						//String
+						  str=rs1.getString(13)==null?" ":rs1.getString(13);
 						 	if (str.equalsIgnoreCase(null) || str.equalsIgnoreCase(" ") || str.equalsIgnoreCase(""))
 						    {
 						 		retTabSepStrBuff.append(" ").append("\t");
@@ -1455,21 +1796,24 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
 						    	String strArr[] = str.split("~n");
 							    retTabSepStrBuff.append((strArr[4]==null?" ":strArr[4])).append("\t");
 						    }
-						/*
-						  }
-						 
-						else
-						{	
-						retTabSepStrBuff.append((rs1.getString(13)==null?" ":rs1.getString(13))).append("\t");						
-						}
-						*/
-						//SITE CODE
+					//	
+					//	  }
+					//	 
+					//	else
+					//	{	
+					//	retTabSepStrBuff.append((rs1.getString(13)==null?" ":rs1.getString(13))).append("\t");						
+					//	}
+					//	
+						//SITE CODE   ok
 						retTabSepStrBuff.append((rs1.getString(14)==null?" ":rs1.getString(14))).append("\t");
-						//NET AMOUNT
+						//NET AMOUNT   ok
 						retTabSepStrBuff.append((rs1.getString(15)==null?" ":rs1.getString(15))).append("\t");
 						//chandrakant Finish
 						retTabSepStrBuff.append("\n");				
 						count++;
+						
+					*/	
+						
 						System.out.println("#####Counter"+count);
 				}//END WHILE
 				rs1.close();
@@ -1487,6 +1831,11 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
 				errString = itmDBAccessEJB.getErrorString("","VTNOREC1","","",conn);
 			}//end by jaimin 23/08/07 requst-ID :DI78DIS028
 		}//End by jaimin 31/08/2007 requst-ID :DI78DIS028
+		
+		retTabSepStrBuff.append("</Header0>");
+		retTabSepStrBuff.append("</group0>");
+		retTabSepStrBuff.append("</DocumentRoot>");
+		
 		System.out.println("retTabSepStrBuff:::["+retTabSepStrBuff.toString()+"]");
 		System.out.println("#####Counter"+count);
 			//end of outer else if