commited to add new changes of GSTR1 and GSTR2 data queries.

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

webitm-gst-client/ibase/webitm/ejb/gstclient/GstDataPrc.java

@@ -6185,7 +6185,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 					}
 					
 					/**
-					  * 9B(1) Header DRNRCP Debit Note registered (DRNRCP)*	
+					  * 9B(1) Header  Debit Note registered (DRNRCP)*	
 					  */
 					{
 						 hdrSql = " select '' as  TRAN_ID, "
@@ -6278,7 +6278,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 						  		  //+" and (select count(1) from gst_data_hdr where ref_ser = 'S-INV' and ref_id = i.invoice_id ) = 0 ";
 						          +" and (select count(1) from gst_data_hdr where ref_ser = 'DRNRCP' and ref_id = i.invoice_id ) = 0 ";
 							/**
-							 * Detail  CDNR Credit Note registered 9B(1) (DRNRCP)*	
+							 * Detail  CDNR Debit  Note registered 9B(1) (DRNRCP)*	
 							 */
 							dtlSql = " select '' as  TRAN_ID, "
 								    +" it.line_no as LINE_NO, "
@@ -13068,7 +13068,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 				prvAssment = "",orderNo = "",remarks = "",submitStatus = "",
 				taxRegNo = "",recoStatus = "",ecomRegNo = "",refSer = "",stateCode = "",docType = "",
 				lineType = "",gsCode = "",gsDescr = "",unit = "",supplyType = "",remarksDet = "",distOrdTranID = "",
-				tranIDPorcp = "",gstType = "",remarksHdr = "", refID = "", itctype= "" ;
+				tranIDPorcp = "",gstType = "",remarksHdr = "", refID = "";
 		int srNoOld = 0;
 		String prdCodeGstHdr ;
 		String prdCodenew = ""; 
@@ -13111,10 +13111,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 					monthStr = ""+month+year;
 				}
 				System.out.println("Current Month is=["+monthStr+"]");
-*/
-				
-				
-				
+*/				
 				
 			/*	String prdCodenew=	new GenericUtility().getValidDateString("", new GenericUtility().getDBDateFormat(), "MMYYYY");
 				System.out.println("prdCodenew"+prdCodenew);*/
@@ -13129,8 +13126,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 				pstmtInsHdr = connGST.prepareStatement(sql);
 				
 				sql = " INSERT INTO GST_DATA_DET (TRAN_ID,LINE_NO,STATUS,SR_NO__OLD,LINE_TYPE,GS_CODE,TAXABLE_AMT,IGST_PERC,"
-					 +" IGST_AMT,CGST_PERC,CGST_AMT,SGST_PERC,SGST_AMT,GS_DESCR,UNIT,QUANTITY,SUPPLY_TYPE,CESS_PERC,CESS_AMT,REMARKS,ITC_TYPE,GST_RATE)"
-				     +" VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ";
+					 +" IGST_AMT,CGST_PERC,CGST_AMT,SGST_PERC,SGST_AMT,GS_DESCR,UNIT,QUANTITY,SUPPLY_TYPE,CESS_PERC,CESS_AMT,REMARKS,GST_RATE)"
+				     +" VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ";
 				//pstmtInsDet = connLocal.prepareStatement(sql);
 				pstmtInsDet = connGST.prepareStatement(sql);
 			
@@ -13138,7 +13135,6 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 				pstmtSelHdr = connGST.prepareStatement(sql);
 				pstmtSelHdr.setTimestamp(1, fromDate);
 				pstmtSelHdr.setTimestamp(2, toDate);
-				System.out.println("pstmtSelHdr"+pstmtSelHdr);
 				if("9A(1)".equals(tranSer))
 				{
 					pstmtSelHdr.setTimestamp(3, currMonthStartDate);
@@ -13191,13 +13187,6 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 					remarksHdr = rsSelHdr.getString("REMARKS");
 					refID = rsSelHdr.getString("REF_ID");
 					
-					if(sitecode == null)
-					{
-						
-						retString = itmDBAccessEJB.getErrorString("","VTBLNKSITE","","",connGST);
-						return retString;
-					}
-					
 					if("(6A) WPAY".equals(tranSer) || "(6A) WOPAY".equals(tranSer) || "(6B) SEWP".equals(tranSer) || "(6B) SEWOP".equals(tranSer) || "(6C) DE)".equals(tranSer))
 					{
 						lrDate = rsSelHdr.getTimestamp("LR_DATE");
@@ -13347,18 +13336,11 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							cessPerc = rsSelDet.getDouble("CESS_PERC");
 							cessAmt = rsSelDet.getDouble("CESS_AMT");
 							remarksDet = rsSelDet.getString("REMARKS");
-							/*added by kaustubh on 8 aug*/
-							itctype=rsSelDet.getString("ITC_TYPE");
-							/* commented by kaustubh on 21 july 2017*/
-							gstRate = rsSelDet.getDouble("GST_RATE");
 							
 							
-							if(gstRate == 0){
-								
-								itctype="no";
-							}
+							/* commented by kaustubh on 21 july 2017*/
+							gstRate = rsSelDet.getDouble("GST_RATE");
 							
-							System.out.println("itctype"+  itctype);
 							
 							int newgsDescr= gsDescr.length();
 							 
@@ -13405,9 +13387,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							pstmtInsDet.setDouble(18,cessPerc);	
 							pstmtInsDet.setDouble(19,cessAmt);
 							pstmtInsDet.setString(20,remarksDet);
-							/* added by kaustubh on 8 aug */
-							pstmtInsDet.setString(21,itctype);
-							pstmtInsDet.setDouble(22,gstRate);
+							pstmtInsDet.setDouble(21,gstRate);
 							
 						//	updCnt = pstmtInsDet.executeUpdate();
 							
@@ -13488,10 +13468,10 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 				buex.printStackTrace();
 				
 				int [] updateCounts = buex.getUpdateCounts();
-				/*for (int i = 0; i < updateCounts.length; i++)   commmeneted by kaustubh on 3 aug 2017
+				for (int i = 0; i < updateCounts.length; i++)
 				{
 					System.err.println("  Statement " + i + ":" + updateCounts[i]);
-				}*/
+				}
 				System.err.println(" Message: " + buex.getMessage());
 				System.err.println(" SQLSTATE: " + buex.getSQLState());
 				System.err.println(" Error code: " + buex.getErrorCode());