solve net_amount problem

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

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

@@ -642,7 +642,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.DESP_DATE,C.CUST_CODE,C.GP_NO,C.GP_DATE,DDF_GET_SUNDRY_DETAILS(D.CUST_TYPE,D.CUST_CODE) as CITY,C.SITE_CODE,C.TOT_VALUE as AMOUNT "
+										+"D.CUST_NAME,C.DESP_DATE,C.CUST_CODE,C.GP_NO,C.GP_DATE," +
+										"DDF_GET_SUNDRY_DETAILS(D.CUST_TYPE,D.CUST_CODE) as CITY,C.SITE_CODE,C.TOT_VALUE as AMOUNT "
 										+" FROM TAX B,TAXTRAN A,DESPATCH C,CUSTOMER D "
 										+" WHERE ( A.TAX_CODE = B.TAX_CODE ) and ( A.TRAN_ID = C.DESP_ID ) "
 										+" and ( C.CUST_CODE = D.CUST_CODE ) and "
@@ -682,7 +683,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"
+							+" 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 TAXTRAN,TAX,SUPPLIER,VOUCHER WHERE "
 							+"( TAX.TAX_CODE = TAXTRAN.TAX_CODE ) AND ( VOUCHER.SUPP_CODE = SUPPLIER.SUPP_CODE ) AND "
 							+" ( TAXTRAN.TRAN_ID = VOUCHER.TRAN_ID ) AND ( ( TAXTRAN.TRAN_CODE = ? ) AND ( VOUCHER.SITE_CODE = ? )"
@@ -1095,8 +1097,22 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
 						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("<net_amount>").append("<![CDATA[" +(rs1.getString("NET_AMT")) +"]]>").append("</net_amount>");
+						
+						
+						//retTabSepStrBuff.append("<net_amount>").append("<![CDATA[" +(rs1.getString("NET_AMT")) +"]]>").append("</net_amount>");
 						//chandrakant Finish
+						if( refSer.equals("S-RET") ||  refSer.equals("D-RCP") ||  refSer.equals("D-ISS") ||  refSer.equals("S-INV") ||  refSer.equals("VOUCH") ||  refSer.equals("M-VOUCH") )
+						{
+							retTabSepStrBuff.append("<net_amount>").append("<![CDATA[" +(rs1.getString("NET_AMT")) +"]]>").append("</net_amount>");
+						}
+						else if( refSer.equals("P-RCP") ||  refSer.equals("P-RET") )
+						{
+							retTabSepStrBuff.append("<net_amount>").append("<![CDATA[" +(rs1.getString("TOT_AMT")) +"]]>").append("</net_amount>");
+						}
+						else if( refSer.equals("S-DSP") )
+						{
+							retTabSepStrBuff.append("<net_amount>").append("<![CDATA[" +(rs1.getString("amount")) +"]]>").append("</net_amount>");
+						}
 						
 						//TAX_FORM
 						//retTabSepStrBuff.append((rs1.getString(5)==null?" ":rs1.getString(5))).append("\t");
@@ -1635,10 +1651,6 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
 						}
 					}
 						
-
-					
-					
-					
 					
 					//sundry_code  // //sundry_name
 					if( refSer.equals("S-RET") ||  refSer.equals("S-DSP") ||  refSer.equals("S-INV"))
@@ -1679,7 +1691,21 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
 				    //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>");
+					//retTabSepStrBuff.append("<net_amount>").append("<![CDATA[" +(rs1.getString("NET_AMT")) +"]]>").append("</net_amount>");
+					
+					if( refSer.equals("S-RET") ||  refSer.equals("D-RCP") ||  refSer.equals("D-ISS") ||  refSer.equals("S-INV") ||  refSer.equals("VOUCH") ||  refSer.equals("M-VOUCH") )
+					{
+						retTabSepStrBuff.append("<net_amount>").append("<![CDATA[" +(rs1.getString("NET_AMT")) +"]]>").append("</net_amount>");
+					}
+					else if( refSer.equals("P-RCP") ||  refSer.equals("P-RET") )
+					{
+						retTabSepStrBuff.append("<net_amount>").append("<![CDATA[" +(rs1.getString("TOT_AMT")) +"]]>").append("</net_amount>");
+					}
+					else if( refSer.equals("S-DSP") )
+					{
+						retTabSepStrBuff.append("<net_amount>").append("<![CDATA[" +(rs1.getString("amount")) +"]]>").append("</net_amount>");
+					}
+					
 					//TAX_FORM
 					retTabSepStrBuff.append("<tax_form>").append("<![CDATA[" +( rs1.getString("tax_form")) +"]]>").append("</tax_form>");
 					//TAX_FORM_DATE