changes in HSN NULL sheet query

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

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

@@ -4544,7 +4544,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";
+					hdrSql = "SELECT * FROM GST_DATA_HDR WHERE REC_TYPE = ? AND PRD_CODE = ? AND SITE_CODE = ? AND SUBMIT_STATUS = ? AND TRAN_TYPE != '50' ORDER BY DOC_DATE, DOC_NO";
 					hdrPstmt = conn.prepareStatement(hdrSql);
 					hdrPstmt.setString(1, recType);
 					hdrPstmt.setString(2, periodCode);
@@ -4601,6 +4601,11 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 							shipBillDateStr = gstDateFormatSdf.format(shipBillDate);
 						}
 
+						if("05".equalsIgnoreCase(tranType))
+						{
+							reverseCharge ="Y";
+						}
+						
 						System.out.println("docDateStr["+docDateStr+"]");
 
 						sql = "SELECT UDF_STR1, UDF_STR2, UDF_STR3 FROM GENCODES WHERE MOD_NAME='W_GSTR_PURC' AND FLD_NAME='TRAN_TYPE' AND FLD_VALUE = ? ";
@@ -5291,7 +5296,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 					int rowNo = 1;
 					
 					sql = " SELECT H.REF_ID, H.REF_SER, D.TAXABLE_AMT FROM GST_DATA_HDR H, GST_DATA_DET D WHERE H.TRAN_ID = D.TRAN_ID AND H.SITE_CODE = ? AND H.PRD_CODE = ? AND H.REC_TYPE = ? "
-						+ " AND D.GS_CODE IS NULL and Taxable_Amt <> null ";
+						+ " AND D.GS_CODE IS NULL  AND D.TAXABLE_AMT is not NULL";
 					
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1, siteCode);