Updated changes in sales trends query

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

webitm-dashboard/ibase/dashboard/scm/ejb/SalesTrends.java

@@ -94,7 +94,13 @@ public class SalesTrends extends ValidatorEJB implements SalesTrendsLocal, Sales
 			
 			sqlCurrYear = "select DSS.DOC_DATE,"+
 				    " TO_CHAR(DSS.doc_date,'MON') DSS_MONTH, " + 
-				    " TO_CHAR(DSS.doc_date,'YYYY') DSS_YEAR, " + 
+				    " 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, " + 
@@ -110,11 +116,37 @@ public class SalesTrends extends ValidatorEJB implements SalesTrendsLocal, Sales
 					" DSS.REPL_QTY, " + 
 					" DSS.FREE_QTY, " + 
 					" DSS.GROSS_SALES_VALUE " + 
-					" from DWH_SALES_SUM DSS " + 
+					" 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.LEVEL_CODE__HIER" + 
+					" )" + 
+					" AND ORG_STRUCTURE.EMP_CODE = EMPLOYEE.EMP_CODE(+)" + 
+					" ) ORG_STRUCT ON DSS.LEVEL_CODE__HIER = 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 " + 
-					" WHERE  " + 
-					" ISER.item_ser       >= '"+itemser_fm+"' " + 
+					" 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+"' "
 					+ period1;
 			
@@ -160,13 +192,10 @@ public class SalesTrends extends ValidatorEJB implements SalesTrendsLocal, Sales
 						if(growth1 != null ) {
 							rowData.put("GROWTH",growth1);
 							System.out.println("growthvalue rowData if "+rowData);
-
 						}
 						else {
 							rowData.put("GROWTH",0.0);
 							System.out.println("growthvalue rowData else "+rowData);
-
-						
 						}
 					
 
@@ -501,19 +530,17 @@ public class SalesTrends extends ValidatorEJB implements SalesTrendsLocal, Sales
 			Double growthValue=0.0;
 			
 			JSONObject netSummaryObj=netSummary.optJSONObject(i);
-			System.out.println("first for loop ["+i+"] netSummaryObj ["+netSummaryObj+"]");
 			String month=netSummaryObj.optString("DSS_MONTH");
 			String year=netSummaryObj.optString("DSS_YEAR");
 			Double netAmount=netSummaryObj.optDouble("NET_AVG");
-			System.out.println("calculateGross1 month ["+month+"] year ["+year+"] netAmount ["+netAmount+"]");
 			for(int j = 0; j < netSummaryPrv.length();  j++) {
 				JSONObject netSummaryObjPvs=netSummaryPrv.optJSONObject(j);
-				System.out.println("first for loop ["+j+"] netSummaryObj ["+netSummaryObjPvs+"]");
+				System.out.println("first for loop i ["+i+"] j ["+j+"]");
 				String monthPvs=netSummaryObjPvs.optString("DSS_MONTH");
 				if(monthPvs.equalsIgnoreCase(month)) {
 					String yearPvs=netSummaryObjPvs.optString("DSS_YEAR");
 					Double netAmountPvs=netSummaryObjPvs.optDouble("NET_AVG");
-					System.out.println("calculateGross1 monthPvs ["+monthPvs+"] yearPvs ["+yearPvs+"] netAmountPvs ["+netAmountPvs+"]");
+					System.out.println("calculateGross1 monthPvs ["+monthPvs+"] yearPvs ["+yearPvs+"] netAmountPvs ["+netAmountPvs+"]" +"] netAmount ["+netAmount+"]");
 					Double minusNet=netAmount-netAmountPvs;
 					if(netAmount != 0.0) {
 						growthValue=(minusNet/netAmount)*100;