Skip to content

B
business-java
Commit ab16cb9a authored by kdabholkar's avatar kdabholkar
Browse files
Options

commited to add new changes of GSTR1 and GSTR2 data queries. 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@106624 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 3a8fccd3
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 106 deletions
webitm-gst-client/ibase/webitm/ejb/gstclient/GstDataPrc.java
View file @ ab16cb9a
......@@ -2,6 +2,7 @@ package ibase.webitm.ejb.gstclient;
import ibase.system.config.ConnDriver;
import ibase.utility.CommonConstants;
//import ibase.utility.E12GenericUtility;
import ibase.utility.E12GenericUtility;
//import ibase.utility.GenericUtility;
import ibase.webitm.ejb.ITMDBAccessEJB;
......@@ -230,26 +231,6 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
cal.set(year,month,00); //to set end date of entered period
toDate = Timestamp.valueOf(genericUtility.getValidDateString( sdf.format(cal.getTime()) , genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");;
fromdateOracle= java.sql.Timestamp.valueOf(genericUtility.getValidDateString(sdf.format(cal.getTime()), genericUtility.getDBDateTimeFormat()));
todateOracle = java.sql.Timestamp.valueOf(genericUtility.getValidDateString(sdf.format(cal.getTime()), genericUtility.getDBDateTimeFormat()));
System.out.println("fromdateOracle"+ fromdateOracle);
System.out.println("todateOracle"+ todateOracle);
fromDateOrcle= formatter.format(fromDate);
System.out.println("fromdateOracle"+fromDateOrcle);
toDateOrcle= formatter.format(toDate);
System.out.println("toDateOrcle"+toDateOrcle);
}
System.out.println("From Date["+fromDate+"] To Date["+toDate+"] Period Code["+prdcode+"]");
......@@ -545,6 +526,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
+" '' as REMARKS ,"
// +" 'ig' as ITC_TYPE , "
/*added by kaustubh on 19 july 2017*/
+"fn_get_gst_rate('S-INV',i.invoice_id, it.line_no) as gst_rate "
......@@ -1652,7 +1634,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*changed by kaustubh on 19-07-2017*/
/*+" and si.site_code = i.site_code "
+" and si.item_code = it.item_code "*/
+" and item.item_code = it.item_code "
+" and item.item_code = it.item_code ";
/*changed by kaustubh on 19-07-2017*/
/* +" and t.tax_code = tx.tax_code "
......@@ -1660,8 +1642,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" and tx.tran_code = 'S-INV' "
+" and tx.tran_id = i.invoice_id ";*/
/*changed by kaustubh on 21-07-2017 / 3 aug*/
+"and (select count(1) from taxtran ti, tax tx where tx.tax_code = ti.tax_code "
/*changed by kaustubh on 21-07-2017*/
/*+"and (select count(1) from taxtran ti, tax tx where tx.tax_code = ti.tax_code "
+"and ti.tran_code = 'S-INV' "
+"and ti.tran_id = i.invoice_id "
+"and tx.tax_type in ('G','H','I','J')" ;
......@@ -3128,8 +3110,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*+" to_date(i.GP_DATE) as TRAN_DATE, "*/
/*+" to_date(case when i.GP_DATE is null then i.tran_date else i.GP_DATE end) as TRAN_DATE, " commented by kaustubh on 25 july 2017*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
/* +" to_char(i.GP_DATE,'MMYYYY') as PRD_CODE, "*/
/* if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
......@@ -6037,7 +6018,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" ' ' as ORDER_NO,"
// +" null as ORDER_DATE, " commented by kaustubh 27 july 2017
//+" i.invoice_id as REMARKS, "
+" s.site_code as REMARKS, "
+" '' as REMARKS, "
+" i.invoice_id as REF_ID, "
+" ' ' as SUBMIT_STATUS, "
// +" null SUBMIT_DATE, " commented by kaustubh 27 july 2017
......@@ -12811,14 +12792,12 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
gstDataSink = distCommon.getDisparams("999999", "GST_DATA_SYNC", connGST);
System.out.println("GST_DATA_SYNC ["+gstDataSink+"]");
System.out.println("retString today"+ retString);
if(("NULLFOUND".equals(gstDataSink) || gstDataSink == null || gstDataSink.trim().length() == 0))
{
System.out.println("GST_DATA_SYNC not found or blank");
}
else if("Y".equalsIgnoreCase(gstDataSink))
// else if ("Y".equalsIgnoreCase(gstDataSink) && (retString == null || retString.trim().length() == 0))
else if("Y".equalsIgnoreCase(gstDataSink))
{
GetGstTableData gstDataSinkObj = new GetGstTableData();
retString = gstDataSinkObj.getGstTableData("", xtraParams, "" ,connGST);
......@@ -12890,8 +12869,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
//connLocal.rollback();
connGST.rollback();
//retString = itmDBAccessEJB.getErrorString("","VTPRCESERR","","",connLocal);
retString = itmDBAccessEJB.getErrorString("","VTPRCESERR","","",connGST);
//retString = getError(errorMessage.toString(),"PRCSUCCESS",connGST);
//retString = itmDBAccessEJB.getErrorString("","VTPRCESERR","","",connGST);
retString = getError(errorMessage.toString(),"PRCSUCCESS",connGST);
}
if(!isError)
{
......@@ -13074,6 +13053,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
public String executeSqlAndPopulateData (String hdrSql, String dtlSql, String tranSer) throws Exception
{
System.out.println("TODAY");
String retString = "";
PreparedStatement pstmt = null,pstmtInsHdr = null,pstmtInsDet = null, pstmtSelHdr = null,pstmtSelDet = null;
......@@ -13090,7 +13070,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
lineType = "",gsCode = "",gsDescr = "",unit = "",supplyType = "",remarksDet = "",distOrdTranID = "",
tranIDPorcp = "",gstType = "",remarksHdr = "", refID = "", itctype= "" ;
int srNoOld = 0;
String prdCodeGstHdr ="";
String prdCodeGstHdr ;
String prdCodenew = "";
......@@ -13111,8 +13091,6 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
double amount = 0, taxableAmt = 0, igstPerc = 0, igstAmt = 0, cgstPerc = 0, cgstAmt = 0, sgstPerc= 0,sgstAmt = 0,quantity = 0,
cessPerc = 0,cessAmt = 0,gstRate = 0;
boolean isError = false;
try
{
System.out.println("\n\n\n XXXXXXXXXXXXXXXXXXXX Started Populating ["+tranSer+"] Data XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX ");
......@@ -13137,10 +13115,12 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* String prdCodenew= new GenericUtility().getValidDateString("", new GenericUtility().getDBDateFormat(), "MMYYYY");
System.out.println("prdCodenew"+prdCodenew);*/
sql = " INSERT INTO GST_DATA_HDR(TRAN_ID,TRAN_DATE,TRAN_ID__REF,SITE_CODE,PRD_CODE,REC_TYPE,GST_TYPE,TRAN_TYPE,CUST_CODE,CUST_NAME,"
+ " GST_CODE,SUBMISSION_TYPE,DOC_CHECKSUM,DOC_TYPE,DOC_NO,DOC_DATE,AMOUNT,REVERSE_CHRG,LR_NO,LR_DATE,REAS_CODE,"
+ " REF_ID__INV,REF_DATE__INV,PROV_ASSMNT,ORDER_NO,REMARKS,SUBMIT_STATUS,ADD_USER,ADD_DATE,"
......@@ -13156,52 +13136,15 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
sql = hdrSql;
pstmtSelHdr = connGST.prepareStatement(sql);
/*if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
pstmtSelHdr.setTimestamp(1, fromDate);
pstmtSelHdr.setTimestamp(2, toDate);
}
else
{
System.out.println("fromDateOrcle IN exe::"+fromDateOrcle);
System.out.println("toDateOrcle in exe::"+toDateOrcle);
String startDateFrm = fromDateOrcle;
String endDateFrm = toDateOrcle;
java.sql.Date dateStart = java.sql.Date.valueOf(startDateFrm);
java.sql.Date dateEnd = java.sql.Date.valueOf(endDateFrm);
pstmtSelHdr.setDate(1, dateStart);
pstmtSelHdr.setDate(2, dateEnd);
//pstmtSelHdr.setString(1, fromDateOrcle);
//pstmtSelHdr.setString(2, toDateOrcle);
System.out.println("Date Set.......................XXXXXXXXXXXXXx");
}
*/
pstmtSelHdr.setTimestamp(1, fromDate);
pstmtSelHdr.setTimestamp(2, toDate);
/* pstmtSelHdr.setTimestamp(1, fromDate);
pstmtSelHdr.setTimestamp(2, toDate);
*/
System.out.println();
System.out.println("pstmtSelHdr"+pstmtSelHdr);
if("9A(1)".equals(tranSer))
{
pstmtSelHdr.setTimestamp(3, currMonthStartDate);
}
rsSelHdr = pstmtSelHdr.executeQuery();
while(rsSelHdr.next())
{
updCnt = 0;
......@@ -13404,17 +13347,19 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
cessPerc = rsSelDet.getDouble("CESS_PERC");
cessAmt = rsSelDet.getDouble("CESS_AMT");
remarksDet = rsSelDet.getString("REMARKS");
/*added by kaustubh on 8 aug*/
itctype=rsSelDet.getString("ITC_TYPE");
/* commented by kaustubh on 21 july 2017*/
gstRate = rsSelDet.getDouble("GST_RATE");
/*added by kaustubh on 8 aug*/
itctype=rsSelDet.getString("ITC_TYPE");
if(gstRate == 0){
itctype="no";
}
System.out.println("itctype"+ itctype);
int newgsDescr= gsDescr.length();
System.out.println("length of string "+newgsDescr);
......@@ -13489,7 +13434,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
System.out.println(" DetailCnt["+detCnts+"] Detail Executed["+arrSum+"]");*/
}
if(rsSelHdr!=null)
{
rsSelHdr.close();rsSelHdr = null;
......@@ -13529,10 +13474,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
pstmtInsDet.close();pstmtInsDet = null;
}
System.out.println("HeaderCnt ["+hdrCnts+"] Header Executed ["+hdrSum+"] \n DetailCnt["+detCnts+"] Detail Executed["+detSum+"]");
System.out.println("HeaderCnt ["+hdrCnts+"] Header Executed ["+hdrSum+"] \n DetailCnt["+detCnts+"] Detail Executed["+detSum+"]");
System.out.println("XXXXXXXXXXXXXXXXXXXX Completed Populating ["+tranSer+"] Data XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX");
}
System.out.println("XXXXXXXXXXXXXXXXXXXX Completed Populating ["+tranSer+"] Data XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX");
}
catch(BatchUpdateException buex)
{
......@@ -13544,10 +13488,10 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
buex.printStackTrace();
int [] updateCounts = buex.getUpdateCounts();
for (int i = 0; i < updateCounts.length; i++)
/*for (int i = 0; i < updateCounts.length; i++) commmeneted by kaustubh on 3 aug 2017
{
System.err.println(" Statement " + i + ":" + updateCounts[i]);
}
}*/
System.err.println(" Message: " + buex.getMessage());
System.err.println(" SQLSTATE: " + buex.getSQLState());
System.err.println(" Error code: " + buex.getErrorCode());
......@@ -13572,7 +13516,6 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
catch(Exception e)
{
isError = true;
e.printStackTrace();
System.out.println("Inside Exception executeSqlAndPopulateData==>=="+e.getMessage());
errorMessage.append("\nSection ["+tranSer+"] ["+e.getMessage()+"]");
......@@ -13580,7 +13523,6 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
finally
{
System.out.println("Inside finally isError["+isError+"] connStatus[]");
try
{
if(rs != null)
......@@ -13615,33 +13557,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
{
rsSelDet.close();rsSelDet = null;
}
if(isError)
{
System.out.println("GstDataPrc connection RollBack.....");
//connLocal.rollback();
connGST.rollback();
//retString = itmDBAccessEJB.getErrorString("","VTPRCESERR","","",connLocal);
//retString = itmDBAccessEJB.getErrorString("","VTPRCESERR","","",connGST);
retString = getError(errorMessage.toString(),"VTPRCESERR",connGST);
System.out.println("IS ERROR TRUE "+retString);
}
if(!isError)
{
System.out.println("GstDataPrc connection Commit.....");
//connLocal.commit();//Temporary commented
//connLocal.rollback();
connGST.commit();
//retString = itmDBAccessEJB.getErrorString("","PRCSUCCESS","","",connLocal);
//retString = itmDBAccessEJB.getErrorString("","PRCSUCCESS","","",connGST);
retString = getError(errorMessage.toString(),"PRCSUCCESS",connGST);
System.out.println("IS ERROR FALSE "+retString);
}
}
catch(Exception ex)
{
ex.printStackTrace();
System.out.println("Inside finally executeSqlAndPopulateData==>"+ex.getMessage());
}
}
......
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