Skip to content

B
business-java
Commit 0e3450a9 authored by spawar's avatar spawar
Browse files
Options

Added Changes to edit nil rated records 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@106382 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c3b7f3e1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 508 additions and 29 deletions
webitm-gst/ibase/webitm/ejb/gst/GstrCustomTranEJB.java
View file @ 0e3450a9
...@@ -148,9 +148,11 @@ public class GstrCustomTranEJB extends ValidatorEJB implements GstrCustomTranEJB ...@@ -148,9 +148,11 @@ public class GstrCustomTranEJB extends ValidatorEJB implements GstrCustomTranEJB
adduser = genericUtility.getColumnValueFromNode("add_user", detailNode); adduser = genericUtility.getColumnValueFromNode("add_user", detailNode);
adddate= genericUtility.getColumnValueFromNode("add_date", detailNode); adddate= genericUtility.getColumnValueFromNode("add_date", detailNode);
addterm = genericUtility.getColumnValueFromNode("add_term", detailNode); addterm = genericUtility.getColumnValueFromNode("add_term", detailNode);
chguser = genericUtility.getColumnValueFromNode("chg_user", detailNode); //chguser = genericUtility.getColumnValueFromNode("chg_user", detailNode);
chgdate= genericUtility.getColumnValueFromNode("chg_date", detailNode); chguser = userInfo.getLoginCode();
chgterm= genericUtility.getColumnValueFromNode("chg_term", detailNode); //chgdate= genericUtility.getColumnValueFromNode("chg_date", detailNode);
//chgterm= genericUtility.getColumnValueFromNode("chg_term", detailNode);
chgterm = userInfo.getRemoteHost();
taxregno = genericUtility.getColumnValueFromNode("tax_reg_no", detailNode); taxregno = genericUtility.getColumnValueFromNode("tax_reg_no", detailNode);
recostatus= genericUtility.getColumnValueFromNode("reco_status", detailNode); recostatus= genericUtility.getColumnValueFromNode("reco_status", detailNode);
ecomregno= genericUtility.getColumnValueFromNode("ecom_reg_no", detailNode); ecomregno= genericUtility.getColumnValueFromNode("ecom_reg_no", detailNode);
...@@ -176,7 +178,7 @@ public class GstrCustomTranEJB extends ValidatorEJB implements GstrCustomTranEJB ...@@ -176,7 +178,7 @@ public class GstrCustomTranEJB extends ValidatorEJB implements GstrCustomTranEJB
pstmt.setString(12,doctype); //DOC_TYPE CHAR(5) pstmt.setString(12,doctype); //DOC_TYPE CHAR(5)
pstmt.setString(13,docno); //DOC_NO VARCHAR2(50) pstmt.setString(13,docno); //DOC_NO VARCHAR2(50)
pstmt.setTimestamp(14,getTimeStamp(docdate)); //DOC_DATE DATE pstmt.setTimestamp(14,getTimeStamp(docdate)); //DOC_DATE DATE
pstmt.setString(15,amount); //AMOUNT NUMBER(15,2) pstmt.setDouble(15,getDouble(amount)); //AMOUNT NUMBER(15,2)
pstmt.setString(16,reversechrg); //REVERSE_CHRG CHAR(1) pstmt.setString(16,reversechrg); //REVERSE_CHRG CHAR(1)
pstmt.setString(17,lrno); //LR_NO VARCHAR2(50) pstmt.setString(17,lrno); //LR_NO VARCHAR2(50)
pstmt.setTimestamp(18,getTimeStamp(lrdate)); //LR_DATE DATE pstmt.setTimestamp(18,getTimeStamp(lrdate)); //LR_DATE DATE
...@@ -193,7 +195,7 @@ public class GstrCustomTranEJB extends ValidatorEJB implements GstrCustomTranEJB ...@@ -193,7 +195,7 @@ public class GstrCustomTranEJB extends ValidatorEJB implements GstrCustomTranEJB
pstmt.setTimestamp(29,getTimeStamp(adddate)); //ADD_DATE DATE pstmt.setTimestamp(29,getTimeStamp(adddate)); //ADD_DATE DATE
pstmt.setString(30,addterm); //ADD_TERM VARCHAR2(15) pstmt.setString(30,addterm); //ADD_TERM VARCHAR2(15)
pstmt.setString(31,chguser); //CHG_USER CHAR(10) pstmt.setString(31,chguser); //CHG_USER CHAR(10)
pstmt.setTimestamp(32,getTimeStamp(chgdate)); //CHG_DATE DATE pstmt.setTimestamp(32,new java.sql.Timestamp(System.currentTimeMillis())); //CHG_DATE DATE
pstmt.setString(33,chgterm); //CHG_TERM VARCHAR2(15) pstmt.setString(33,chgterm); //CHG_TERM VARCHAR2(15)
pstmt.setString(34,taxregno); //TAX_REG_NO VARCHAR2(15) pstmt.setString(34,taxregno); //TAX_REG_NO VARCHAR2(15)
pstmt.setString(35,recostatus); //RECO_STATUS VARCHAR2(1) pstmt.setString(35,recostatus); //RECO_STATUS VARCHAR2(1)
...@@ -270,6 +272,179 @@ public class GstrCustomTranEJB extends ValidatorEJB implements GstrCustomTranEJB ...@@ -270,6 +272,179 @@ public class GstrCustomTranEJB extends ValidatorEJB implements GstrCustomTranEJB
System.out.println("Return Xml String:"+retXmlString); System.out.println("Return Xml String:"+retXmlString);
return retXmlString; return retXmlString;
} }
@Override
public String updateRecord(String objName,String tranXml, UserInfoBean userInfo) throws RemoteException, ITMException
{
Connection conn = null;
String sql = "";
PreparedStatement pstmt = null;
Document tranDoc = null;
NodeList detailNodeList = null;
String retXmlString = "<root>";
String errString = "";
boolean isErrorExist = false;
String tranid = null,trantype = null,amount= null;
try
{
System.out.println("===================Inside GstrCustomTranEJB class========================");
if(conn == null || conn.isClosed())
{
System.out.println("@@Connection is null");
conn = getConnection();
}
tranDoc = genericUtility.parseString(tranXml);
detailNodeList = tranDoc.getElementsByTagName("Detail1");
for(int i = 0; i < detailNodeList.getLength() && !isErrorExist; i++)
{
Node detailNode = detailNodeList.item(i);
tranid = null;trantype = null;amount= null;
tranid = genericUtility.getColumnValueFromNode("tran_id", detailNode);
trantype = genericUtility.getColumnValueFromNode("tran_type", detailNode);
amount= genericUtility.getColumnValueFromNode("amount", detailNode);
sql = "UPDATE GST_DATA_HDR SET AMOUNT = ? WHERE TRAN_ID = ? AND TRAN_TYPE = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1, getDouble(amount));
pstmt.setString(2, tranid);
pstmt.setString(3, trantype);
int rowsUpdated = pstmt.executeUpdate();
if(rowsUpdated == 0)
{
System.out.println("Record not found.......");
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
retXmlString = retXmlString + "<tran_id>"+tranid+"</tran_id>";
}
retXmlString = retXmlString + "</root>";
if(isErrorExist)
{
conn.rollback();
retXmlString = errString;
}
else
{
conn.commit();
}
}catch (Exception e)
{
try
{
conn.rollback();
} catch (SQLException e1)
{
e1.printStackTrace();
}
e.printStackTrace();
throw new ITMException(e);
}
finally
{
if(isErrorExist)
{
try
{
conn.rollback();
} catch (SQLException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
retXmlString = errString;
}
else
{
try
{
conn.commit();
} catch (SQLException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
try
{
conn.close();
} catch (SQLException e)
{
e.printStackTrace();
}
}
System.out.println("Return Xml String:"+retXmlString);
return retXmlString;
}
private double getDouble(String amount)
{
double result = 0.0;
result = Double.parseDouble((amount==null||amount.equals("")) ? "0" : amount);
return result;
}
@Override
public String getRecords(String objName,String prdCode, UserInfoBean userInfo) throws RemoteException, ITMException
{
Connection conn = null;
String sql = "";
PreparedStatement pstmt = null;
ResultSet rs = null;
String retXmlString = "<root>";
try
{
System.out.println("===================Inside GstrCustomTranEJB class========================");
if(conn == null || conn.isClosed())
{
System.out.println("@@Connection is null");
conn = getConnection();
}
sql = "select tran_type,tran_id,amount from gst_data_hdr where gst_type = 'L' and prd_code = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, prdCode);
rs = pstmt.executeQuery();
System.out.println(rs.getFetchSize());
while(rs.next())
{
retXmlString = retXmlString + "<detail>";
retXmlString = retXmlString + "<tran_id>"+rs.getString("tran_id")+"</tran_id>";
retXmlString = retXmlString + "<tran_type>"+rs.getString("tran_type")+"</tran_type>";
retXmlString = retXmlString + "<amount>"+rs.getDouble("amount")+"</amount>";
retXmlString = retXmlString + "</detail>";
}
retXmlString = retXmlString + "</root>";
}catch (Exception e)
{
e.printStackTrace();
throw new ITMException(e);
}
finally
{
try
{
conn.close();
} catch (SQLException e)
{
e.printStackTrace();
}
}
System.out.println("Return Xml String:"+retXmlString);
return retXmlString;
}
private Timestamp getTimeStamp(String dateStr) throws ITMException, Exception private Timestamp getTimeStamp(String dateStr) throws ITMException, Exception
{ {
String dbDateStr = ""; String dbDateStr = "";
......
webitm-gst/ibase/webitm/ejb/gst/GstrCustomTranEJBLocal.java
View file @ 0e3450a9
...@@ -17,4 +17,8 @@ import javax.ejb.Local; ...@@ -17,4 +17,8 @@ import javax.ejb.Local;
public interface GstrCustomTranEJBLocal extends ValidatorLocal public interface GstrCustomTranEJBLocal extends ValidatorLocal
{ {
public String saveRecord(String objName, String tranXml, UserInfoBean userInfo) throws RemoteException,ITMException; public String saveRecord(String objName, String tranXml, UserInfoBean userInfo) throws RemoteException,ITMException;
String updateRecord(String objName, String tranXml, UserInfoBean userInfo) throws RemoteException, ITMException;
String getRecords(String objName, String prdCode, UserInfoBean userInfo) throws RemoteException, ITMException;
} }
webitm-gst/ibase/webitm/ejb/gst/GstrCustomTranEJBRemote.java
View file @ 0e3450a9
...@@ -15,4 +15,8 @@ import javax.ejb.Remote; ...@@ -15,4 +15,8 @@ import javax.ejb.Remote;
public interface GstrCustomTranEJBRemote extends ValidatorRemote public interface GstrCustomTranEJBRemote extends ValidatorRemote
{ {
public String saveRecord(String objName, String tranXml, UserInfoBean userInfo) throws RemoteException,ITMException; public String saveRecord(String objName, String tranXml, UserInfoBean userInfo) throws RemoteException,ITMException;
String updateRecord(String objName, String tranXml, UserInfoBean userInfo) throws RemoteException, ITMException;
String getRecords(String objName, String prdCode, UserInfoBean userInfo) throws RemoteException, ITMException;
} }
webitm-gst/ibase/webitm/servlet/gst/GstrCustomTranServlet.java
View file @ 0e3450a9
...@@ -69,6 +69,50 @@ public class GstrCustomTranServlet extends HttpServlet ...@@ -69,6 +69,50 @@ public class GstrCustomTranServlet extends HttpServlet
System.out.println("htmlData ["+htmlData+"]"); System.out.println("htmlData ["+htmlData+"]");
} }
} }
if("UPDATE_DATA".equalsIgnoreCase(action))
{
ibase.utility.UserInfoBean userInfo = ( ibase.utility.UserInfoBean )request.getSession().getAttribute( "USER_INFO" );
if(userInfo != null)
{
String objName = request.getParameter("OBJ_NAME");
String tranXml = request.getParameter("ALL_ELEMENTS");
System.out.println("OBJ_NAME["+objName+"]");
ctx=getInitialContext();
GstrCustomTranEJBRemote GstrCustomTranEJBRemote = (ibase.webitm.ejb.gst.GstrCustomTranEJBRemote) ctx.lookup("ibase/GstrCustomTranEJB/remote");
responseXML = GstrCustomTranEJBRemote.updateRecord(objName, tranXml, userInfo);
//responseXML = gstRegNoRemote.handleRequest(requestParamMap);
}
else
{
responseXML = "GstrCustomTranServlet_notLoggedIn";
System.out.println("htmlData ["+htmlData+"]");
}
}
if("GET_DATA".equalsIgnoreCase(action))
{
ibase.utility.UserInfoBean userInfo = ( ibase.utility.UserInfoBean )request.getSession().getAttribute( "USER_INFO" );
if(userInfo != null)
{
String objName = request.getParameter("OBJ_NAME");
String prdCode = request.getParameter("PRD_CODE");
System.out.println("OBJ_NAME["+objName+"]");
ctx=getInitialContext();
GstrCustomTranEJBRemote GstrCustomTranEJBRemote = (ibase.webitm.ejb.gst.GstrCustomTranEJBRemote) ctx.lookup("ibase/GstrCustomTranEJB/remote");
responseXML = GstrCustomTranEJBRemote.getRecords(objName, prdCode, userInfo);
//responseXML = gstRegNoRemote.handleRequest(requestParamMap);
}
else
{
responseXML = "GstrCustomTranServlet_notLoggedIn";
System.out.println("htmlData ["+htmlData+"]");
}
}
if(CommonConstants.CONTENT_ENCODING != null && CommonConstants.CONTENT_ENCODING.equalsIgnoreCase("gzip")) if(CommonConstants.CONTENT_ENCODING != null && CommonConstants.CONTENT_ENCODING.equalsIgnoreCase("gzip"))
......
webitm-gst/module-resource/web/css/GstCustomTransaction.css
View file @ 0e3450a9
...@@ -13,6 +13,15 @@ ...@@ -13,6 +13,15 @@
font-family: "MuseoLight-300", sans-serif !important; font-family: "MuseoLight-300", sans-serif !important;
} }
input[type=number]::-webkit-inner-spin-button,
input[type=number]::-webkit-outer-spin-button {
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;
margin: 0;
}
#gstExtraFrame{ #gstExtraFrame{
width: 99%; width: 99%;
border: 1px solid lightgray; border: 1px solid lightgray;
......
webitm-gst/module-resource/web/jsp/GSTNilRatedSupplies.jsp
View file @ 0e3450a9
...@@ -21,38 +21,51 @@ ...@@ -21,38 +21,51 @@
<tbody class="table-body"> <tbody class="table-body">
<tr> <tr>
<td align="left" valign="bottom">Inter-State supplies to registered persons</td> <td align="left" valign="bottom">Inter-State supplies to registered persons</td>
<td> <input style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail1.1.amount1" name="Detail1.1.amount" type="text" value="0.00" > </td> <td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail1.1.amount1" name="Detail1.1.amount" type="text" value="0.00" > </td>
<td> <input style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail1.2.amount2" name="Detail1.2.amount" type="text" value="0.00" > </td> <td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail1.2.amount2" name="Detail1.2.amount" type="text" value="0.00" > </td>
<td> <input style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail1.3.amount3" name="Detail1.3.amount" type="text" value="0.00" > </td> </tr> <td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail1.3.amount3" name="Detail1.3.amount" type="text" value="0.00" > </td>
<input type="hidden" id="Detail1.1.tran_type1" name="Detail1.1.tran_type" type="text" value="15" > <input type="hidden" id="Detail1.1.tran_type1" name="Detail1.1.tran_type" type="text" value="15" >
<input type="hidden" id="Detail1.2.tran_type2" name="Detail1.2.tran_type" type="text" value="16" > <input type="hidden" id="Detail1.2.tran_type2" name="Detail1.2.tran_type" type="text" value="16" >
<input type="hidden" id="Detail1.3.tran_type3" name="Detail1.3.tran_type" type="text" value="17" > <input type="hidden" id="Detail1.3.tran_type3" name="Detail1.3.tran_type" type="text" value="17" >
<input type="hidden" id="Detail1.1.tran_id1" name="Detail1.1.tran_id" type="text" >
<input type="hidden" id="Detail1.2.tran_id2" name="Detail1.2.tran_id" type="text" >
<input type="hidden" id="Detail1.3.tran_id3" name="Detail1.3.tran_id" type="text" >
</tr>
<tr> <tr>
<td align="left" valign="bottom">Intra-State supplies to registered persons</td> <td align="left" valign="bottom">Intra-State supplies to registered persons</td>
<td> <input style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail1.4.amount4" name="Detail1.4.amount" type="text" value="0.00" > </td> <td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail1.4.amount4" name="Detail1.4.amount" type="text" value="0.00" > </td>
<td> <input style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail1.5.amount5" name="Detail1.5.amount" type="text" value="0.00" > </td> <td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail1.5.amount5" name="Detail1.5.amount" type="text" value="0.00" > </td>
<td> <input style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail1.6.amount6" name="Detail1.6.amount" type="text" value="0.00" > </td> <td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail1.6.amount6" name="Detail1.6.amount" type="text" value="0.00" > </td>
<input type="hidden" id="Detail1.4.tran_type4" name="Detail1.4.tran_type" type="text" value="18" > <input type="hidden" id="Detail1.4.tran_type4" name="Detail1.4.tran_type" type="text" value="18" >
<input type="hidden" id="Detail1.5.tran_type5" name="Detail1.5.tran_type" type="text" value="19" > <input type="hidden" id="Detail1.5.tran_type5" name="Detail1.5.tran_type" type="text" value="19" >
<input type="hidden" id="Detail1.6.tran_type6" name="Detail1.6.tran_type" type="text" value="20" > <input type="hidden" id="Detail1.6.tran_type6" name="Detail1.6.tran_type" type="text" value="20" >
<input type="hidden" id="Detail1.4.tran_id4" name="Detail1.4.tran_id" type="text" >
<input type="hidden" id="Detail1.5.tran_id5" name="Detail1.5.tran_id" type="text" >
<input type="hidden" id="Detail1.6.tran_id6" name="Detail1.6.tran_id" type="text" >
</tr> </tr>
<tr> <tr>
<td align="left" valign="bottom">Inter-State supplies to unregistered persons</td> <td align="left" valign="bottom">Inter-State supplies to unregistered persons</td>
<td> <input style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail1.7.amount7" name="Detail1.7.amount" type="text" value="0.00" > </td> <td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail1.7.amount7" name="Detail1.7.amount" type="text" value="0.00" > </td>
<td> <input style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail1.8.amount8" name="Detail1.8.amount" type="text" value="0.00" > </td> <td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail1.8.amount8" name="Detail1.8.amount" type="text" value="0.00" > </td>
<td> <input style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail1.9.amount9" name="Detail1.9.amount" type="text" value="0.00" > </td> <td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail1.9.amount9" name="Detail1.9.amount" type="text" value="0.00" > </td>
<input type="hidden" id="Detail1.7.tran_type7" name="Detail1.7.tran_type" type="text" value="21" > <input type="hidden" id="Detail1.7.tran_type7" name="Detail1.7.tran_type" type="text" value="21" >
<input type="hidden" id="Detail1.8.tran_type8" name="Detail1.8.tran_type" type="text" value="22" > <input type="hidden" id="Detail1.8.tran_type8" name="Detail1.8.tran_type" type="text" value="22" >
<input type="hidden" id="Detail1.9.tran_type9" name="Detail1.9.tran_type" type="text" value="23" > <input type="hidden" id="Detail1.9.tran_type9" name="Detail1.9.tran_type" type="text" value="23" >
<input type="hidden" id="Detail1.7.tran_id7" name="Detail1.7.tran_id" type="text" >
<input type="hidden" id="Detail1.8.tran_id8" name="Detail1.8.tran_id" type="text" >
<input type="hidden" id="Detail1.9.tran_id9" name="Detail1.9.tran_id" type="text" >
</tr> </tr>
<tr> <tr>
<td align="left" valign="bottom">Intra-State supplies to unregistered persons</td> <td align="left" valign="bottom">Intra-State supplies to unregistered persons</td>
<td> <input style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail1.10.amount10" name="Detail1.10.amount" type="text" value="0.00" > </td> <td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail1.10.amount10" name="Detail1.10.amount" type="text" value="0.00" > </td>
<td> <input style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail1.11.amount11" name="Detail1.11.amount" type="text" value="0.00" > </td> <td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail1.11.amount11" name="Detail1.11.amount" type="text" value="0.00" > </td>
<td> <input style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail1.12.amount12" name="Detail1.12.amount" type="text" value="0.00" > </td> <td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail1.12.amount12" name="Detail1.12.amount" type="text" value="0.00" > </td>
<input type="hidden" id="Detail1.10.tran_type10" name="Detail1.10.tran_type" type="text" value="24" > <input type="hidden" id="Detail1.10.tran_type10" name="Detail1.10.tran_type" type="text" value="24" >
<input type="hidden" id="Detail1.11.tran_type11" name="Detail1.11.tran_type" type="text" value="25" > <input type="hidden" id="Detail1.11.tran_type11" name="Detail1.11.tran_type" type="text" value="25" >
<input type="hidden" id="Detail1.12.tran_type12" name="Detail1.12.tran_type" type="text" value="26" > <input type="hidden" id="Detail1.12.tran_type12" name="Detail1.12.tran_type" type="text" value="26" >
<input type="hidden" id="Detail1.10.tran_id10" name="Detail1.10.tran_id" type="text" >
<input type="hidden" id="Detail1.11.tran_id11" name="Detail1.11.tran_id" type="text" >
<input type="hidden" id="Detail1.12.tran_id12" name="Detail1.12.tran_id" type="text" >
</tr> </tr>
</tbody> </tbody>
</table> </table>
......
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