commit changes related to data submission on GSTR portal

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

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

@@ -362,6 +362,8 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 				}
 			}
 			
+			System.out.println("currentYearTurnover28"+currentYearTurnover+"grossTurnover"+grossTurnover);
+			
 			System.out.println("returnsType["+returnsType+"] action ["+action+"]");
 			
 			if("SUBMIT".equalsIgnoreCase(action) || "FILE".equalsIgnoreCase(action))
@@ -552,7 +554,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 					recType = "2";
 				}
 				
-				sql = "SELECT TRAN_ID, SUBMIT_STATUS FROM GST_DATA_HDR WHERE PRD_CODE = ? AND SITE_CODE = ? AND REC_TYPE = ?";
+				sql = "SELECT TRAN_ID, SUBMIT_STATUS FROM GST_DATA_HDR WHERE PRD_CODE = ? AND SITE_CODE = ? AND REC_TYPE = ? AND SUBMIT_STATUS IN ('U','D','N')";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, periodCode);
 				pstmt.setString(2, siteCode);
@@ -1646,6 +1648,8 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 						docIssued.docDetails = docDetailsList;
 					}
 					
+					System.out.println("currentYearTurnover29"+currentYearTurnover+"grossTurnover29"+grossTurnover);
+					
 					gstr1 = new GSTR1();
 					gstr1.gstin = gstin;
 					gstr1.financialPeriod = periodCode;
@@ -2168,6 +2172,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 					gstr1 = new GSTR1();
 					gstr1.gstin = gstin;
 					gstr1.financialPeriod = periodCode;
+					//gstr1.grossTurnOver = Double.valueOf(grossTurnover);
 					gstr1.grossTurnOver = Double.valueOf(grossTurnover);
 					gstr1.currentGrossTurnOver = Double.valueOf(currentYearTurnover);