commit the changes regarding wrong invoice date capture in excel sheet.

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

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

@@ -3534,6 +3534,8 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 
 				if("1".equalsIgnoreCase(recType))
 				{
+					
+					
 					hdrSql = "SELECT * FROM GST_DATA_HDR WHERE REC_TYPE = ? AND PRD_CODE = ? AND SITE_CODE = ? AND SUBMIT_STATUS = ? ORDER BY DOC_DATE, DOC_NO";
 					hdrPstmt = conn.prepareStatement(hdrSql);
 					hdrPstmt.setString(1, recType);
@@ -3547,6 +3549,9 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 					{
 						stateDscr = "";
 						
+						refInvDtStr = "";
+						refInvDate = null;
+						
 						tranId = hdrRs.getString("TRAN_ID");
 						tranType = hdrRs.getString("TRAN_TYPE");
 						ctin = checkNull(hdrRs.getString("TAX_REG_NO"));
@@ -3562,7 +3567,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 						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);
 						pstmt.setString(1, posStateCode);
@@ -3589,7 +3594,6 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 						}
 
 						System.out.println("docDateStr["+docDateStr+"]");
-
 						sql = "SELECT UDF_STR1, UDF_STR2, UDF_STR3 FROM GENCODES WHERE MOD_NAME='W_GSTR' AND FLD_NAME='TRAN_TYPE' AND FLD_VALUE = ? ";
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1, tranType);
@@ -3727,6 +3731,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 						}*/
 						if("CDNR".equalsIgnoreCase(udfStr1))
 						{
+					
 							Calendar calendar = Calendar.getInstance();
 							calendar.set(2017, 06, 01);
 							Date gstStartDate = calendar.getTime();
@@ -3782,6 +3787,9 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 								dataRow.createCell(12).setCellValue(cessAmt);
 								dataRow.createCell(13).setCellValue(preGST);
 							}
+							
+								
+							
 							closeResources(detRs, detPstmt);
 						}
 						if("CDNUR".equalsIgnoreCase(udfStr1))
@@ -4447,6 +4455,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 				}
 				else if("2".equalsIgnoreCase(recType))
 				{
+					
 					hdrSql = "SELECT * FROM GST_DATA_HDR WHERE REC_TYPE = ? AND PRD_CODE = ? AND SITE_CODE = ? AND SUBMIT_STATUS = ? ORDER BY DOC_DATE, DOC_NO";
 					hdrPstmt = conn.prepareStatement(hdrSql);
 					hdrPstmt.setString(1, recType);
@@ -4460,6 +4469,9 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 					{
 						stateDscr = "";
 						
+						refInvDtStr = "";
+						refInvDate = null;
+						
 						tranId = hdrRs.getString("TRAN_ID");
 						tranType = hdrRs.getString("TRAN_TYPE");
 						ctin = checkNull(hdrRs.getString("TAX_REG_NO"));