F17BBAS001 updated source for changing submission type to submit status.

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

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

@@ -9,7 +9,7 @@ package ibase.webitm.ejb.gst;
 import ibase.utility.E12GenericUtility;
 import ibase.webitm.ejb.ITMDBAccessEJB;
 import ibase.webitm.ejb.ValidatorEJB;
-import ibase.webitm.ejb.dis.DistUtility;
+import ibase.webitm.util.gst.GSTCommonUtil;
 import ibase.webitm.utility.ITMException;
 import java.rmi.RemoteException;
 import java.sql.Connection;
@@ -154,7 +154,9 @@ public class GSTRecoWizEJB extends ValidatorEJB implements GSTRecoWizEJBLocal, G
 					
 					count = 0;
 					//sql = " SELECT COUNT(*) FROM GST_DATA_HDR WHERE TAX_REG_NO = ? AND PRD_CODE = ? ";
-					sql = " SELECT COUNT(*) FROM GST_DATA_HDR WHERE TAX_REG_NO = ? AND PRD_CODE = ? AND SUBMISSION_TYPE = 'P' AND REC_TYPE = '2' AND RECO_STATUS ! = 'M' ";
+					//sql = " SELECT COUNT(*) FROM GST_DATA_HDR WHERE TAX_REG_NO = ? AND PRD_CODE = ? AND SUBMISSION_TYPE = 'P' AND REC_TYPE = '2' AND RECO_STATUS ! = 'M' ";
+					sql = " SELECT COUNT(*) FROM GST_DATA_HDR WHERE TAX_REG_NO = ? AND PRD_CODE = ? AND SUBMIT_STATUS = 'P' AND REC_TYPE = '2' "
+						+ " AND (CASE WHEN RECO_STATUS IS NULL THEN 'A' ELSE RECO_STATUS END)  != 'M' ";
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1, gstin);
 					pstmt.setString(2, prdCode);
@@ -447,7 +449,8 @@ public class GSTRecoWizEJB extends ValidatorEJB implements GSTRecoWizEJBLocal, G
 								  +" AND G.TAX_REG_NO = ? AND G.PRD_CODE = ? AND G.SUBMISSION_TYPE = 'P' AND G.RECO_STATUS ! = 'M' ";*/
 						
 						sql = " SELECT CUST_CODE,DOC_NO FROM GST_DATA_HDR WHERE "
-							+ " TAX_REG_NO = ? AND PRD_CODE = ? AND SUBMISSION_TYPE = 'P' AND REC_TYPE = '2' AND RECO_STATUS ! = 'M' ";
+							+ " TAX_REG_NO = ? AND PRD_CODE = ? AND SUBMIT_STATUS = 'P' AND REC_TYPE = '2' AND "
+							+ " (CASE WHEN RECO_STATUS IS NULL THEN 'A' ELSE RECO_STATUS END)  != 'M' ";
 						
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1, gstin);
@@ -510,8 +513,15 @@ public class GSTRecoWizEJB extends ValidatorEJB implements GSTRecoWizEJBLocal, G
 									pstmt.close();pstmt=null;
 								}
 								
-								DistUtility utility = new DistUtility();
-								suppImgPath = utility.getImagePath("w_gstWiz", suppCode , suppName , "customer", null);
+								try
+								{
+									GSTCommonUtil utility = new GSTCommonUtil();
+									suppImgPath = utility.getImagePath("w_gstWiz", suppCode , suppName , "customer", conn);
+								}
+								catch(Exception e)
+								{
+									System.out.println("Excpetion while getting image for Customer"+e.getMessage());
+								}
 							 
 							 	valueXmlString.append("<supp_code>").append("<![CDATA["+suppCode+"]]>").append("</supp_code>");
 								valueXmlString.append("<supp_name>").append("<![CDATA["+suppName+"]]>").append("</supp_name>");
@@ -529,7 +539,7 @@ public class GSTRecoWizEJB extends ValidatorEJB implements GSTRecoWizEJBLocal, G
 										 	
 										 	String orderDate = "",docDate = "";
 										 	
-										 	sql = " SELECT ORDER_DATE, DOC_DATE, DOC_NO, AMOUNT, SITE_CODE, RECO_STATUS FROM GST_DATA_HDR WHERE DOC_NO = ? AND SUBMISSION_TYPE = 'P' ";
+										 	sql = " SELECT ORDER_DATE, DOC_DATE, DOC_NO, AMOUNT, SITE_CODE, RECO_STATUS FROM GST_DATA_HDR WHERE DOC_NO = ? AND SUBMIT_STATUS = 'P' ";
 											pstmt = conn.prepareStatement(sql);
 											pstmt.setString(1, invoiceID);
 											rs = pstmt.executeQuery();
@@ -592,18 +602,21 @@ public class GSTRecoWizEJB extends ValidatorEJB implements GSTRecoWizEJBLocal, G
 												sql = " SELECT D.TRAN_ID,D.LINE_NO,D.STATUS,D.GS_CODE,D.TAXABLE_AMT,D.IGST_PERC,D.IGST_AMT,D.CGST_PERC,D.CGST_AMT, "
 												    	+ " D.SGST_PERC,D.SGST_AMT,D.GS_DESCR,D.UNIT,D.QUANTITY,D.SUPPLY_TYPE,D.CESS_PERC,D.CESS_AMT,D.REMARKS "
 												    	+ " FROM GST_DATA_HDR H, GST_DATA_DET D WHERE H.TRAN_ID = D.TRAN_ID "
-												    	+ " AND H.DOC_NO = ? AND H.SUBMISSION_TYPE = ? AND H.REC_TYPE = ? ORDER BY D.GS_CODE ";
+												    	+ " AND H.DOC_NO = ? AND H.SUBMIT_STATUS = ? AND H.REC_TYPE = ? "
+												    	+ " AND TAX_REG_NO = ? ORDER BY D.GS_CODE ";
 												pstmtDet = conn.prepareStatement(sql);
 												pstmtDet.setString(1, invoiceID);
 												pstmtDet.setString(2, submissionType);
 												pstmtDet.setString(3, "2");
+												pstmtDet.setString(4, gstin);
 												rsDet = pstmtDet.executeQuery();
 												while (rsDet.next())
 												{
 													gstrDataCount++;
 													
 													domIDGstr++;
-													valueXmlString.append("<gstr"+j+" domID='"+domIDGstr+"'>");
+													/*valueXmlString.append("<gstr"+j+" domID='"+domIDGstr+"'>");*/
+													valueXmlString.append("<gstr"+j+" domID='"+domIDInvoice+"'>");
 														valueXmlString.append("<tran_id>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("TRAN_ID"))+"]]>").append("</tran_id>");
 														valueXmlString.append("<line_no>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("LINE_NO"))+"]]>").append("</line_no>");
 														valueXmlString.append("<status>").append("<![CDATA["+checkNullAndTrim(rsDet.getString("STATUS"))+"]]>").append("</status>");
@@ -637,14 +650,30 @@ public class GSTRecoWizEJB extends ValidatorEJB implements GSTRecoWizEJBLocal, G
 												
 												if(j == 2)
 												{
-													gstrDataCount = gstrDataCountTemp - gstrDataCount;
+													System.out.println("GSTR1 Count["+gstrDataCountTemp+"] GSTR2 Count["+gstrDataCount+"]");
 													
-													for(int x = 1 ;x<=gstrDataCount ; x++)
+													if(gstrDataCountTemp < gstrDataCount)
 													{
-														valueXmlString.append("<gstr"+j+">");
-															System.out.println("For making blank row as GSTR2 data not found for this row");
-														valueXmlString.append("</gstr"+j+">");
+														gstrDataCount = gstrDataCount - gstrDataCountTemp;
+														
+														for(int x = 1 ;x<=gstrDataCount ; x++)
+														{
+															valueXmlString.append("<gstr1>");
+																System.out.println("For making blank row as GSTR1 data not found for this row");
+															valueXmlString.append("</gstr1>");
+														}
 													}
+													else
+													{	
+														gstrDataCount = gstrDataCountTemp - gstrDataCount;
+														
+														for(int x = 1 ;x<=gstrDataCount ; x++)
+														{
+															valueXmlString.append("<gstr"+j+">");
+																System.out.println("For making blank row as GSTR2 data not found for this row");
+															valueXmlString.append("</gstr"+j+">");
+														}
+													}	
 												}
 												gstrDataCountTemp = gstrDataCount;
 											}