F17ABAS001 GST API integration wizard source code commit

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

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

@@ -3367,7 +3367,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 		
 		String tranType = "", tranId = "", udfStr1 = "", udfStr2 = "", udfStr3 = "", ctin = "", posStateCode = "", docNo = "", docDateStr = "",
 			   reverseCharge = "", etin = "", invoiceType = "", errorCode = "", dataErrMsg = "", stateDscr = "", redInvId = "", refInvDtStr = "",
-			   preGST = "", refTranType = "", customerType = "", portCode = "", shipBillNo = "", shipBillDateStr = "", gstDateFormat = "";
+			   preGST = "", refTranType = "", customerType = "", portCode = "", shipBillNo = "", shipBillDateStr = "", gstDateFormat = "", supplyType = "";
 		boolean noDataFound = false;
 		double amount =0.0, gstRate = 0.0, taxableAmt = 0.0, cessAmt = 0.0, nilAmount = 0.0, exemtAmount = 0.0, nonGSTAmount = 0.0;
 		int b2bRowNum = 4, b2clRowNum = 4, b2csRowNum = 4, cdnrRowNum = 4, cdnurRowNum = 4, expRowNum = 4, atRowNum = 4, atAdjRowNum = 4, hsnRowNum = 4;
@@ -3603,7 +3603,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 							}
 							closeResources(detRs, detPstmt);
 						}
-						if("B2CS".equalsIgnoreCase(udfStr1))
+						/*if("B2CS".equalsIgnoreCase(udfStr1))
 						{
 							XSSFSheet dataSheet = retDataWorkbook.getSheet("b2cs");
 							
@@ -3630,7 +3630,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 								dataRow.createCell(5).setCellValue(etin);
 							}
 							closeResources(detRs, detPstmt);
-						}
+						}*/
 						if("CDNR".equalsIgnoreCase(udfStr1))
 						{
 							Calendar calendar = Calendar.getInstance();
@@ -3876,6 +3876,39 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 					}
 					closeResources(hdrRs, hdrPstmt);
 					
+					XSSFSheet b2csDataSheet = retDataWorkbook.getSheet("b2cs");
+					
+					sql = " SELECT GDH.GST_CODE AS GST_CODE, GDH.ECOM_REG_NO AS ECOM_REG_NO, GDD.SUPPLY_TYPE AS SUPPLY_TYPE, S.DESCR AS DESCR,"
+						+ " GDD.GST_RATE AS GST_RATE, SUM(GDD.TAXABLE_AMT) AS TAXABLE_AMT, SUM (GDD.CESS_AMT) AS CESS_AMT"
+						+ " FROM GST_DATA_HDR GDH, GST_DATA_DET GDD, STATE S"
+						+ " WHERE GDD.TRAN_ID = GDH.TRAN_ID AND GDH.GST_CODE=S.GST_CODE AND GDH.SITE_CODE = ? AND GDH.REC_TYPE = ? AND GDH.PRD_CODE = ?"
+						+ " AND GDH.SUBMIT_STATUS = ? AND GDH.TRAN_TYPE IN ('11','12','13','14') GROUP BY GDH.GST_CODE, ECOM_REG_NO, SUPPLY_TYPE, DESCR, GST_RATE";
+
+					pstmt = conn.prepareStatement(sql);
+					pstmt.setString(1, siteCode);
+					pstmt.setString(2, recType);
+					pstmt.setString(3, periodCode);
+					pstmt.setString(4, "P");
+					rs = pstmt.executeQuery();
+					while(rs.next())
+					{
+						supplyType = checkNull(rs.getString("SUPPLY_TYPE"));
+						etin = checkNull(rs.getString("ECOM_REG_NO"));
+						gstRate = Double.parseDouble(String.format("%.2f",rs.getDouble("GST_RATE")));
+						taxableAmt = Double.parseDouble(String.format("%.2f",rs.getDouble("TAXABLE_AMT")));
+						cessAmt = Double.parseDouble(String.format("%.2f",rs.getDouble("CESS_AMT")));
+						
+						XSSFRow dataRow = b2csDataSheet.createRow(b2csRowNum++);
+						
+						dataRow.createCell(0).setCellValue(supplyType);
+						dataRow.createCell(1).setCellValue(rs.getString("GST_CODE")+"-"+rs.getString("DESCR"));
+						dataRow.createCell(2).setCellValue(gstRate);
+						dataRow.createCell(3).setCellValue(taxableAmt);
+						dataRow.createCell(4).setCellValue(cessAmt);
+						dataRow.createCell(5).setCellValue(etin);
+					}
+					closeResources(rs, pstmt);
+					
 					XSSFSheet nilDataSheet = retDataWorkbook.getSheet("exemp");
 					
 					sql = " SELECT TRAN_TYPE,SUM(AMOUNT) AS AMOUNT FROM GST_DATA_HDR "
@@ -4030,20 +4063,20 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 						
 					XSSFSheet hsnDataSheet = retDataWorkbook.getSheet("hsn");
 					
-					sql = " SELECT GS_CODE, GS_DESCR, UNIT, DESCR, SUM(TOT_QTY) AS TOT_QTY, SUM(TOT_TAXVAL) AS TOT_TAXVAL, SUM(TOT_IAMT) AS TOT_IAMT, SUM(TOT_CAMT) AS TOT_CAMT, SUM(TOT_SAMT) AS TOT_SAMT, SUM(TOT_CSAMT) AS TOT_CSAMT FROM"
-						+ " (SELECT GDD.GS_CODE, GDD.GS_DESCR, GDD.UNIT, U.DESCR, SUM(GDD.QUANTITY) AS TOT_QTY, SUM(GDD.TAXABLE_AMT) AS TOT_TAXVAL,"
+					sql = " SELECT GS_CODE, UNIT, DESCR, SUM(TOT_QTY) AS TOT_QTY, SUM(TOT_TAXVAL) AS TOT_TAXVAL, SUM(TOT_IAMT) AS TOT_IAMT, SUM(TOT_CAMT) AS TOT_CAMT, SUM(TOT_SAMT) AS TOT_SAMT, SUM(TOT_CSAMT) AS TOT_CSAMT FROM"
+						+ " (SELECT GDD.GS_CODE, GDD.UNIT, U.DESCR, SUM(GDD.QUANTITY) AS TOT_QTY, SUM(GDD.TAXABLE_AMT) AS TOT_TAXVAL,"
 						+ " SUM(GDD.IGST_AMT) AS TOT_IAMT, SUM(CGST_AMT) AS TOT_CAMT, SUM(SGST_AMT) AS TOT_SAMT, SUM(CESS_AMT) AS TOT_CSAMT"
 						+ " FROM GST_DATA_HDR GDH, GST_DATA_DET GDD, UOM U"
 						+ " WHERE GDH.TRAN_ID = GDD.TRAN_ID AND GDD.GS_CODE IS NOT NULL AND GDH.REC_TYPE='1' AND GDD.UNIT=U.UNIT"
 						+ " AND GDH.SITE_CODE = ? AND GDH.PRD_CODE = ? AND GDH.TRAN_TYPE NOT IN ('29','31')"
-						+ " GROUP BY GDD.GS_CODE, GDD.GS_DESCR, GDD.UNIT, U.DESCR"
+						+ " GROUP BY GDD.GS_CODE, GDD.UNIT, U.DESCR"
 						+ " UNION ALL"
-						+ " SELECT GDD.GS_CODE, GDD.GS_DESCR, GDD.UNIT,  U.DESCR, -1*SUM(GDD.QUANTITY) AS TOT_QTY, -1*SUM(GDD.TAXABLE_AMT) AS TOT_TAXVAL,"
+						+ " SELECT GDD.GS_CODE, GDD.UNIT,  U.DESCR, -1*SUM(GDD.QUANTITY) AS TOT_QTY, -1*SUM(GDD.TAXABLE_AMT) AS TOT_TAXVAL,"
 						+ " -1*SUM(GDD.IGST_AMT) AS TOT_IAMT, -1*SUM(CGST_AMT) AS TOT_CAMT, -1*SUM(SGST_AMT) AS TOT_SAMT, -1*SUM(CESS_AMT) AS TOT_CSAMT"
 						+ " FROM GST_DATA_HDR GDH, GST_DATA_DET GDD, UOM U"
 						+ " WHERE GDH.TRAN_ID = GDD.TRAN_ID AND GDD.GS_CODE IS NOT NULL AND GDH.REC_TYPE='1'  AND GDD.UNIT=U.UNIT"
 						+ " AND GDH.SITE_CODE = ? AND GDH.PRD_CODE = ? AND GDH.TRAN_TYPE  IN ('29','31')"
-						+ " GROUP BY GDD.GS_CODE, GDD.GS_DESCR, GDD.UNIT, U.DESCR) GROUP BY GS_CODE, GS_DESCR, UNIT, DESCR";
+						+ " GROUP BY GDD.GS_CODE, GDD.UNIT, U.DESCR) GROUP BY GS_CODE, UNIT, DESCR";
 					
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1, siteCode);