Commit 3667c128 authored by kdabholkar's avatar kdabholkar

added queries to include ISD transaction in GSTR3B report

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@187431 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 06f2ccd0
......@@ -763,12 +763,76 @@ public class GenerateGSTR3BPrc extends ProcessEJB implements GenerateGSTR3BPrcLo
System.out.println("ISRC ITC avilable END");
}
{
System.out.println("ISD ITC avilable START");
System.out.println("!!!!!!!!!!!!!!No inforamtion to identify data!!!!!!!!!!!!!!");
/***Added by Kausubh on 19 june 2018 start to fetch ISD data start *******/
System.out.println("ISD ITC avilable");
sql = " SELECT SUM(GDD.IGST_AMT) AS IGST_AMT, SUM(GDD.CGST_AMT) AS CGST_AMT, SUM(GDD.SGST_AMT) AS SGST_AMT, SUM(GDD.CESS_AMT) AS CESS_AMT"
+ " FROM GST_DATA_HDR GDH, GST_DATA_DET GDD"
+ " WHERE GDH.TRAN_ID = GDD.TRAN_ID AND GDH.SITE_CODE = ? AND GDH.PRD_CODE = ? AND GDH.REC_TYPE = ?"
+ " AND GDH.TRAN_TYPE IN ('33')";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, loginSiteCode);
pstmt.setString(2, prdCode);
pstmt.setString(3, "2");
rs = pstmt.executeQuery();
System.out.println("ISD ITC avilable END");
if(rs.next())
{
isDataFound = true;
igstAmt = rs.getDouble("IGST_AMT");
cgstAmt = rs.getDouble("CGST_AMT");
sgstAmt = rs.getDouble("SGST_AMT");
cessAmt = rs.getDouble("CESS_AMT");
}
if(rs!=null)
{
rs.close();
rs=null;
}
if(pstmt!=null)
{
pstmt.close();
pstmt=null;
}
if(isDataFound)
{
headerDataHMap.clear();
headerDataHMap.put("prd_code", prdCode);
headerDataHMap.put("tran_type", "12");
headerDataHMap.put("gst_type", "E");
detailDataHMap.clear();
detailDataHMap.put("itc_type", "IC");
detailDataHMap.put("igst_amt", igstAmt);
detailDataHMap.put("cgst_amt", cgstAmt);
detailDataHMap.put("sgst_amt", sgstAmt);
detailDataHMap.put("cess_amt", cessAmt);
detailDataList.clear();
detailDataList.add(detailDataHMap);
insertGSTHdrDetData(headerDataHMap, detailDataList, xtraParams, conn);
System.out.println("end process of ISD ITC avilable ");
isDataFound = false;
taxableAmt = 0.0; igstAmt = 0.0; cgstAmt = 0.0; sgstAmt = 0.0; cessAmt = 0.0;
}
else
{
System.out.println("No data found for GSTR3B trantype [12]");
}
System.out.println("ISRC ITC avilable END");
/***Added by Kausubh on 19 june 2018 start to fetch ISD data end *******/
}
{
System.out.println("RUL ITC avilable START");
......
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