solve tran date

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

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

@@ -540,7 +540,8 @@ 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,C.CUST_NAME,S.TRAN_DATE,S.CUST_CODE,"
-									+"S.EXCISE_REF_NO,S.EXCISE_REF_DATE,DDF_GET_SUNDRY_DETAILS(C.CUST_TYPE,C.CUST_CODE) as CITY,S.SITE_CODE,S.NET_AMT  FROM TAXTRAN T,"  
+									+"S.EXCISE_REF_NO,S.EXCISE_REF_DATE,DDF_GET_SUNDRY_DETAILS(C.CUST_TYPE,C.CUST_CODE) as CITY,S.SITE_CODE,S.NET_AMT " +
+									" FROM TAXTRAN T,"  
 									+ "TAX T1,CUSTOMER C,SRETURN S "
 									+ "WHERE ( T1.TAX_CODE = T.TAX_CODE ) and ( C.CUST_CODE = S.CUST_CODE ) "
 									+"and ( T.TRAN_ID = S.TRAN_ID ) and ( ( T.TRAN_CODE = ? ) "
@@ -601,8 +602,10 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
 						else if( refSer.equals("D-RCP"))
 						{        
 		                
-						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,case when D.sundry_type = 'O' then '0' else  "  +"fn_get_sundry(A.TRAN_CODE,C.dist_order,'N') end as  sundry_name,C.TRAN_DATE,"
+						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,case when D.sundry_type = 'O' then '0' else  " 
+						+"fn_get_sundry(A.TRAN_CODE,C.dist_order,'N') end as  sundry_name,C.TRAN_DATE,"
 						+"case when D.sundry_type = 'O' "
 						+" then '0' else fn_get_sundry(A.TRAN_CODE,C.dist_order,'C') end as sundry_code,C.GP_NO,C.GP_DATE," 
 						+" DDF_GET_SUNDRY_DETAILS(D.SUNDRY_TYPE,D.SUNDRY_CODE) as CITY,D.SITE_CODE, D.NET_AMT FROM TAXTRAN A,TAX B,DISTORD_RCP C,DISTORDER D "  
@@ -622,7 +625,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,case when D.sundry_type = 'O'  then '0' else " +"fn_get_sundry(A.TRAN_CODE,C.dist_order,'N')  end as sundry_name,C.TRAN_DATE,"
+										+"sum( A.TAX_AMT ) as tax_amt,case when D.sundry_type = 'O'  then '0' else "
+										+"fn_get_sundry(A.TRAN_CODE,C.dist_order,'N')  end as sundry_name,C.TRAN_DATE,"
 										+"case when D.sundry_type = 'O' then '0' else fn_get_sundry(A.TRAN_CODE,C.dist_order,'C') "
 										+"end as sundry_code,C.GP_NO,C.GP_DATE,DDF_GET_SUNDRY_DETAILS(D.SUNDRY_TYPE,D.SUNDRY_CODE) as CITY,D.SITE_CODE, D.NET_AMT " 
 										+" FROM TAXTRAN A,TAX B,DISTORD_ISS C,DISTORDER D WHERE ( B.TAX_CODE = A.TAX_CODE ) and " 
@@ -969,6 +973,19 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
 							retTabSepStrBuff.append("<tran_id>").append("<![CDATA[" +(rs1.getString("TRAN_ID")) +"]]>").append("</tran_id>");
 						}
 						*/
+						if(refSer.equalsIgnoreCase("S-DSP"))  // DESP_DATE
+						{
+							if(rs1.getTimestamp("DESP_DATE")!=null)
+				            {
+								retTabSepStrBuff.append("<tran_date>").append("<![CDATA[" +(this.genericUtility.getValidDateString(rs1.getTimestamp("DESP_DATE").toString(),this.genericUtility.getDBDateFormat(),this.genericUtility.getApplDateFormat())) +"]]>").append("</tran_date>");
+				            }
+							else
+							{
+								retTabSepStrBuff.append("<tran_date>").append(" ").append("</tran_date>");
+							}
+						}
+						else
+						{
 						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>");
@@ -977,7 +994,7 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
 						{
 							retTabSepStrBuff.append("<tran_date>").append(" ").append("</tran_date>");
 						}
-						
+						}
 						//EXCISE_REF_NO	  ////EXCISE_REF_DATE
 					if( refSer.equals("S-RET"))
 					{
@@ -1568,6 +1585,20 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
 					//LINE_NO
 					retTabSepStrBuff.append("<line_no>").append("0").append("</line_no>");
 					//TRANDATE
+					
+					if(refSer.equalsIgnoreCase("S-DSP"))  // DESP_DATE
+					{
+						if(rs1.getTimestamp("DESP_DATE")!=null)
+			            {
+							retTabSepStrBuff.append("<tran_date>").append("<![CDATA[" +(this.genericUtility.getValidDateString(rs1.getTimestamp("DESP_DATE").toString(),this.genericUtility.getDBDateFormat(),this.genericUtility.getApplDateFormat())) +"]]>").append("</tran_date>");
+			            }
+						else
+						{
+							retTabSepStrBuff.append("<tran_date>").append(" ").append("</tran_date>");
+						}
+					}
+					else
+					{
 					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>");
@@ -1576,6 +1607,7 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
 					{
 						retTabSepStrBuff.append("<tran_date>").append(" ").append("</tran_date>");
 					}
+					}
 					
 					/*
 					//EXCISE_REF_NO