commited chnages of compostion in gstr2 data

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

webitm-gst-client/ibase/webitm/ejb/gstclient/GstDataPrc.java

@@ -8453,7 +8453,6 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 				GST_IMPGDSEZ_TAXENV= "'"+GST_IMPGDSEZ_TAXENV+"'";
 
 
-
 				GST_PURSEZWP_TAXENV=GST_PURSEZWP_TAXENV.replace(",", "','");
 				GST_PURSEZWP_TAXENV= "'"+GST_PURSEZWP_TAXENV+"'";
 
@@ -8776,10 +8775,12 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							}
 							dtlSql = dtlSql 
 			
-							+" item.descr as GS_DESCR," 
-							+" item.UNIT as UNIT,"
-							+" (it.quantity) as QUANTITY,"
-							+" 'OE' as SUPPLY_TYPE," ;// -- E/OE (Ecom/Other than Ecom)
+						//	+" item.descr as GS_DESCR," 
+							+" accounts.sac_no as GS_DESCR, "		
+						//	+" item.UNIT as UNIT,"
+							+" 'NA' as UNIT, "
+							+" (it.quantity) as QUANTITY, "
+							+" 'OE' as SUPPLY_TYPE, " ;// -- E/OE (Ecom/Other than Ecom)
 			
 							if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))    
 							{
@@ -8796,9 +8797,11 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							+" '' as REMARKS ,"
 							+" 'is' as ITC_TYPE , "
 							+"fn_get_gst_rate('M-VOUC',i.tran_id, it.line_no) as gst_rate "
-							+" from misc_voucher i,misc_vouchdet it, item item "
+					//		+" from misc_voucher i,misc_vouchdet it, item item "
+							+" from misc_voucher i,misc_vouchdet it,accounts "
 							+" where i.tran_id = it.tran_id "
-							+" and item.item_code = it.item_code "
+					//		+" and item.item_code = it.item_code "
+							+"and accounts.acct_code=it.acct_code "
 							+"and (select count(1) from taxtran ti, tax tx where tx.tax_code = ti.tax_code "
 							+"and ti.tran_code = 'M-VOUC' "
 							+"and ti.tran_id = i.tran_id  " 
@@ -11766,6 +11769,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 						+" and s.site_code = i.site_code "
 						+" and state.state_code = c.STATE_CODE"
 						+" and c.tax_reg_2 <> 'UNREGISTER' "
+						+" and c.SUPP_SPECIFIC__TAX='C' "
 						+" and (select count(1) from taxtran ti , tax tm where ti.tran_code = 'VOUCH' and ti.tran_id = i.tran_id ";
 						if(GST_COMP_TAXCLASS.length() > 0)
 						{
@@ -11933,6 +11937,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 						+" and s.site_code = i.site_code "
 						+" and state.state_code = c.STATE_CODE"
 						+" and c.tax_reg_2 <> 'UNREGISTER' "
+						+" and c.SUPP_SPECIFIC__TAX='C' "
 						+" and (select count(1) from taxtran ti , tax tm where ti.tran_code = 'VOUCH' and ti.tran_id = i.tran_id ";
 						if(GST_PUREXE_TAXCLASS.length() > 0)
 						{
@@ -14406,7 +14411,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							cgstAmt = rsSelDet.getDouble("CGST_AMT");
 							sgstPerc = rsSelDet.getDouble("SGST_PERC");
 							sgstAmt = rsSelDet.getDouble("SGST_AMT");
-							gsDescr = rsSelDet.getString("GS_DESCR");
+							gsDescr = checkNull(rsSelDet.getString("GS_DESCR"));
 							unit = rsSelDet.getString("UNIT");
 							quantity = rsSelDet.getDouble("QUANTITY");
 							supplyType = rsSelDet.getString("SUPPLY_TYPE");
@@ -14569,14 +14574,14 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 			{
 				e.printStackTrace();
 			}
-			//throw new ITMException(buex);
+			throw new ITMException(buex);
         }
 		catch(Exception e)
 		{
 			e.printStackTrace();
 			System.out.println("Inside Exception executeSqlAndPopulateData==>=="+e.getMessage());
 			errorMessage.append("\nSection ["+tranSer+"] ["+e.getMessage()+"]");
-			//throw new Exception();
+			throw new ITMException(e);
 		}
 		finally
 		{