Commit d7445a90 authored by kdabholkar's avatar kdabholkar

changed the xsl column data for doc_no and doc_date

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@181110 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 16ddc76d
...@@ -5296,7 +5296,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -5296,7 +5296,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
String tranId = "", ctin = "", posStateCode = "", docNo = "", docDateStr = "",errorCode = "", dataErrMsg = "", refInvId = "", String tranId = "", ctin = "", posStateCode = "", docNo = "", docDateStr = "",errorCode = "", dataErrMsg = "", refInvId = "",
refInvDtStr = "", preGST = "", portCode = "", gstDateFormat = "", customerName = "", regUreg = "UNREGISTERED", refInvDtStr = "", preGST = "", portCode = "", gstDateFormat = "", customerName = "", regUreg = "UNREGISTERED",
siteGSTStCode = "", isRCM = "", tranTypeStr = "", interIntraExp = "", suppGSTStCode = "", crdrType = ""; siteGSTStCode = "", isRCM = "", tranTypeStr = "", interIntraExp = "", suppGSTStCode = "", crdrType = "", refId="";
boolean noDataFound = false; boolean noDataFound = false;
double amount =0.0, gstRate = 0.0, taxableAmt = 0.0, cessAmt = 0.0; double amount =0.0, gstRate = 0.0, taxableAmt = 0.0, cessAmt = 0.0;
...@@ -5502,7 +5502,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -5502,7 +5502,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
closeResources(hdrRs, hdrPstmt); closeResources(hdrRs, hdrPstmt);
hdrSql = " SELECT GDH.TRAN_ID, GDH.DOC_NO, GDH.DOC_DATE, GDH.CUST_NAME, CASE WHEN GDH.TRAN_TYPE='05' THEN 'YES' ELSE 'NO' END AS RCM, " hdrSql = " SELECT GDH.TRAN_ID, GDH.DOC_NO, GDH.DOC_DATE, GDH.CUST_NAME, CASE WHEN GDH.TRAN_TYPE='05' THEN 'YES' ELSE 'NO' END AS RCM, "
+ " GEN.UDF_STR1, GDH.TAX_REG_NO, GDH.GST_CODE, GDH.AMOUNT, GDH.ORDER_NO FROM GST_DATA_HDR GDH, GENCODES GEN " + " GEN.UDF_STR1, GDH.TAX_REG_NO, GDH.GST_CODE, GDH.AMOUNT, GDH.ORDER_NO, GDH.REF_ID FROM GST_DATA_HDR GDH, GENCODES GEN "
+ " WHERE GDH.REC_TYPE = ? AND GDH.PRD_CODE = ? AND GDH.SITE_CODE = ? AND GDH.SUBMIT_STATUS = ? " + " WHERE GDH.REC_TYPE = ? AND GDH.PRD_CODE = ? AND GDH.SITE_CODE = ? AND GDH.SUBMIT_STATUS = ? "
+ " AND GDH.TRAN_TYPE NOT IN ('10','11','12','13') AND GEN.MOD_NAME='W_GSTR_PURC' AND GEN.FLD_NAME='TRAN_TYPE' " + " AND GDH.TRAN_TYPE NOT IN ('10','11','12','13') AND GEN.MOD_NAME='W_GSTR_PURC' AND GEN.FLD_NAME='TRAN_TYPE' "
+ " AND GDH.TRAN_TYPE=GEN.FLD_VALUE ORDER BY GDH.TRAN_TYPE,GDH.DOC_DATE,GDH.DOC_NO "; + " AND GDH.TRAN_TYPE=GEN.FLD_VALUE ORDER BY GDH.TRAN_TYPE,GDH.DOC_DATE,GDH.DOC_NO ";
...@@ -5529,6 +5529,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -5529,6 +5529,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
posStateCode = checkNull(hdrRs.getString("GST_CODE")); posStateCode = checkNull(hdrRs.getString("GST_CODE"));
amount = Double.parseDouble(String.format("%.2f",hdrRs.getDouble("AMOUNT"))); amount = Double.parseDouble(String.format("%.2f",hdrRs.getDouble("AMOUNT")));
portCode = checkNull(hdrRs.getString("ORDER_NO")); portCode = checkNull(hdrRs.getString("ORDER_NO"));
refId = checkNull(hdrRs.getString("REF_ID"));
if(docDate!=null) if(docDate!=null)
{ {
...@@ -5575,21 +5576,41 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -5575,21 +5576,41 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
XSSFRow dataRow = inWrdSuppdataSheet.createRow(inWrdSuppdataRow++); XSSFRow dataRow = inWrdSuppdataSheet.createRow(inWrdSuppdataRow++);
dataRow.createCell(0).setCellValue(docNo);
XSSFCell docDateCell = dataRow.createCell(1); /*Changed By Kaustubh on 27 Feb 2018 start
* Adding new value that is ref_id in first column and pass blank in transaction date
* */
dataRow.createCell(0).setCellValue(refId);
dataRow.createCell(1).setCellValue("");
/*XSSFCell docDateCell = dataRow.createCell(1);
if(docDateStr!=null && docDateStr.trim().length()>0) if(docDateStr!=null && docDateStr.trim().length()>0)
{ {
docDateCell.setCellValue(gstDateFormatSdf.parse(docDateStr)); docDateCell.setCellValue(gstDateFormatSdf.parse(docDateStr));
docDateCell.setCellStyle(dateCellStyle); docDateCell.setCellStyle(dateCellStyle);
} }*/
/*Changed By Kaustubh on 27 Feb 2018 end */
dataRow.createCell(2).setCellValue(customerName); dataRow.createCell(2).setCellValue(customerName);
dataRow.createCell(3).setCellValue(interIntraExp); dataRow.createCell(3).setCellValue(interIntraExp);
dataRow.createCell(4).setCellValue(isRCM); dataRow.createCell(4).setCellValue(isRCM);
dataRow.createCell(5).setCellValue(tranTypeStr); dataRow.createCell(5).setCellValue(tranTypeStr);
dataRow.createCell(6).setCellValue(ctin); dataRow.createCell(6).setCellValue(ctin);
dataRow.createCell(7).setCellValue(posStateCode+"-"+checkNull(stateCodeHMap.get(posStateCode))); dataRow.createCell(7).setCellValue(posStateCode+"-"+checkNull(stateCodeHMap.get(posStateCode)));
dataRow.createCell(8).setCellValue(""); //TODO need to check with devendra sir
dataRow.createCell(9).setCellValue(""); //TODO need to check with devendra sir /*Changed By Kaustubh on 27 Feb 2018 start */
dataRow.createCell(8).setCellValue(docNo);
XSSFCell docDateCell = dataRow.createCell(9);
if(docDateStr!=null && docDateStr.trim().length()>0)
{
docDateCell.setCellValue(gstDateFormatSdf.parse(docDateStr));
docDateCell.setCellStyle(dateCellStyle);
}
//dataRow.createCell(9).setCellValue("");
/*Changed By Kaustubh on 27 Feb 2018 End */
dataRow.createCell(10).setCellValue(amount); dataRow.createCell(10).setCellValue(amount);
dataRow.createCell(11).setCellValue(taxableAmt); dataRow.createCell(11).setCellValue(taxableAmt);
dataRow.createCell(12).setCellValue(gstRate); dataRow.createCell(12).setCellValue(gstRate);
......
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