Skip to content

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

commited by kaustubh changes in date format 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@106300 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 5e19e649
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 19 deletions
webitm-gst/ibase/webitm/ejb/gst/GSTRWebServiceDao.java
View file @ f0c7b43d
...@@ -2,9 +2,9 @@ package ibase.webitm.ejb.gst; ...@@ -2,9 +2,9 @@ package ibase.webitm.ejb.gst;
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;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.Timestamp;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONObject; import org.json.JSONObject;
...@@ -22,10 +22,11 @@ public class GSTRWebServiceDao extends ValidatorEJB { ...@@ -22,10 +22,11 @@ public class GSTRWebServiceDao extends ValidatorEJB {
String docType,docNum,docDate,revCharge,lrNo,lrDate,reasCode,refIdInv,refDateInv,provAssmnt,ordNo,ordDate; String docType,docNum,docDate,revCharge,lrNo,lrDate,reasCode,refIdInv,refDateInv,provAssmnt,ordNo,ordDate;
double amt; double amt;
String remarks,subStatus,subDate,addUser,addDate,addTerm,chgUser,chgDate,chgTerm,taxRegNo,recoStatus,ecomRegNo; String remarks,subStatus,subDate,addUser,addDate,addTerm,chgUser,chgDate,chgTerm,taxRegNo,recoStatus,ecomRegNo;
String refSer,gstCode,gstType,newftranDate,newdocDate,newaddDate,newchgDate; String refSer,gstCode,gstType,newftranDate,newdocDate,newaddDate,newchgDate,newlrDate,newRefDateInv,newOrderDate;
String newSubDate;
String tranIDDet,statusDet,lineTypeDet,gscodeDet; String tranIDDet,statusDet,lineTypeDet,gscodeDet;
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;
...@@ -72,8 +73,7 @@ public class GSTRWebServiceDao extends ValidatorEJB { ...@@ -72,8 +73,7 @@ public class GSTRWebServiceDao extends ValidatorEJB {
tranID=obj.getString("tranid"); tranID=obj.getString("tranid");
tranDate=obj.getString("trandate"); tranDate=obj.getString("trandate");
newftranDate=genericUtility.getValidDateString(tranDate,genericUtility.getDBDateFormat(),genericUtility.getApplDateFormat()); //newftranDate=genericUtility.getValidDateString(tranDate,genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat());
System.out.println("newftranDate"+newftranDate);
tranIdRef=obj.getString("ifref"); tranIdRef=obj.getString("ifref");
siteCode=obj.getString("sitecode"); siteCode=obj.getString("sitecode");
prdCode=obj.getString("prdcode"); prdCode=obj.getString("prdcode");
...@@ -86,27 +86,32 @@ public class GSTRWebServiceDao extends ValidatorEJB { ...@@ -86,27 +86,32 @@ public class GSTRWebServiceDao extends ValidatorEJB {
docType=obj.getString("doctype"); docType=obj.getString("doctype");
docNum=obj.getString("docnum"); docNum=obj.getString("docnum");
docDate=obj.getString("docdate"); docDate=obj.getString("docdate");
newdocDate=genericUtility.getValidDateString(docDate,genericUtility.getDBDateFormat(),genericUtility.getApplDateFormat()); //newdocDate=genericUtility.getValidDateString(docDate,genericUtility.getDBDateFormat(),genericUtility.getApplDateFormat());
amt=obj.getDouble("amt"); amt=obj.getDouble("amt");
revCharge=obj.getString("revcharge"); revCharge=obj.getString("revcharge");
lrNo=obj.getString("lrno"); lrNo=obj.getString("lrno");
lrDate=obj.getString("lrdate"); lrDate=obj.getString("lrdate");
//newlrDate=genericUtility.getValidDateString(lrDate,genericUtility.getDBDateFormat(),genericUtility.getApplDateFormat());
//System.out.println("new LR Date"+newlrDate);
reasCode=obj.getString("reascode"); reasCode=obj.getString("reascode");
refIdInv=obj.getString("refidhdr"); refIdInv=obj.getString("refidhdr");
refDateInv=obj.getString("refdatehdr"); refDateInv=obj.getString("refdatehdr");
// newRefDateInv=genericUtility.getValidDateString(refDateInv,genericUtility.getDBDateFormat(),genericUtility.getApplDateFormat());
provAssmnt=obj.getString("provassmnt"); provAssmnt=obj.getString("provassmnt");
ordNo=obj.getString("ordno"); ordNo=obj.getString("ordno");
ordDate=obj.getString("orddate"); ordDate=obj.getString("orddate");
//newOrderDate=genericUtility.getValidDateString(ordDate,genericUtility.getDBDateFormat(),genericUtility.getApplDateFormat());
remarks=obj.getString("remark"); remarks=obj.getString("remark");
subStatus=obj.getString("substatus"); subStatus=obj.getString("substatus");
subDate=obj.getString("subdate"); subDate=obj.getString("subdate");
// newSubDate=genericUtility.getValidDateString(subDate,genericUtility.getDBDateFormat(),genericUtility.getApplDateFormat());
addUser=obj.getString("adduser"); addUser=obj.getString("adduser");
addDate=obj.getString("adddate"); addDate=obj.getString("adddate");
newaddDate=genericUtility.getValidDateString(addDate,genericUtility.getDBDateFormat(),genericUtility.getApplDateFormat()); //newaddDate=genericUtility.getValidDateString(addDate,genericUtility.getDBDateFormat(),genericUtility.getApplDateFormat());
addTerm=obj.getString("addterm"); addTerm=obj.getString("addterm");
chgUser=obj.getString("chguser"); chgUser=obj.getString("chguser");
chgDate=obj.getString("chgdate"); chgDate=obj.getString("chgdate");
newchgDate=genericUtility.getValidDateString(chgDate,genericUtility.getDBDateFormat(),genericUtility.getApplDateFormat()); //newchgDate=genericUtility.getValidDateString(chgDate,genericUtility.getDBDateFormat(),genericUtility.getApplDateFormat());
chgTerm=obj.getString("chgterm"); chgTerm=obj.getString("chgterm");
taxRegNo=obj.getString("taxregno"); taxRegNo=obj.getString("taxregno");
recoStatus=obj.getString("recostatus"); recoStatus=obj.getString("recostatus");
...@@ -116,7 +121,7 @@ public class GSTRWebServiceDao extends ValidatorEJB { ...@@ -116,7 +121,7 @@ public class GSTRWebServiceDao extends ValidatorEJB {
gstType=obj.getString("gsttype"); gstType=obj.getString("gsttype");
System.out.println("values is "+tranID); System.out.println("values is "+tranID);
System.out.println("tranDate is "+newftranDate); System.out.println("tranDate is "+tranDate);
System.out.println("tranIdRef is "+tranIdRef); System.out.println("tranIdRef is "+tranIdRef);
System.out.println("siteCode is "+siteCode); System.out.println("siteCode is "+siteCode);
System.out.println("prdCode is "+prdCode); System.out.println("prdCode is "+prdCode);
...@@ -127,7 +132,7 @@ public class GSTRWebServiceDao extends ValidatorEJB { ...@@ -127,7 +132,7 @@ public class GSTRWebServiceDao extends ValidatorEJB {
System.out.println("docCheckSum is "+docCheckSum); System.out.println("docCheckSum is "+docCheckSum);
System.out.println("docType is "+docType); System.out.println("docType is "+docType);
System.out.println("docNum is "+docNum); System.out.println("docNum is "+docNum);
System.out.println("docDate is "+newdocDate); System.out.println("docDate is "+docDate);
System.out.println("amt is "+amt); System.out.println("amt is "+amt);
System.out.println("revCharge is "+revCharge); System.out.println("revCharge is "+revCharge);
System.out.println("lrNo is "+lrNo); System.out.println("lrNo is "+lrNo);
...@@ -141,7 +146,7 @@ public class GSTRWebServiceDao extends ValidatorEJB { ...@@ -141,7 +146,7 @@ public class GSTRWebServiceDao extends ValidatorEJB {
System.out.println("subStatus is "+subStatus); System.out.println("subStatus is "+subStatus);
System.out.println("subDate is "+subDate); System.out.println("subDate is "+subDate);
System.out.println("addUser is "+addUser); System.out.println("addUser is "+addUser);
System.out.println("addDate is "+newaddDate); System.out.println("addDate is "+addDate);
System.out.println("addTerm is "+addTerm); System.out.println("addTerm is "+addTerm);
System.out.println("chgUser is "+chgUser); System.out.println("chgUser is "+chgUser);
System.out.println("chgDate is "+chgDate); System.out.println("chgDate is "+chgDate);
...@@ -158,7 +163,7 @@ public class GSTRWebServiceDao extends ValidatorEJB { ...@@ -158,7 +163,7 @@ public class GSTRWebServiceDao extends ValidatorEJB {
pstmt = conn.prepareStatement(hdrData); pstmt = conn.prepareStatement(hdrData);
System.out.println("PSTMT"+pstmt); System.out.println("PSTMT"+pstmt);
pstmt.setString(1,tranID); pstmt.setString(1,tranID);
pstmt.setString(2,newftranDate); pstmt.setTimestamp(2,getTimeStamp(tranDate));
pstmt.setString(3,tranIdRef); pstmt.setString(3,tranIdRef);
pstmt.setString(4,siteCode); pstmt.setString(4,siteCode);
pstmt.setString(5,prdCode); pstmt.setString(5,prdCode);
...@@ -170,25 +175,25 @@ public class GSTRWebServiceDao extends ValidatorEJB { ...@@ -170,25 +175,25 @@ public class GSTRWebServiceDao extends ValidatorEJB {
pstmt.setString(11,docCheckSum); pstmt.setString(11,docCheckSum);
pstmt.setString(12,docType); pstmt.setString(12,docType);
pstmt.setString(13,docNum); pstmt.setString(13,docNum);
pstmt.setString(14,newdocDate); pstmt.setTimestamp(14,getTimeStamp(docDate));
pstmt.setDouble(15,amt); pstmt.setDouble(15,amt);
pstmt.setString(16,revCharge); pstmt.setString(16,revCharge);
pstmt.setString(17,lrNo); pstmt.setString(17,lrNo);
pstmt.setString(18,lrDate); pstmt.setTimestamp(18,getTimeStamp(lrDate));
pstmt.setString(19,reasCode); pstmt.setString(19,reasCode);
pstmt.setString(20,refIdInv); pstmt.setString(20,refIdInv);
pstmt.setString(21,refDateInv); pstmt.setTimestamp(21,getTimeStamp(refDateInv));
pstmt.setString(22,provAssmnt); pstmt.setString(22,provAssmnt);
pstmt.setString(23,ordNo); pstmt.setString(23,ordNo);
pstmt.setString(24,ordDate); pstmt.setTimestamp(24,getTimeStamp(ordDate));
pstmt.setString(25,remarks); pstmt.setString(25,remarks);
pstmt.setString(26,subStatus); pstmt.setString(26,subStatus);
pstmt.setString(27,subDate); pstmt.setTimestamp(27,getTimeStamp(subDate));
pstmt.setString(28,addUser); pstmt.setString(28,addUser);
pstmt.setString(29,newaddDate); pstmt.setTimestamp(29,getTimeStamp(addDate));
pstmt.setString(30,addTerm); pstmt.setString(30,addTerm);
pstmt.setString(31,chgUser); pstmt.setString(31,chgUser);
pstmt.setString(32,newchgDate); pstmt.setTimestamp(32,getTimeStamp(chgDate));
pstmt.setString(33,chgTerm); pstmt.setString(33,chgTerm);
pstmt.setString(34,taxRegNo); pstmt.setString(34,taxRegNo);
pstmt.setString(35,recoStatus); pstmt.setString(35,recoStatus);
...@@ -349,4 +354,19 @@ public class GSTRWebServiceDao extends ValidatorEJB { ...@@ -349,4 +354,19 @@ public class GSTRWebServiceDao extends ValidatorEJB {
} }
private Timestamp getTimeStamp(String dateStr) throws ITMException, Exception
{
String dbDateStr = "";
if(dateStr != null && !dateStr.equals(""))
{
dbDateStr = (new E12GenericUtility()).getValidDateTimeString(dateStr, (new E12GenericUtility()).getApplDateTimeFormat(), (new E12GenericUtility()).getDBDateTimeFormat());
return java.sql.Timestamp.valueOf(dbDateStr);
}
else
{
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