Changes made to create offline GSTR1 excel file as per latest GSTN format

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@177708 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-gst/ibase/webitm/ejb/gst/GSTDataSubmitWizEJB.java

@@ -3440,7 +3440,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 		String tranType = "", tranId = "", udfStr1 = "", udfStr2 = "", udfStr3 = "", ctin = "", posStateCode = "", docNo = "", docDateStr = "",
 			   reverseCharge = "", etin = "", invoiceType = "", errorCode = "", dataErrMsg = "", stateDscr = "", refInvId = "", refInvDtStr = "",
 			   preGST = "", refTranType = "", customerType = "", portCode = "", shipBillNo = "", shipBillDateStr = "", gstDateFormat = "", supplyType = "",
-			   itcType = "", itcTypeDescr = "", supplierName = "", placeOfBusiness = "", documentType = "";
+			   itcType = "", itcTypeDescr = "", supplierName = "", placeOfBusiness = "", documentType = "", customerName = "";
 		boolean noDataFound = false;
 		double amount =0.0, gstRate = 0.0, taxableAmt = 0.0, cessAmt = 0.0, nilAmount = 0.0, exemtAmount = 0.0, nonGSTAmount = 0.0, compDlrAmount = 0.0;
 		int b2bRowNum = 4, b2clRowNum = 4, b2csRowNum = 4, cdnrRowNum = 4, cdnurRowNum = 4, expRowNum = 4, atRowNum = 4, atAdjRowNum = 4, hsnRowNum = 4,
@@ -3562,6 +3562,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 						portCode = checkNull(hdrRs.getString("ORDER_NO"));
 						shipBillNo = checkNull(hdrRs.getString("LR_NO"));
 						shipBillDate = hdrRs.getDate("LR_DATE");
+						customerName = checkNull(hdrRs.getString("CUST_NAME"));
 						
 						sql = "SELECT DESCR FROM STATE WHERE GST_CODE = ? ";
 						pstmt = conn.prepareStatement(sql);
@@ -3643,21 +3644,22 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 								XSSFRow dataRow = dataSheet.createRow(b2bRowNum++);
 
 								dataRow.createCell(0).setCellValue(ctin);
-								dataRow.createCell(1).setCellValue(docNo);
-								XSSFCell docDateCell = dataRow.createCell(2);
+								dataRow.createCell(1).setCellValue(customerName);
+								dataRow.createCell(2).setCellValue(docNo);
+								XSSFCell docDateCell = dataRow.createCell(3);
 								if(docDateStr!=null && docDateStr.trim().length()>0)
 								{
 									docDateCell.setCellValue(gstDateFormatSdf.parse(docDateStr));
 									docDateCell.setCellStyle(dateCellStyle);
 								}
-								dataRow.createCell(3).setCellValue(amount);
-								dataRow.createCell(4).setCellValue(posStateCode+"-"+stateDscr);
-								dataRow.createCell(5).setCellValue(reverseCharge);
-								dataRow.createCell(6).setCellValue(invoiceType);
-								dataRow.createCell(7).setCellValue(etin);
-								dataRow.createCell(8).setCellValue(gstRate);
-								dataRow.createCell(9).setCellValue(taxableAmt);
-								dataRow.createCell(10).setCellValue(cessAmt);
+								dataRow.createCell(4).setCellValue(amount);
+								dataRow.createCell(5).setCellValue(posStateCode+"-"+stateDscr);
+								dataRow.createCell(6).setCellValue(reverseCharge);
+								dataRow.createCell(7).setCellValue(invoiceType);
+								dataRow.createCell(8).setCellValue(etin);
+								dataRow.createCell(9).setCellValue(gstRate);
+								dataRow.createCell(10).setCellValue(taxableAmt);
+								dataRow.createCell(11).setCellValue(cessAmt);
 							}
 							closeResources(detRs, detPstmt);
 						}
@@ -3757,28 +3759,29 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 								XSSFRow dataRow = dataSheet.createRow(cdnrRowNum++);
 								
 								dataRow.createCell(0).setCellValue(ctin);
-								dataRow.createCell(1).setCellValue(refInvId);
-								XSSFCell refInvDateCell = dataRow.createCell(2);
+								dataRow.createCell(1).setCellValue(customerName);
+								dataRow.createCell(2).setCellValue(refInvId);
+								XSSFCell refInvDateCell = dataRow.createCell(3);
 								if(refInvDtStr!=null && refInvDtStr.trim().length()>0)
 								{
 									refInvDateCell.setCellValue(gstDateFormatSdf.parse(refInvDtStr));
 									refInvDateCell.setCellStyle(dateCellStyle);
 								}
-								dataRow.createCell(3).setCellValue(docNo);
-								XSSFCell docDateCell = dataRow.createCell(4);
+								dataRow.createCell(4).setCellValue(docNo);
+								XSSFCell docDateCell = dataRow.createCell(5);
 								if(docDateStr!=null && docDateStr.trim().length()>0)
 								{
 									docDateCell.setCellValue(gstDateFormatSdf.parse(docDateStr));
 									docDateCell.setCellStyle(dateCellStyle);
 								}
-								dataRow.createCell(5).setCellValue(udfStr2);
-								dataRow.createCell(6).setCellValue("07-Others");
-								dataRow.createCell(7).setCellValue(posStateCode+"-"+stateDscr);
-								dataRow.createCell(8).setCellValue(amount);
-								dataRow.createCell(9).setCellValue(gstRate);
-								dataRow.createCell(10).setCellValue(taxableAmt);
-								dataRow.createCell(11).setCellValue(cessAmt);
-								dataRow.createCell(12).setCellValue(preGST);
+								dataRow.createCell(6).setCellValue(udfStr2);
+								dataRow.createCell(7).setCellValue("07-Others");
+								dataRow.createCell(8).setCellValue(posStateCode+"-"+stateDscr);
+								dataRow.createCell(9).setCellValue(amount);
+								dataRow.createCell(10).setCellValue(gstRate);
+								dataRow.createCell(11).setCellValue(taxableAmt);
+								dataRow.createCell(12).setCellValue(cessAmt);
+								dataRow.createCell(13).setCellValue(preGST);
 							}
 							closeResources(detRs, detPstmt);
 						}