Skip to content

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

commited for adding new field current year gross turn over 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@106161 ce508802-f39f-4f6c-b175-0d175dae99d5
parent dc5cd898
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 66 deletions
webitm-gst/ibase/webitm/ejb/gst/GSTRegNoPosEJB.java
View file @ 8115f24c
......@@ -55,18 +55,19 @@ public class GSTRegNoPosEJB extends ValidatorEJB implements GSTRegNoPosEJBRemote
public String postSave(String xmlstring, String xtraParams, String forcedFlag, Connection conn) throws RemoteException,ITMException
{
System.out.println("Inside GSTRegNoPosEJB Post Save ["+xmlstring+"] \n xtraParams ["+xtraParams+"] \n forcedFlag["+forcedFlag+"]");
String finEntity="",finDescr="",siteCode="",siteDescr="",regNo="",regNo1="",regNo2="";
String finEntity="",finDescr="",siteCode="",siteDescr="",regNo="",regNo1="",regNo2="",regNo3="";
String regDate=null;
PreparedStatement pstmt = null;
PreparedStatement pstmt = null, pstmtUpd = null;
ResultSet rs = null;
Timestamp currDate = null;
Timestamp validUptoDate = null;
boolean isError = false,isLocCon = false;
Document dom = null;
String sql = "",retString = "",tranID = "", tranIdGSTN = "";
String sql = "",retString = "",tranID = "", tranIdGSTN = "", updateSql= "";
String gstInNo = "GSTIN_NO";
String gstUserName = "GST_UNAME";
String gstGT = "GST_GT";
String gstCurGT ="GST_CUR_GT";
int cnt = 0;
String gstRefCode = "";
String loginSite = "";
......@@ -141,106 +142,132 @@ public class GSTRegNoPosEJB extends ValidatorEJB implements GSTRegNoPosEJBRemote
{
regNo2 = checkNullAndTrim(childNode.getFirstChild().getNodeValue());
}
else if(childNode != null && "reg_no3".equalsIgnoreCase(childNode.getNodeName()) && childNode.getFirstChild() != null)
{
regNo3 = checkNullAndTrim(childNode.getFirstChild().getNodeValue());
}
else if(childNode != null && "reg_date".equalsIgnoreCase(childNode.getNodeName()) && childNode.getFirstChild() != null)
{
regDate = checkNullAndTrim(childNode.getFirstChild().getNodeValue());
}
}
}
System.out.println("finEntity["+finEntity+"]"+"finDescr["+finDescr+"]"+"siteCode["+siteCode+"]"+"siteDescr["+siteDescr+"]"+"regNo["+regNo+"]"+"regNo1["+regNo1+"]"+"regNo2["+regNo2+"]"+"regDate["+regDate+"]");
System.out.println("finEntity["+finEntity+"]"+"finDescr["+finDescr+"]"+"siteCode["+siteCode+"]"+"siteDescr["+siteDescr+"]"+"regNo["+regNo+"]"+"regNo1["+regNo1+"]"+"regNo2["+regNo2+"]"+"regNo3["+regNo3+"]"+"regDate["+regDate+"]");
validUptoDate = Timestamp.valueOf(genericUtility.getValidDateString(regDate, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
System.out.println("validUptoDate["+validUptoDate+"]");
ArrayList refList = new ArrayList();
ArrayList<String> refList = new ArrayList<>();
refList.add("GSTIN_NO");
refList.add("GST_UNAME");
refList.add("GST_GT");
refList.add("GST_CUR_GT");
ArrayList gstList = new ArrayList();
ArrayList<String> gstList = new ArrayList<>();
gstList.add(regNo);
gstList.add(regNo1);
gstList.add(regNo2);
gstList.add(regNo3);
HashMap map = new HashMap();
map.put(regNo, "GSTIN_NO");
map.put(regNo1, "GST_UNAME");
map.put(regNo2, "GST_GT");
HashMap<String,String> map = new HashMap<String,String>();
map.put("GSTIN_NO", regNo);
map.put("GST_UNAME", regNo1);
map.put("GST_GT", regNo2);
map.put("GST_CUR_GT", regNo3);
sql = "select count(*) as cnt from siteregno where fin_entity=? AND site_code=? AND ref_code=?";
pstmt = conn.prepareStatement(sql);
for(int i=0;i<refList.size();i++)
{
pstmt = conn.prepareStatement(sql);
String refCode = (String)refList.get(i);
System.out.println("refCode::::"+refCode);
pstmt.setString(1,finEntity);
pstmt.setString(2,siteCode);
pstmt.setString(3,refCode.trim());
rs = pstmt.executeQuery();
}
if(rs.next())
{
cnt = rs.getInt("cnt");
System.out.println("cnt>>>>>>>"+cnt);
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(rs != null)
{
rs.close();
rs = null;
}
if(cnt>0)
{
sql = "update siteregno set reg_no=?,reg_date=? where fin_entity=? AND site_code=? AND ref_code=?";
pstmt = conn.prepareStatement(sql);
for(int x =0 ; x< gstList.size(); x++)
if(rs.next())
{
gstRefCode = (String) gstList.get(x);
val = (String) map.get(gstRefCode);
pstmt.setString(1,gstRefCode.trim());
pstmt.setTimestamp(2,validUptoDate);
pstmt.setString(3,finEntity);
pstmt.setString(4,siteCode);
pstmt.setString(5,val);
pstmt.executeUpdate();
cnt = rs.getInt("cnt");
System.out.println("cnt>>>>>>>"+cnt);
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
}
else
{
sql = " insert into siteregno (fin_entity,site_code,ref_code,reg_no,valid_upto,reg_date,chg_date,chg_user,eff_from) values(?,?,?,?,?,?,?,?)";
pstmt = conn.prepareStatement(sql);
for(int y =0 ; y< gstList.size(); y++)
if(rs != null)
{
gstRefCode = (String) gstList.get(y);
val = (String) map.get(gstRefCode);
pstmt.setString(1,finEntity);
pstmt.setString(2,siteCode);
pstmt.setString(3,val);
pstmt.setString(4, gstRefCode);
pstmt.setTimestamp(5,currDate);
pstmt.setTimestamp(6,validUptoDate);
pstmt.setTimestamp(7,currDate);
pstmt.setString(8,loginSite);
pstmt.setTimestamp(9,currDate);
pstmt.addBatch();
rs.close();
rs = null;
}
if(cnt>0)
{
updateSql = "update siteregno set reg_no=?,reg_date=? where fin_entity=? AND site_code=? AND ref_code=?";
pstmtUpd = conn.prepareStatement(updateSql);
/*for(int x =0 ; x< gstList.size(); x++)
{
gstRefCode = (String) gstList.get(x);
val = (String) map.get(gstRefCode);
pstmt.setString(1,gstRefCode.trim());
pstmt.setTimestamp(2,validUptoDate);
pstmt.setString(3,finEntity);
pstmt.setString(4,siteCode);
pstmt.setString(5,val);
pstmt.executeUpdate();
}*/
gstRefCode = (String) gstList.get(i);
/*val = (String) map.get(gstRefCode);*/
pstmtUpd.setString(1,gstRefCode.trim());
pstmtUpd.setTimestamp(2,validUptoDate);
pstmtUpd.setString(3,finEntity);
pstmtUpd.setString(4,siteCode);
pstmtUpd.setString(5,refCode);
pstmtUpd.executeUpdate();
if(pstmtUpd != null)
{
pstmtUpd.close();
pstmtUpd = null;
}
}
pstmt.executeBatch();
if(pstmt != null)
else
{
pstmt.close();
pstmt = null;
updateSql = " insert into siteregno (fin_entity,site_code,ref_code,reg_no,valid_upto,reg_date,chg_date,chg_user,eff_from) values(?,?,?,?,?,?,?,?,?)";
pstmtUpd = conn.prepareStatement(updateSql);
/*for(int y =0 ; y< gstList.size(); y++)
{
gstRefCode = (String) gstList.get(y);
val = (String) map.get(gstRefCode);
pstmt.setString(1,finEntity);
pstmt.setString(2,siteCode);
pstmt.setString(3,val);
pstmt.setString(4, gstRefCode);
pstmt.setTimestamp(5,currDate);
pstmt.setTimestamp(6,validUptoDate);
pstmt.setTimestamp(7,currDate);
pstmt.setString(8,loginSite);
pstmt.setTimestamp(9,currDate);
pstmt.addBatch();
}*/
gstRefCode = (String) gstList.get(i);
//val = (String) map.get(gstRefCode);
pstmtUpd.setString(1,finEntity);
pstmtUpd.setString(2,siteCode);
pstmtUpd.setString(3,refCode);
pstmtUpd.setString(4,gstRefCode);
pstmtUpd.setTimestamp(5,currDate);
pstmtUpd.setTimestamp(6,validUptoDate);
pstmtUpd.setTimestamp(7,currDate);
pstmtUpd.setString(8,loginSite);
pstmtUpd.setTimestamp(9,currDate);
pstmtUpd.executeUpdate();
if(pstmtUpd != null)
{
pstmtUpd.close();
pstmtUpd = null;
}
}
}
}
retString= insertUserSignAcc(xmlstring,xtraParams,forcedFlag, conn);
......
webitm-gst/ibase/webitm/ejb/gst/GstRegNoIC.java
View file @ 8115f24c
......@@ -513,7 +513,7 @@ public class GstRegNoIC extends ValidatorEJB implements GstRegNoICRemote, GstReg
}
valueXmlString.append("<finent_descr>").append("<![CDATA["+finent_descr+"]]>").append("</finent_descr>");
sql = "select ref_code,reg_no,reg_date from siteregno where fin_entity=? and site_code=? and ref_code in('GSTIN_NO','GST_UNAME','GST_GT')";
sql = "select ref_code,reg_no,reg_date from siteregno where fin_entity=? and site_code=? and ref_code in('GSTIN_NO','GST_UNAME','GST_GT','GST_CUR_GT')";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,fin_entity);
pstmt.setString(2,loginSite);
......@@ -555,6 +555,7 @@ public class GstRegNoIC extends ValidatorEJB implements GstRegNoICRemote, GstReg
valueXmlString.append("<reg_no>").append("<![CDATA["+checkNull((String)map.get("GSTIN_NO"))+"]]>").append("</reg_no>");
valueXmlString.append("<reg_no1>").append("<![CDATA["+checkNull((String)map.get("GST_UNAME"))+"]]>").append("</reg_no1>");
valueXmlString.append("<reg_no2>").append("<![CDATA["+checkNull((String)map.get("GST_GT"))+"]]>").append("</reg_no2>");
valueXmlString.append("<reg_no3>").append("<![CDATA["+checkNull((String)map.get("GST_CUR_GT"))+"]]>").append("</reg_no3>");
valueXmlString.append("<reg_date>").append("<![CDATA["+docDateStr+"]]>").append("</reg_date>");
}
else
......@@ -562,6 +563,7 @@ public class GstRegNoIC extends ValidatorEJB implements GstRegNoICRemote, GstReg
valueXmlString.append("<reg_no>").append("<![CDATA["+""+"]]>").append("</reg_no>");
valueXmlString.append("<reg_no1>").append("<![CDATA["+""+"]]>").append("</reg_no1>");
valueXmlString.append("<reg_no2>").append("<![CDATA["+""+"]]>").append("</reg_no2>");
valueXmlString.append("<reg_no3>").append("<![CDATA["+""+"]]>").append("</reg_no3>");
valueXmlString.append("<reg_date>").append("<![CDATA["+docDateStr+"]]>").append("</reg_date>");
}
}// end of itm_default
......
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