Skip to content

B
business-java
Commit 76ed8a7d authored by pborate's avatar pborate
Browse files
Options

Updated changes for sales trends dashboard 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@197311 ce508802-f39f-4f6c-b175-0d175dae99d5
parent ef1a21c5
Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 62 deletions
webitm-dashboard/ibase/dashboard/scm/ejb/SalesTrends.java
View file @ 76ed8a7d
......@@ -90,7 +90,7 @@ public class SalesTrends extends ValidatorEJB implements SalesTrendsLocal, Sales
JSONArray salesSummaryArr = null;
String salesTrendsData = "";
String sqlCurrYear = "" , sqlPrevYear = "";
String sqlPrevYear = "";
PreparedStatement pStmt = null;
ResultSet rs = null;
......@@ -103,72 +103,76 @@ public class SalesTrends extends ValidatorEJB implements SalesTrendsLocal, Sales
ConnDriver connDriver = new ConnDriver();
conn = connDriver.getConnectDB( getUserInfo().getTransDB() );
System.out.println("AFTER CONN ESTBD");
StringBuffer sqlCurrYear = new StringBuffer();
JSONObject rowData = null;
sqlCurrYear = "select DSS.DOC_DATE,"+
" TO_CHAR(DSS.doc_date,'MON') DSS_MONTH, " +
" TO_CHAR(DSS.doc_date,'YYYY') DSS_YEAR,"+
" DWH_HIERARCHY.LEVLE1," +
" DWH_HIERARCHY.LEVLE2," +
" DWH_HIERARCHY.LEVLE3," +
" DWH_HIERARCHY.LEVLE4," +
" DWH_HIERARCHY.LEVLE5," +
" DWH_HIERARCHY.LEVLE6," +
" DSS.CUST_CODE, " +
" (SELECT CUST_NAME from CUSTOMER where CUST_CODE = DSS.CUST_CODE) as CUST_NAME, " +
" DSS.SITE_CODE, " +
" (SELECT DESCR from SITE where SITE_CODE = DSS.SITE_CODE) as SITE_DESCR, " +
" DSS.ITEM_CODE, I.DESCR, " +
" I.ITEM_SER, " +
" ISER.DESCR AS ISER_DESCR, " +
" ISER.PRODUCT_LINE, " +
" (SELECT descr from GENCODES where RPAD(fld_value, 5, '' ) = ISER.PRODUCT_LINE) as PRODUCT_LINE_DESCR, " +
" DSS.NET_SALES_VALUE, " +
" DSS.SALES_QTY, " +
" DSS.FREE_SALES_VALUE, " +
" DSS.REPL_QTY, " +
" DSS.FREE_QTY, " +
" DSS.GROSS_SALES_VALUE " +
" from DWH_SALES_SUM DSS "+
" LEFT OUTER JOIN (" +
" SELECT ORG_STRUCTURE.POOL_CODE, ORG_STRUCTURE.POS_CODE, ORG_STRUCTURE.TABLE_NO,"+
" ORG_STRUCTURE.VERSION_ID" +
" FROM ORG_STRUCTURE, EMPLOYEE" +
" WHERE ORG_STRUCTURE.POOL_CODE IN ( SELECT ORG_STRUCTURE.POOL_CODE" +
" FROM ORG_STRUCTURE, DWH_SALES_SUM" +
" WHERE ORG_STRUCTURE.POS_CODE=DWH_SALES_SUM.POS_CODE" +
" )" +
" AND ORG_STRUCTURE.EMP_CODE = EMPLOYEE.EMP_CODE(+)" +
" ) ORG_STRUCT ON DSS.POS_CODE = ORG_STRUCT.POS_CODE" +
" LEFT OUTER JOIN ITEM I ON DSS.ITEM_CODE = I.ITEM_CODE " +
" LEFT OUTER JOIN ITEMSER ISER ON I.ITEM_SER = ISER.ITEM_SER,( "+
" select lv1.pos_code, lv1.table_no, lv1.version_id," +
" lv1.pos_code__repto, lv1.descr, lv1.level_no AS LEVLE1," +
" lv2.pos_code__repto, lv2.descr, lv2.level_no AS LEVLE2," +
" lv3.pos_code__repto, lv3.descr, lv3.level_no AS LEVLE3," +
" lv4.pos_code__repto, lv4.descr, lv4.level_no AS LEVLE4," +
" lv5.pos_code__repto, lv5.descr, lv5.level_no AS LEVLE5," +
" lv6.pos_code__repto, lv6.descr, lv6.level_no AS LEVLE6" +
" from org_structure lv1" +
" left outer join org_structure lv2 on lv1.pos_code__repto = lv2.pos_code" +
" left outer join org_structure lv3 on lv2.pos_code__repto = lv3.pos_code" +
" left outer join org_structure lv4 on lv3.pos_code__repto = lv4.pos_code " +
" left outer join org_structure lv5 on lv4.pos_code__repto = lv5.pos_code" +
" left outer join org_structure lv6 on lv5.pos_code__repto = lv6.pos_code" +
" ) DWH_HIERARCHY" +
" WHERE DWH_HIERARCHY.POS_CODE = ORG_STRUCT.POS_CODE" +
" AND DWH_HIERARCHY.TABLE_NO = ORG_STRUCT.TABLE_NO" +
" AND DWH_HIERARCHY.VERSION_ID = ORG_STRUCT.VERSION_ID" +
" AND ISER.item_ser >= '"+itemser_fm+"' " +
" AND ISER.item_ser <= '"+itemser_to+"' " +
" AND DSS.SITE_CODE >= '"+SITE_CODE_FR+"' " +
" AND DSS.SITE_CODE <= '"+SITE_CODE_TO+"' "
+ period1;
sqlCurrYear.append("select DSS.DOC_DATE,")
.append("TRAN_ID,REPL_RETURN_QTY,REPL_RETURN_VALUE,DISC_AMT,MRP,PTR, " )
.append("PTS,HSN_CODE,PACK,DUE_DATE, CGST_AMT,CGST_RATE,SGST_RATE,SGST_AMT,CITY,ITEM_BRAND, " )
.append(" TO_CHAR(DSS.doc_date,'MON') DSS_MONTH, " )
.append(" TO_CHAR(DSS.doc_date,'YYYY') DSS_YEAR,")
.append(" DWH_HIERARCHY.LEVLE1,")
.append(" DWH_HIERARCHY.LEVLE2," )
.append(" DWH_HIERARCHY.LEVLE3,")
.append(" DWH_HIERARCHY.LEVLE4,")
.append(" DWH_HIERARCHY.LEVLE5," )
.append(" DWH_HIERARCHY.LEVLE6," )
.append(" DSS.CUST_CODE, " )
.append(" DSS.IGST_RATE, " )
.append(" DSS.IGST_AMT, " )
.append(" (SELECT CUST_NAME from CUSTOMER where CUST_CODE = DSS.CUST_CODE) as CUST_NAME, " )
.append(" DSS.SITE_CODE, " )
.append(" (SELECT DESCR from SITE where SITE_CODE = DSS.SITE_CODE) as SITE_DESCR, ")
.append(" DSS.ITEM_CODE, I.DESCR, ")
.append(" I.ITEM_SER, " )
.append(" ISER.DESCR AS ISER_DESCR, ")
.append(" ISER.PRODUCT_LINE, " )
.append(" (SELECT descr from GENCODES where RPAD(fld_value, 5, '' ) = ISER.PRODUCT_LINE) as PRODUCT_LINE_DESCR, ")
.append(" DSS.NET_SALES_VALUE, " )
.append(" DSS.SALES_QTY, ")
.append(" DSS.FREE_SALES_VALUE, ")
.append(" DSS.REPL_QTY, " )
.append(" DSS.FREE_QTY, ")
.append(" DSS.GROSS_SALES_VALUE " )
.append(" from DWH_SALES_SUM DSS ")
.append(" LEFT OUTER JOIN (" )
.append(" SELECT ORG_STRUCTURE.POOL_CODE, ORG_STRUCTURE.POS_CODE, ORG_STRUCTURE.TABLE_NO,")
.append(" ORG_STRUCTURE.VERSION_ID" )
.append(" FROM ORG_STRUCTURE, EMPLOYEE")
.append(" WHERE ORG_STRUCTURE.POOL_CODE IN ( SELECT ORG_STRUCTURE.POOL_CODE" )
.append(" FROM ORG_STRUCTURE, DWH_SALES_SUM" )
.append(" WHERE ORG_STRUCTURE.POS_CODE=DWH_SALES_SUM.POS_CODE")
.append(" )" )
.append(" AND ORG_STRUCTURE.EMP_CODE = EMPLOYEE.EMP_CODE(+)" )
.append(" ) ORG_STRUCT ON DSS.POS_CODE = ORG_STRUCT.POS_CODE" )
.append(" LEFT OUTER JOIN ITEM I ON DSS.ITEM_CODE = I.ITEM_CODE " )
.append(" LEFT OUTER JOIN ITEMSER ISER ON I.ITEM_SER = ISER.ITEM_SER,( ")
.append(" select lv1.pos_code, lv1.table_no, lv1.version_id,")
.append(" lv1.pos_code__repto, lv1.descr, lv1.level_no AS LEVLE1,")
.append(" lv2.pos_code__repto, lv2.descr, lv2.level_no AS LEVLE2," )
.append(" lv3.pos_code__repto, lv3.descr, lv3.level_no AS LEVLE3,")
.append(" lv4.pos_code__repto, lv4.descr, lv4.level_no AS LEVLE4," )
.append(" lv5.pos_code__repto, lv5.descr, lv5.level_no AS LEVLE5," )
.append(" lv6.pos_code__repto, lv6.descr, lv6.level_no AS LEVLE6")
.append(" from org_structure lv1")
.append(" left outer join org_structure lv2 on lv1.pos_code__repto = lv2.pos_code")
.append(" left outer join org_structure lv3 on lv2.pos_code__repto = lv3.pos_code")
.append(" left outer join org_structure lv4 on lv3.pos_code__repto = lv4.pos_code " )
.append(" left outer join org_structure lv5 on lv4.pos_code__repto = lv5.pos_code")
.append(" left outer join org_structure lv6 on lv5.pos_code__repto = lv6.pos_code" )
.append(" ) DWH_HIERARCHY" )
.append(" WHERE DWH_HIERARCHY.POS_CODE = ORG_STRUCT.POS_CODE")
.append(" AND DWH_HIERARCHY.TABLE_NO = ORG_STRUCT.TABLE_NO" )
.append(" AND DWH_HIERARCHY.VERSION_ID = ORG_STRUCT.VERSION_ID" )
.append(" AND ISER.item_ser >= '"+itemser_fm+"' ")
.append(" AND ISER.item_ser <= '"+itemser_to+"' " )
.append(" AND DSS.SITE_CODE >= '"+SITE_CODE_FR+"' " )
.append(" AND DSS.SITE_CODE <= '"+SITE_CODE_TO+"' ")
.append( period1);
System.out.println("SQL QUERY EXECUTED ::::::::::::::::: " + sqlCurrYear );
pStmt = conn.prepareStatement( sqlCurrYear );
pStmt = conn.prepareStatement( sqlCurrYear.toString() );
rs = pStmt.executeQuery();
E12GenericUtility genericUtility = new E12GenericUtility();
String applDate=genericUtility.getApplDateFormat();
......@@ -182,6 +186,24 @@ public class SalesTrends extends ValidatorEJB implements SalesTrendsLocal, Sales
System.out.println("doc date "+docDate);
rowData = new JSONObject();
rowData.put("DOC_DATE", docDate);
rowData.put("TRAN_ID", rs.getString("TRAN_ID"));
rowData.put("REPL_RETURN_QTY", rs.getString("REPL_RETURN_QTY"));
rowData.put("REPL_RETURN_VALUE", rs.getString("REPL_RETURN_VALUE"));
rowData.put("DISC_AMT", rs.getString("DISC_AMT"));
rowData.put("MRP", rs.getString("MRP"));
rowData.put("PTR", rs.getString("PTR"));
rowData.put("PTS", rs.getString("PTS"));
rowData.put("HSN_CODE", rs.getString("HSN_CODE"));
rowData.put("DUE_DATE", rs.getString("DUE_DATE"));
rowData.put("IGST_RATE", rs.getString("IGST_RATE"));
rowData.put("IGST_AMT", rs.getString("IGST_AMT"));
rowData.put("CGST_AMT", rs.getString("CGST_AMT"));
rowData.put("CGST_RATE", rs.getString("CGST_RATE"));
rowData.put("SGST_RATE", rs.getString("SGST_RATE"));
rowData.put("SGST_AMT", rs.getString("SGST_AMT"));
rowData.put("CITY", rs.getString("CITY"));
rowData.put("ITEM_BRAND", rs.getString("ITEM_BRAND"));
rowData.put("MONTH", rs.getString("DSS_MONTH"));
rowData.put("ITEM_CODE", rs.getString("ITEM_CODE"));
rowData.put("SALES QTY", rs.getInt("SALES_QTY"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment