set tran_id and tran_date in first two coloumn if sheet...

set tran_id  and tran_date in first two coloumn if sheet 'Credit_Debit_Note_Payable'  and null value unit now capture in UOM-Invalid Sheet

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

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

@@ -42,6 +42,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.json.XML;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.HdrDocument;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -5296,8 +5297,15 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 					
 					rowNo = 1;
 					
-					sql = " SELECT H.REF_ID, H.REF_SER, D.GS_CODE, D.TAXABLE_AMT, D.UNIT 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.UNIT NOT IN (SELECT DISTINCT UNIT FROM UOM) ";
+					/* Chnaged By Kaustubh on Date 16 May 2017 because UNIT with null value is not capture in existing query  Start */   
+					
+					/*sql = " SELECT H.REF_ID, H.REF_SER, D.GS_CODE, D.TAXABLE_AMT, D.UNIT 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.UNIT NOT IN (SELECT DISTINCT UNIT FROM UOM) ";*/
+					
+					  sql = " SELECT H.REF_ID, H.REF_SER, D.GS_CODE, D.TAXABLE_AMT, D.UNIT 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.UNIT NOT IN (SELECT DISTINCT UNIT FROM UOM) OR D.UNIT is null)";
+					
+					/* Chnaged By Kaustubh on Date 16 May 2017 because UNIT with null value is not capture in existing query  END */   
 					
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1, siteCode);
@@ -5310,6 +5318,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 					{
 						if(!isUnitNullSheetAdded)
 						{
+							System.out.println("inside UOM1");
 							retDataWorkbook.createSheet("UOM INVALID-BLANK");
 							isUnitNullSheetAdded = true;
 							
@@ -6686,7 +6695,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 				
 				closeResources(hdrRs, hdrPstmt);
 				
-				hdrSql = " SELECT GDH.TRAN_ID, GDH.DOC_NO, GDH.DOC_DATE, GDH.CUST_NAME, GEN.UDF_STR1, GEN.UDF_STR2, GDH.TAX_REG_NO, "
+				hdrSql = " SELECT GDH.TRAN_ID, GDH.REF_ID, GDH.CHG_DATE, GDH.DOC_NO, GDH.DOC_DATE, GDH.CUST_NAME, GEN.UDF_STR1, GEN.UDF_STR2, GDH.TAX_REG_NO, "
 					   + " GDH.GST_CODE, GDH.REF_ID__INV, GDH.REF_DATE__INV, GDH.AMOUNT  FROM GST_DATA_HDR GDH, GENCODES GEN "
 					   + " WHERE GDH.REC_TYPE = ? AND GDH.PRD_CODE = ? AND GDH.SITE_CODE = ? AND GDH.SUBMIT_STATUS = ? "
 					   + " AND GDH.TRAN_TYPE IN ('10','11','12','13') AND GEN.MOD_NAME='W_GSTR_PURC' AND GEN.FLD_NAME='TRAN_TYPE' "
@@ -6704,7 +6713,13 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 				
 				while(hdrRs.next())
 				{
+					
+					chgDateStr ="";
+					chgDate = null;
+	
 					tranId = hdrRs.getString("TRAN_ID");
+					refId = hdrRs.getString("REF_ID");
+					chgDate = hdrRs.getDate("CHG_DATE");
 					docNo = checkNull(hdrRs.getString("DOC_NO"));
 					docDate = hdrRs.getDate("DOC_DATE");
 					customerName = checkNull(hdrRs.getString("CUST_NAME"));
@@ -6720,6 +6735,10 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 					{
 						docDateStr = gstDateFormatSdf.format(docDate);
 					}
+					if(chgDate!=null)
+					{
+						chgDateStr =  gstDateFormatSdf.format(chgDate);
+					}
 					if(ctin.trim().length() > 0)
 					{
 						regUreg = "REGISTERED"; 
@@ -6755,13 +6774,25 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 						
 						XSSFRow dataRow = crdrPaydataSheet.createRow(crdrPaydataRow++);
 						
-						dataRow.createCell(0).setCellValue(docNo);
+					/**
+					 * Changed by Kaustubh on 17 May 2018 to put tran_id value instead of doc_no and tran_date instead of 
+					 * doc_date in column no. 1 and 2 respectively           
+					 * start  	
+					 */
+						dataRow.createCell(0).setCellValue(refId);
+						System.out.println("inside chg_date::->");
 						XSSFCell docDateCell = dataRow.createCell(1);
-						if(docDateStr!=null && docDateStr.trim().length()>0)
+						if(chgDateStr!=null && chgDateStr.trim().length()>0)
 						{
-							docDateCell.setCellValue(gstDateFormatSdf.parse(docDateStr));
+							docDateCell.setCellValue(gstDateFormatSdf.parse(chgDateStr));
 							docDateCell.setCellStyle(dateCellStyle);
 						}
+					
+					/**
+					 * Changed by Kaustubh on 17 May 2018 to put tran_id value instead of doc_no and tran_date instead of 
+					 * doc_date in column no. 1 and 2 respectively           
+					 * End  	
+					 */	
 						dataRow.createCell(2).setCellValue(customerName);
 						dataRow.createCell(3).setCellValue("");//TODO need to check with devendra sir
 						dataRow.createCell(4).setCellValue(crdrType);