Skip to content

B
business-java
Commit 57f06c92 authored by pchavan's avatar pchavan
Browse files
Options

commited changes of reconcilation screen invoice based 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@171837 ce508802-f39f-4f6c-b175-0d175dae99d5
parent fe3a2f76
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 5 deletions
webitm-gst/ibase/webitm/ejb/gst/GSTRecoWizEJB.java
View file @ 57f06c92
...@@ -634,8 +634,14 @@ public class GSTRecoWizEJB extends ValidatorEJB implements GSTRecoWizEJBLocal, G ...@@ -634,8 +634,14 @@ public class GSTRecoWizEJB extends ValidatorEJB implements GSTRecoWizEJBLocal, G
String orderDate = "",docDate = ""; String orderDate = "",docDate = "";
//sql = " SELECT ORDER_DATE, DOC_DATE, DOC_NO, AMOUNT, SITE_CODE, RECO_STATUS FROM GST_DATA_HDR WHERE DOC_NO = ? AND SUBMIT_STATUS = 'P' "; //sql = " SELECT ORDER_DATE, DOC_DATE, DOC_NO, AMOUNT, SITE_CODE, RECO_STATUS FROM GST_DATA_HDR WHERE DOC_NO = ? AND SUBMIT_STATUS = 'P' ";
sql = " SELECT ORDER_DATE, DOC_DATE, DOC_NO, AMOUNT, SITE_CODE, RECO_STATUS FROM GST_DATA_HDR WHERE DOC_NO = ? AND REC_TYPE = '2' AND SUBMIT_STATUS IN ('P','D') "; //sql = " SELECT ORDER_DATE, DOC_DATE, DOC_NO, AMOUNT, SITE_CODE, RECO_STATUS FROM GST_DATA_HDR WHERE DOC_NO = ? AND REC_TYPE = '2' AND SUBMIT_STATUS IN ('P','D') ";
pstmt = conn.prepareStatement(sql);
/*changed by kaustubh on 28 sep 2017 */
sql = " SELECT PRD_CODE,CUST_CODE,ORDER_NO,CUST_NAME,REVERSE_CHRG,LR_NO,LR_DATE,ORDER_DATE,REAS_CODE,DOC_DATE,DOC_NO,ORDER_NO, "+
" ECOM_REG_NO,AMOUNT,SITE_CODE,RECO_STATUS,GST_CODE,GST_TYPE FROM GST_DATA_HDR "+
// " WHERE DOC_NO = ? AND REC_TYPE = '2' AND SUBMIT_STATUS IN ('P','D') "; COMMENTED BY KAUSTUBH ON 4 OCT
" WHERE DOC_NO = ? AND REC_TYPE = '2' AND SUBMIT_STATUS IN ('P','A') ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, invoiceID); pstmt.setString(1, invoiceID);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) if (rs.next())
...@@ -645,10 +651,23 @@ public class GSTRecoWizEJB extends ValidatorEJB implements GSTRecoWizEJBLocal, G ...@@ -645,10 +651,23 @@ public class GSTRecoWizEJB extends ValidatorEJB implements GSTRecoWizEJBLocal, G
valueXmlString.append("<invoice_id>").append("<![CDATA["+invoiceID+"]]>").append("</invoice_id>"); valueXmlString.append("<invoice_id>").append("<![CDATA["+invoiceID+"]]>").append("</invoice_id>");
valueXmlString.append("<doc_no>").append("<![CDATA["+rs.getString("DOC_NO")+"]]>").append("</doc_no>"); valueXmlString.append("<doc_no>").append("<![CDATA["+rs.getString("DOC_NO")+"]]>").append("</doc_no>");
valueXmlString.append("<order_no>").append("<![CDATA["+rs.getString("ORDER_NO")+"]]>").append("</order_no>");
valueXmlString.append("<inv_amt>").append("<![CDATA["+rs.getString("AMOUNT")+"]]>").append("</inv_amt>"); valueXmlString.append("<inv_amt>").append("<![CDATA["+rs.getString("AMOUNT")+"]]>").append("</inv_amt>");
valueXmlString.append("<site_code>").append("<![CDATA["+rs.getString("SITE_CODE")+"]]>").append("</site_code>"); valueXmlString.append("<site_code>").append("<![CDATA["+rs.getString("SITE_CODE")+"]]>").append("</site_code>");
valueXmlString.append("<reco_status>").append("<![CDATA["+rs.getString("RECO_STATUS")+"]]>").append("</reco_status>"); valueXmlString.append("<reco_status>").append("<![CDATA["+rs.getString("RECO_STATUS")+"]]>").append("</reco_status>");
valueXmlString.append("<prd_code>").append("<![CDATA["+rs.getString("PRD_CODE")+"]]>").append("</prd_code>");
valueXmlString.append("<cust_code>").append("<![CDATA["+rs.getString("CUST_CODE")+"]]>").append("</cust_code>");
valueXmlString.append("<cust_name>").append("<![CDATA["+rs.getString("CUST_NAME")+"]]>").append("</cust_name>");
valueXmlString.append("<reverse_chrg>").append("<![CDATA["+rs.getString("REVERSE_CHRG")+"]]>").append("</reverse_chrg>");
valueXmlString.append("<lr_no>").append("<![CDATA["+rs.getString("LR_NO")+"]]>").append("</lr_no>");
valueXmlString.append("<lr_date>").append("<![CDATA["+rs.getString("LR_DATE")+"]]>").append("</lr_date>");
valueXmlString.append("<reas_code>").append("<![CDATA["+rs.getString("REAS_CODE")+"]]>").append("</reas_code>");
valueXmlString.append("<ecom_reg_no>").append("<![CDATA["+rs.getString("ECOM_REG_NO")+"]]>").append("</ecom_reg_no>");
valueXmlString.append("<gst_code>").append("<![CDATA["+rs.getString("GST_CODE")+"]]>").append("</gst_code>");
valueXmlString.append("<gst_type>").append("<![CDATA["+rs.getString("GST_TYPE")+"]]>").append("</gst_type>");
if(orderDate == null) if(orderDate == null)
{ {
valueXmlString.append("<order_date>").append("<![CDATA[]]>").append("</order_date>"); valueXmlString.append("<order_date>").append("<![CDATA[]]>").append("</order_date>");
...@@ -691,7 +710,7 @@ public class GSTRecoWizEJB extends ValidatorEJB implements GSTRecoWizEJBLocal, G ...@@ -691,7 +710,7 @@ public class GSTRecoWizEJB extends ValidatorEJB implements GSTRecoWizEJBLocal, G
} }
if(j==2) if(j==2)
{ {
submissionType = "D"; submissionType = "A";
} }
/*sql = " SELECT D.TRAN_ID,D.LINE_NO,D.STATUS,D.GS_CODE,D.TAXABLE_AMT,D.IGST_PERC,D.IGST_AMT,D.CGST_PERC,D.CGST_AMT, " /*sql = " SELECT D.TRAN_ID,D.LINE_NO,D.STATUS,D.GS_CODE,D.TAXABLE_AMT,D.IGST_PERC,D.IGST_AMT,D.CGST_PERC,D.CGST_AMT, "
...@@ -701,7 +720,7 @@ public class GSTRecoWizEJB extends ValidatorEJB implements GSTRecoWizEJBLocal, G ...@@ -701,7 +720,7 @@ public class GSTRecoWizEJB extends ValidatorEJB implements GSTRecoWizEJBLocal, G
sql = " SELECT D.TRAN_ID,D.LINE_NO,D.STATUS,D.GS_CODE,D.TAXABLE_AMT,D.IGST_PERC,D.IGST_AMT,D.CGST_PERC,D.CGST_AMT, " sql = " SELECT D.TRAN_ID,D.LINE_NO,D.STATUS,D.GS_CODE,D.TAXABLE_AMT,D.IGST_PERC,D.IGST_AMT,D.CGST_PERC,D.CGST_AMT, "
+ " D.SGST_PERC,D.SGST_AMT,D.GS_DESCR,D.UNIT,D.QUANTITY,D.SUPPLY_TYPE,D.CESS_PERC,D.CESS_AMT,D.REMARKS " + " D.SGST_PERC,D.SGST_AMT,D.GS_DESCR,D.UNIT,D.QUANTITY,D.SUPPLY_TYPE,D.CESS_PERC,D.CESS_AMT,D.REMARKS "
+ " ,H.TAX_REG_NO,H.DOC_NO, H.DOC_DATE " + " ,H.TAX_REG_NO,H.DOC_NO, H.DOC_DATE,H.AMOUNT,H.ORDER_NO,H.GST_TYPE,H.CUST_CODE,H.REVERSE_CHRG "
+ " ,H.GST_CODE,D.ITC_TYPE,D.ITC_IGST,D.ITC_CGST,D.ITC_SGST,D.ITC_CESS " + " ,H.GST_CODE,D.ITC_TYPE,D.ITC_IGST,D.ITC_CGST,D.ITC_SGST,D.ITC_CESS "
+ " FROM GST_DATA_HDR H, GST_DATA_DET D WHERE H.TRAN_ID = D.TRAN_ID " + " FROM GST_DATA_HDR H, GST_DATA_DET D WHERE H.TRAN_ID = D.TRAN_ID "
+ " AND H.DOC_NO = ? AND H.SUBMIT_STATUS = ? AND H.REC_TYPE = ? " + " AND H.DOC_NO = ? AND H.SUBMIT_STATUS = ? AND H.REC_TYPE = ? "
...@@ -709,7 +728,15 @@ public class GSTRecoWizEJB extends ValidatorEJB implements GSTRecoWizEJBLocal, G ...@@ -709,7 +728,15 @@ public class GSTRecoWizEJB extends ValidatorEJB implements GSTRecoWizEJBLocal, G
pstmtDet = conn.prepareStatement(sql); pstmtDet = conn.prepareStatement(sql);
pstmtDet.setString(1, invoiceID); pstmtDet.setString(1, invoiceID);
pstmtDet.setString(2, submissionType); pstmtDet.setString(2, submissionType);
pstmtDet.setString(3, "2"); if(j==1) //added by kaustubh on 4 oct 2017
{
pstmtDet.setString(3, "2");
}
else
{
pstmtDet.setString(3, "4");
}
//pstmtDet.setString(4, gstin); //pstmtDet.setString(4, gstin);
pstmtDet.setString(4, suppCode); pstmtDet.setString(4, suppCode);
rsDet = pstmtDet.executeQuery(); rsDet = pstmtDet.executeQuery();
...@@ -750,6 +777,8 @@ public class GSTRecoWizEJB extends ValidatorEJB implements GSTRecoWizEJBLocal, G ...@@ -750,6 +777,8 @@ public class GSTRecoWizEJB extends ValidatorEJB implements GSTRecoWizEJBLocal, G
//valueXmlString.append("<gstr"+j+" domID='"+domIDGstr+"'>"); //valueXmlString.append("<gstr"+j+" domID='"+domIDGstr+"'>");
/*valueXmlString.append("<gstr"+j+" domID='"+domIDInvoice+"'>");*/ /*valueXmlString.append("<gstr"+j+" domID='"+domIDInvoice+"'>");*/
valueXmlString.append("<tran_id>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("TRAN_ID"))+"]]>").append("</tran_id>"); valueXmlString.append("<tran_id>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("TRAN_ID"))+"]]>").append("</tran_id>");
valueXmlString.append("<line_no>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("LINE_NO"))+"]]>").append("</line_no>"); valueXmlString.append("<line_no>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("LINE_NO"))+"]]>").append("</line_no>");
valueXmlString.append("<status>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("STATUS"))+"]]>").append("</status>"); valueXmlString.append("<status>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("STATUS"))+"]]>").append("</status>");
...@@ -768,6 +797,8 @@ public class GSTRecoWizEJB extends ValidatorEJB implements GSTRecoWizEJBLocal, G ...@@ -768,6 +797,8 @@ public class GSTRecoWizEJB extends ValidatorEJB implements GSTRecoWizEJBLocal, G
valueXmlString.append("<cess_perc>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("CESS_PERC"))+"]]>").append("</cess_perc>"); valueXmlString.append("<cess_perc>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("CESS_PERC"))+"]]>").append("</cess_perc>");
valueXmlString.append("<cess_amt>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("CESS_AMT"))+"]]>").append("</cess_amt>"); valueXmlString.append("<cess_amt>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("CESS_AMT"))+"]]>").append("</cess_amt>");
valueXmlString.append("<remarks>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("REMARKS"))+"]]>").append("</remarks>"); valueXmlString.append("<remarks>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("REMARKS"))+"]]>").append("</remarks>");
valueXmlString.append("<amount>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("AMOUNT"))+"]]>").append("</amount>");
docDate = rsDet.getString("DOC_DATE"); docDate = rsDet.getString("DOC_DATE");
if(docDate == null) if(docDate == null)
...@@ -789,6 +820,30 @@ public class GSTRecoWizEJB extends ValidatorEJB implements GSTRecoWizEJBLocal, G ...@@ -789,6 +820,30 @@ public class GSTRecoWizEJB extends ValidatorEJB implements GSTRecoWizEJBLocal, G
valueXmlString.append("<itc_sgst>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("ITC_SGST"))+"]]>").append("</itc_sgst>"); valueXmlString.append("<itc_sgst>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("ITC_SGST"))+"]]>").append("</itc_sgst>");
valueXmlString.append("<itc_cess>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("ITC_CESS"))+"]]>").append("</itc_cess>"); valueXmlString.append("<itc_cess>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("ITC_CESS"))+"]]>").append("</itc_cess>");
/* valueXmlString.append("<tran_id>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("TRAN_ID"))+"]]>").append("</tran_id>");
valueXmlString.append("<site_code>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("SITE_CODE"))+"]]>").append("</site_code>");
valueXmlString.append("<prd_code>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("PRD_CODE"))+"]]>").append("</prd_code>");
valueXmlString.append("<cust_code>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("PRD_CODE"))+"]]>").append("</cust_code>");
valueXmlString.append("<cust_name>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("PRD_CODE"))+"]]>").append("</cust_name>");
valueXmlString.append("<doc_no>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("PRD_CODE"))+"]]>").append("</doc_no>");
valueXmlString.append("<doc_date>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("PRD_CODE"))+"]]>").append("</doc_date>");
valueXmlString.append("<amount>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("PRD_CODE"))+"]]>").append("</amount>");
valueXmlString.append("<reverse_chrg>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("REVERSE_CHRG"))+"]]>").append("</reverse_chrg>");
valueXmlString.append("<lr_no>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("REVERSE_CHRG"))+"]]>").append("</lr_no>");
valueXmlString.append("<lr_date>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("REVERSE_CHRG"))+"]]>").append("</lr_date>");
valueXmlString.append("<reas_code>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("REAS_CODE"))+"]]>").append("</reas_code>");
valueXmlString.append("<order_no>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("ORDER_NO"))+"]]>").append("</order_no>");
valueXmlString.append("<order_date>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("ORDER_NO"))+"]]>").append("</order_date>");
valueXmlString.append("<remarks>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("ORDER_NO"))+"]]>").append("</remarks>");
valueXmlString.append("<tax_reg_no>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("ORDER_NO"))+"]]>").append("</tax_reg_no>");
valueXmlString.append("<reco_status>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("ORDER_NO"))+"]]>").append("</reco_status>");
valueXmlString.append("<ecom_reg_no>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("ECOM_REG_NO"))+"]]>").append("</ecom_reg_no>");
valueXmlString.append("<tran_type>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("ECOM_REG_NO"))+"]]>").append("</tran_type>");
valueXmlString.append("<gst_code>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("GST_CODE"))+"]]>").append("</gst_code>");
valueXmlString.append("<gst_type>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("ECOM_REG_NO"))+"]]>").append("</gst_type>");
*/
valueXmlString.append("</gstr"+j+">"); valueXmlString.append("</gstr"+j+">");
if(j==1) if(j==1)
......
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