Skip to content

B
business-java
Commit 3894aa9c authored by steurwadkar's avatar steurwadkar
Browse files
Options

F17ABAS001 GST offline file download components commit 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@163239 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 27494337
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 16 deletions
webitm-gst/ibase/webitm/ejb/gst/GSTDataSubmitWizEJB.java
View file @ 3894aa9c
...@@ -3141,8 +3141,11 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -3141,8 +3141,11 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
dataRow.createCell(0).setCellValue(ctin); dataRow.createCell(0).setCellValue(ctin);
dataRow.createCell(1).setCellValue(docNo); dataRow.createCell(1).setCellValue(docNo);
XSSFCell docDateCell = dataRow.createCell(2); XSSFCell docDateCell = dataRow.createCell(2);
docDateCell.setCellValue(gstDateFormatSdf.parse(docDateStr)); if(docDateStr!=null && docDateStr.trim().length()>0)
docDateCell.setCellStyle(dateCellStyle); {
docDateCell.setCellValue(gstDateFormatSdf.parse(docDateStr));
docDateCell.setCellStyle(dateCellStyle);
}
dataRow.createCell(3).setCellValue(amount); dataRow.createCell(3).setCellValue(amount);
dataRow.createCell(4).setCellValue(posStateCode+"-"+stateDscr); dataRow.createCell(4).setCellValue(posStateCode+"-"+stateDscr);
dataRow.createCell(5).setCellValue(reverseCharge); dataRow.createCell(5).setCellValue(reverseCharge);
...@@ -3173,8 +3176,11 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -3173,8 +3176,11 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
dataRow.createCell(0).setCellValue(docNo); dataRow.createCell(0).setCellValue(docNo);
XSSFCell docDateCell = dataRow.createCell(1); XSSFCell docDateCell = dataRow.createCell(1);
docDateCell.setCellValue(gstDateFormatSdf.parse(docDateStr)); if(docDateStr!=null && docDateStr.trim().length()>0)
docDateCell.setCellStyle(dateCellStyle); {
docDateCell.setCellValue(gstDateFormatSdf.parse(docDateStr));
docDateCell.setCellStyle(dateCellStyle);
}
dataRow.createCell(2).setCellValue(amount); dataRow.createCell(2).setCellValue(amount);
dataRow.createCell(3).setCellValue(posStateCode+"-"+stateDscr); dataRow.createCell(3).setCellValue(posStateCode+"-"+stateDscr);
dataRow.createCell(4).setCellValue(gstRate); dataRow.createCell(4).setCellValue(gstRate);
...@@ -3216,7 +3222,14 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -3216,7 +3222,14 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
calendar.set(2017, 06, 01); calendar.set(2017, 06, 01);
Date gstStartDate = calendar.getTime(); Date gstStartDate = calendar.getTime();
preGST = refInvDate.before(gstStartDate) ? "Y" : "N"; if(refInvDate!=null)
{
preGST = refInvDate.before(gstStartDate) ? "Y" : "N";
}
else
{
preGST = "";
}
XSSFSheet dataSheet = retDataWorkbook.getSheet("cdnr"); XSSFSheet dataSheet = retDataWorkbook.getSheet("cdnr");
...@@ -3236,12 +3249,18 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -3236,12 +3249,18 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
dataRow.createCell(0).setCellValue(ctin); dataRow.createCell(0).setCellValue(ctin);
dataRow.createCell(1).setCellValue(redInvId); dataRow.createCell(1).setCellValue(redInvId);
XSSFCell refInvDateCell = dataRow.createCell(2); XSSFCell refInvDateCell = dataRow.createCell(2);
refInvDateCell.setCellValue(gstDateFormatSdf.parse(refInvDtStr)); if(refInvDtStr!=null && refInvDtStr.trim().length()>0)
refInvDateCell.setCellStyle(dateCellStyle); {
refInvDateCell.setCellValue(gstDateFormatSdf.parse(refInvDtStr));
refInvDateCell.setCellStyle(dateCellStyle);
}
dataRow.createCell(3).setCellValue(docNo); dataRow.createCell(3).setCellValue(docNo);
XSSFCell docDateCell = dataRow.createCell(4); XSSFCell docDateCell = dataRow.createCell(4);
docDateCell.setCellValue(gstDateFormatSdf.parse(docDateStr)); if(docDateStr!=null && docDateStr.trim().length()>0)
docDateCell.setCellStyle(dateCellStyle); {
docDateCell.setCellValue(gstDateFormatSdf.parse(docDateStr));
docDateCell.setCellStyle(dateCellStyle);
}
dataRow.createCell(5).setCellValue(udfStr2); dataRow.createCell(5).setCellValue(udfStr2);
dataRow.createCell(6).setCellValue("07-Others"); dataRow.createCell(6).setCellValue("07-Others");
dataRow.createCell(7).setCellValue(posStateCode+"-"+stateDscr); dataRow.createCell(7).setCellValue(posStateCode+"-"+stateDscr);
...@@ -3259,7 +3278,14 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -3259,7 +3278,14 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
calendar.set(2017, 06, 01); calendar.set(2017, 06, 01);
Date gstStartDate = calendar.getTime(); Date gstStartDate = calendar.getTime();
preGST = refInvDate.before(gstStartDate) ? "Y" : "N"; if(refInvDate!=null)
{
preGST = refInvDate.before(gstStartDate) ? "Y" : "N";
}
else
{
preGST = "";
}
if(refInvDate.after(gstStartDate)) if(refInvDate.after(gstStartDate))
{ {
...@@ -3308,13 +3334,19 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -3308,13 +3334,19 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
dataRow.createCell(0).setCellValue(customerType); dataRow.createCell(0).setCellValue(customerType);
dataRow.createCell(1).setCellValue(docNo); dataRow.createCell(1).setCellValue(docNo);
XSSFCell docDateCell = dataRow.createCell(2); XSSFCell docDateCell = dataRow.createCell(2);
docDateCell.setCellValue(gstDateFormatSdf.parse(docDateStr)); if(docDateStr!=null && docDateStr.trim().length()>0)
docDateCell.setCellStyle(dateCellStyle); {
docDateCell.setCellValue(gstDateFormatSdf.parse(docDateStr));
docDateCell.setCellStyle(dateCellStyle);
}
dataRow.createCell(3).setCellValue(udfStr2); dataRow.createCell(3).setCellValue(udfStr2);
dataRow.createCell(4).setCellValue(redInvId); dataRow.createCell(4).setCellValue(redInvId);
XSSFCell refInvDateCell = dataRow.createCell(5); XSSFCell refInvDateCell = dataRow.createCell(5);
refInvDateCell.setCellValue(gstDateFormatSdf.parse(refInvDtStr)); if(refInvDtStr!=null && refInvDtStr.trim().length()>0)
refInvDateCell.setCellStyle(dateCellStyle); {
refInvDateCell.setCellValue(gstDateFormatSdf.parse(refInvDtStr));
refInvDateCell.setCellStyle(dateCellStyle);
}
dataRow.createCell(6).setCellValue("07-Others"); dataRow.createCell(6).setCellValue("07-Others");
dataRow.createCell(7).setCellValue(posStateCode+"-"+stateDscr); dataRow.createCell(7).setCellValue(posStateCode+"-"+stateDscr);
dataRow.createCell(8).setCellValue(amount); dataRow.createCell(8).setCellValue(amount);
...@@ -3345,8 +3377,11 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -3345,8 +3377,11 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
dataRow.createCell(0).setCellValue(udfStr2); dataRow.createCell(0).setCellValue(udfStr2);
dataRow.createCell(1).setCellValue(docNo); dataRow.createCell(1).setCellValue(docNo);
XSSFCell docDateCell = dataRow.createCell(2); XSSFCell docDateCell = dataRow.createCell(2);
docDateCell.setCellValue(gstDateFormatSdf.parse(docDateStr)); if(docDateStr!=null && docDateStr.trim().length()>0)
docDateCell.setCellStyle(dateCellStyle); {
docDateCell.setCellValue(gstDateFormatSdf.parse(docDateStr));
docDateCell.setCellStyle(dateCellStyle);
}
dataRow.createCell(3).setCellValue(amount); dataRow.createCell(3).setCellValue(amount);
dataRow.createCell(4).setCellValue(portCode); dataRow.createCell(4).setCellValue(portCode);
dataRow.createCell(5).setCellValue(shipBillNo); dataRow.createCell(5).setCellValue(shipBillNo);
......
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