Skip to content

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

Commit needful changes to avoid duplicate values in Offline download Sheet. 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@186467 ce508802-f39f-4f6c-b175-0d175dae99d5
parent b6fa9c94
Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 74 deletions
webitm-gst/ibase/webitm/ejb/gst/GSTRWebServiceDao.java
View file @ 51c9350e
package ibase.webitm.ejb.gst; package ibase.webitm.ejb.gst;
import ibase.webitm.ejb.ITMDBAccessEJB;
import ibase.webitm.ejb.ValidatorEJB; import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import java.sql.Connection; import java.sql.Connection;
...@@ -31,6 +32,9 @@ public class GSTRWebServiceDao extends ValidatorEJB { ...@@ -31,6 +32,9 @@ public class GSTRWebServiceDao extends ValidatorEJB {
double sgstpercDet,itcsgstDet,sgstamtDet,srnoOldDet,itcigstDet,igstamtDet,cesspercDet,itccessDet,itccgstDet; double sgstpercDet,itcsgstDet,sgstamtDet,srnoOldDet,itcigstDet,igstamtDet,cesspercDet,itccessDet,itccgstDet;
double gstrateDet,cgstpercDet,quantityDet,cessamtDet,igstpercDet,cgstamtDet,taxableamtDet,linenoDet; double gstrateDet,cgstpercDet,quantityDet,cessamtDet,igstpercDet,cgstamtDet,taxableamtDet,linenoDet;
String gsdescrDet,unitDet,supptypeDet,remarksDet,itctypeDet; String gsdescrDet,unitDet,supptypeDet,remarksDet,itctypeDet;
String sql;
int dataCount = 0;
boolean isError=false; boolean isError=false;
...@@ -67,13 +71,122 @@ public class GSTRWebServiceDao extends ValidatorEJB { ...@@ -67,13 +71,122 @@ public class GSTRWebServiceDao extends ValidatorEJB {
JSONObject gstDataObj = new JSONObject(test); JSONObject gstDataObj = new JSONObject(test);
/**Added by kaustubh on 7 june 2018 start*/
JSONObject suppParam = gstDataObj.getJSONObject("suppParam");
System.out.println("data json value"+suppParam);
String fromDate = suppParam.getString ("fromDate");
String toDate= suppParam.getString("toDate");
String type= suppParam.getString("type");
String sitecode =suppParam.getString("sitecode");
Timestamp fromDateNew = null,todateNew = null;
if(fromDate != null && fromDate.trim().length() > 0)
{
fromDateNew = Timestamp.valueOf(genericUtility.getValidDateString( fromDate , genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
}
if(toDate != null && toDate.trim().length() > 0)
{
todateNew = Timestamp.valueOf(genericUtility.getValidDateString( toDate , genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
}
System.out.println("fromDate In Dao["+fromDate+"toDate"+toDate+"type["+type+"]"+"sitecode["+sitecode+"]");
sql = "SELECT COUNT(1) AS CNT FROM gst_data_hdr WHERE tran_date between ? and ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setTimestamp(1, fromDateNew);
pstmt.setTimestamp(2,todateNew);
rs = pstmt.executeQuery();
while(rs.next())
{
dataCount = rs.getInt("CNT");
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(rs!=null)
{
rs.close();
rs = null;
}
System.out.println("datacount"+dataCount);
if (dataCount > 0)
{
sql="delete from gst_data_det where tran_id in " +
"(select tran_id from gst_data_hdr where rec_type= ? and site_code= ? and CHG_DATE between ? and ? )";
pstmt = conn.prepareStatement(sql);
if ("S".equalsIgnoreCase(type))
{
pstmt.setInt(1, 1);
}
else if("P".equalsIgnoreCase(type))
{
pstmt.setInt(1, 2);
}
pstmt.setString(2,sitecode);
pstmt.setTimestamp(3,fromDateNew);
pstmt.setTimestamp(4,todateNew);
int detCount = pstmt.executeUpdate();
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
System.out.println("No of Detail Records Deleted ::"+detCount);
sql = "delete FROM GST_DATA_HDR WHERE rec_type= ? and site_code= ? and CHG_DATE between ? and ? " ;
pstmt = conn.prepareStatement(sql);
if ("S".equalsIgnoreCase(type))
{
pstmt.setInt(1, 1);
}
else if("P".equalsIgnoreCase(type))
{
pstmt.setInt(1, 2);
}
pstmt.setString(2,sitecode);
pstmt.setTimestamp(3,fromDateNew);
pstmt.setTimestamp(4,todateNew);
int hdrCount = pstmt.executeUpdate();
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
System.out.println("No of records deleted from header table ::"+hdrCount);
}
/**Added by kaustubh on 7 june 2018 start*/
System.out.println("json data"+gstDataObj); System.out.println("json data"+gstDataObj);
JSONObject dataObj =gstDataObj.getJSONObject("data"); JSONObject dataObj =gstDataObj.getJSONObject("data");
System.out.println("data json value"+dataObj); System.out.println("data json value"+dataObj);
JSONArray hdr = dataObj.getJSONArray("hdr"); JSONArray hdr = dataObj.getJSONArray("hdr");
for(int i=0;i<hdr.length();i++) for(int i=0;i<hdr.length();i++)
{ {
JSONObject obj = hdr.getJSONObject(i); JSONObject obj = hdr.getJSONObject(i);
...@@ -127,47 +240,7 @@ public class GSTRWebServiceDao extends ValidatorEJB { ...@@ -127,47 +240,7 @@ public class GSTRWebServiceDao extends ValidatorEJB {
gstCode=obj.getString("gstcode"); gstCode=obj.getString("gstcode");
gstType=obj.getString("gsttype"); gstType=obj.getString("gsttype");
refId=obj.getString("refid"); refId=obj.getString("refid");
System.out.println("values is "+tranID);
System.out.println("tranDate is "+tranDate);
System.out.println("tranIdRef is "+tranIdRef);
System.out.println("siteCode is "+siteCode);
System.out.println("prdCode is "+prdCode);
System.out.println("recType is "+recType);
System.out.println("tranType is "+tranType);
System.out.println("custCode is "+custCode);
System.out.println("subType is "+subType);
System.out.println("docCheckSum is "+docCheckSum);
System.out.println("docType is "+docType);
System.out.println("docNum is "+docNum);
System.out.println("docDate is "+docDate);
System.out.println("amt is "+amt);
System.out.println("revCharge is "+revCharge);
System.out.println("lrNo is "+lrNo);
System.out.println("lrDate is "+lrDate);
System.out.println("reasCode is "+reasCode);
System.out.println("refIdInv is "+refIdInv);
System.out.println("provAssmnt is "+provAssmnt);
System.out.println("ordNo is "+ordNo);
System.out.println("ordDate is "+ordDate);
System.out.println("remarks is "+remarks);
System.out.println("subStatus is "+subStatus);
System.out.println("subDate is "+subDate);
System.out.println("addUser is "+addUser);
System.out.println("addDate is "+addDate);
System.out.println("addTerm is "+addTerm);
System.out.println("chgUser is "+chgUser);
System.out.println("chgDate is "+chgDate);
System.out.println("chgTerm is "+chgTerm);
System.out.println("taxRegNo is "+taxRegNo);
System.out.println("recoStatus is "+recoStatus);
System.out.println("ecomRegNo is "+ecomRegNo);
System.out.println("refSer is "+refSer);
System.out.println("gstCode is "+gstCode);
System.out.println("gstType is "+gstType);
System.out.println("refID is "+tranID);
checkTaxNo="select COUNT(*) from gst_registration where gst_no=?"; checkTaxNo="select COUNT(*) from gst_registration where gst_no=?";
pstmt2 = conn.prepareStatement(checkTaxNo); pstmt2 = conn.prepareStatement(checkTaxNo);
...@@ -340,34 +413,7 @@ public class GSTRWebServiceDao extends ValidatorEJB { ...@@ -340,34 +413,7 @@ public class GSTRWebServiceDao extends ValidatorEJB {
itcsgstDet=obj1.getDouble("itcsgst"); itcsgstDet=obj1.getDouble("itcsgst");
itccessDet=obj1.getDouble("itccess"); itccessDet=obj1.getDouble("itccess");
gstrateDet=obj1.getDouble("gstrate"); gstrateDet=obj1.getDouble("gstrate");
System.out.println("tranIII"+tranIDDet);
System.out.println("linenoDet"+linenoDet);
System.out.println("statusDet"+statusDet);
System.out.println("srnoOldDet"+srnoOldDet);
System.out.println("lineTypeDet"+lineTypeDet);
System.out.println("gscodeDet"+gscodeDet);
System.out.println("taxableamtDet"+taxableamtDet);
System.out.println("igstpercDet"+igstpercDet);
System.out.println("igstamtDet"+igstamtDet);
System.out.println("cgstpercDet"+cgstpercDet);
System.out.println("cgstamtDet"+cgstamtDet);
System.out.println("sgstpercDet"+sgstpercDet);
System.out.println("sgstamtDet"+sgstamtDet);
System.out.println("gsdescrDet"+gsdescrDet);
System.out.println("unitDet"+unitDet);
System.out.println("quantityDet"+quantityDet);
System.out.println("supptypeDet"+supptypeDet);
System.out.println("cesspercDet"+cesspercDet);
System.out.println("cessamtDet"+cessamtDet);
System.out.println("remarksDet"+remarksDet);
System.out.println("itctypeDet"+itctypeDet);
System.out.println("itcigstDet"+itcigstDet);
System.out.println("itccgstDet"+itccgstDet);
System.out.println("itcsgstDet"+itcsgstDet);
System.out.println("itccessDet"+itccessDet);
System.out.println("gstrateDet"+gstrateDet);
pstmt1.setString(1,tranIDDet); pstmt1.setString(1,tranIDDet);
pstmt1.setDouble(2,linenoDet); pstmt1.setDouble(2,linenoDet);
pstmt1.setString(3,statusDet); pstmt1.setString(3,statusDet);
...@@ -416,7 +462,7 @@ public class GSTRWebServiceDao extends ValidatorEJB { ...@@ -416,7 +462,7 @@ public class GSTRWebServiceDao extends ValidatorEJB {
catch(Exception e) catch(Exception e)
{ {
retString = "failed"; retString = "failed";
System.out.println("Exception GSTRegNoPosEJB ==>"+e.getMessage()); System.out.println("Exception GSTRWebServiceDao ==>"+e.getMessage());
isError = true; isError = true;
e.printStackTrace(); e.printStackTrace();
throw new ITMException(e); throw new ITMException(e);
...@@ -501,8 +547,9 @@ public class GSTRWebServiceDao extends ValidatorEJB { ...@@ -501,8 +547,9 @@ public class GSTRWebServiceDao extends ValidatorEJB {
} }
else else
{ {
return null; return null;
} }
} }
} }
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