commit changes regarding invalid tran_type inserted .

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

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

@@ -3545,7 +3545,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 				
 				else if("6".equalsIgnoreCase(recType))
 				{
-					gstr3WorkBookPath = CommonConstants.JBOSSHOME + sep + "DOWNLOAD" + sep + "template" + sep + "GSTR3B_Offline_Template.xlsm";
+					gstr3WorkBookPath = CommonConstants.JBOSSHOME + sep + "DOWNLOAD" + sep + "template" + sep + "GSTR3B_Excel_Utility_V3.0.xlsm";
 					File gstr3ExcleFile = new File(gstr3WorkBookPath);
 					System.out.println("gstr3WorkBookPath"+gstr3WorkBookPath);
 					
@@ -6189,7 +6189,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 		String gstrWorkBookPath = "";
 		String sep = File.separator;
 		
-		String tranId = "", ctin = "", posStateCode = "", docNo = "", docDateStr = "",errorCode = "", dataErrMsg = "", refInvId = "", 
+		String tranId = "", ctin = "", posStateCode = "", docNo = "", docDateStr = "",tranDateStr="",errorCode = "", dataErrMsg = "", refInvId = "", 
 			   refInvDtStr = "", preGST = "", portCode = "", gstDateFormat = "", customerName = "", regUreg = "UNREGISTERED", 
 			   siteGSTStCode = "", isRCM = "", tranTypeStr = "", interIntraExp = "", suppGSTStCode = "", crdrType = "", refId="";
 		
@@ -6202,7 +6202,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 		
 		
 		String sql = "", hdrSql = "", detSql = "";
-		Date refInvDate = null , docDate = null;
+		Date refInvDate = null , docDate = null,trandate=null;
 		Connection conn = null;
 		PreparedStatement pstmt = null, hdrPstmt = null, detPstmt = null;
 		ResultSet rs = null, hdrRs = null, detRs = null;
@@ -6396,7 +6396,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 				
 				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.TRAN_DATE, 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, 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 = ? " 
 					   + " AND GDH.TRAN_TYPE NOT IN ('10','11','12','13') AND GEN.MOD_NAME='W_GSTR_PURC' AND GEN.FLD_NAME='TRAN_TYPE' "
@@ -6425,12 +6425,18 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 					amount = Double.parseDouble(String.format("%.2f",hdrRs.getDouble("AMOUNT")));
 					portCode = checkNull(hdrRs.getString("ORDER_NO"));
 					refId = checkNull(hdrRs.getString("REF_ID"));
+					trandate = hdrRs.getDate("TRAN_DATE");
 					
 					if(docDate!=null)
 					{
 						docDateStr = gstDateFormatSdf.format(docDate);
 					}
 					
+					if(trandate!=null)
+					{
+						tranDateStr = gstDateFormatSdf.format(trandate);
+					}
+					
 					if(ctin.trim().length() > 2)
 					{
 						suppGSTStCode = ctin.substring(0, 2); 
@@ -6477,14 +6483,17 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 						 * */
 						
 						dataRow.createCell(0).setCellValue(refId);
-						dataRow.createCell(1).setCellValue(""); 
-						/*XSSFCell docDateCell = dataRow.createCell(1);
-						if(docDateStr!=null && docDateStr.trim().length()>0)
-						{
-							docDateCell.setCellValue(gstDateFormatSdf.parse(docDateStr));
-							docDateCell.setCellStyle(dateCellStyle);
-						}*/
-						
+					
+							/* Chnaged By Kaustubh on 4 April 2018 add value in blank tran_date column start */
+							   //dataRow.createCell(1).setCellValue(""); 
+								XSSFCell tranDateCell = dataRow.createCell(1);
+								if(tranDateStr!=null && tranDateStr.trim().length()>0)
+								{
+									tranDateCell.setCellValue(gstDateFormatSdf.parse(tranDateStr));
+									tranDateCell.setCellStyle(dateCellStyle);
+								}
+							/* Chnaged By Kaustubh on 4 April 2018 add value in blank tran_date column end */
+								
 						/*Changed By Kaustubh on 27 Feb 2018 end  */
 						
 						dataRow.createCell(2).setCellValue(customerName);