modify source code as per client requirment

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

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

@@ -78,7 +78,7 @@ public class Attrition extends ValidatorEJB implements AttritionRemote, Attritio
 					    +" WHEN SUBSTR( '"+month+"'   ,5,2)=1 THEN NVL(attr_apr,0)+NVL(attr_may,0)+NVL(attr_jun,0)+NVL(attr_jul,0)+NVL(attr_aug,0)+NVL(attr_sep,0)+NVL(attr_oct,0)+NVL(attr_nov,0)+NVL(attr_dec,0)+NVL(attr_jan,0)"
 					    +" WHEN SUBSTR( '"+month+"'   ,5,2)=2 THEN NVL(attr_apr,0)+NVL(attr_may,0)+NVL(attr_jun,0)+NVL(attr_jul,0)+NVL(attr_aug,0)+NVL(attr_sep,0)+NVL(attr_oct,0)+NVL(attr_nov,0)+NVL(attr_dec,0)+NVL(attr_jan,0)+NVL(attr_feb,0)"
 					    +" WHEN SUBSTR( '"+month+"'   ,5,2)=3 THEN NVL(attr_apr,0)+NVL(attr_may,0)+NVL(attr_jun,0)+NVL(attr_jul,0)+NVL(attr_aug,0)+NVL(attr_sep,0)+NVL(attr_oct,0)+NVL(attr_nov,0)+NVL(attr_dec,0)+NVL(attr_jan,0)+NVL(attr_feb,0)+NVL(attr_mar,0) END ) AS Ytd_attr"
-				        +" FROM SM_SALES_DIV_MST mst WHERE trim(mst.fin_year)= (CASE WHEN SUBSTR( '"+month+"'   ,5,2)<4 THEN SUBSTR( '"+month+"'   -100 ,1,4)||'-'||SUBSTR( '"+month+"'   ,3,2) ELSE SUBSTR( '"+month+"'   ,1,4)||'-' || SUBSTR( '"+month+"'   +100,3,2) END) AND '"+month+"'  =	'"+month+"' ) GROUP BY fin_year,SUBSTR('"+month+"' ,5,2) ORDER BY div_no ";
+				        +" FROM SM_SALES_DIV_MST mst WHERE trim(mst.fin_year)= (CASE WHEN SUBSTR( '"+month+"'   ,5,2)<4 THEN SUBSTR( '"+month+"'   -100 ,1,4)||'-'||SUBSTR( '"+month+"'   ,3,2) ELSE SUBSTR( '"+month+"'   ,1,4)||'-' || SUBSTR( '"+month+"'   +100,3,2) END) AND '"+month+"'  =	'"+month+"' ) GROUP BY fin_year,SUBSTR('"+month+"' ,5,2) ORDER BY div_code desc ";
 								
 			pstmt = conn.prepareStatement(sql);
 			rs = pstmt.executeQuery();

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

@@ -79,7 +79,7 @@ public class SalesInventory extends ValidatorEJB implements SalesInventoryRemote
 					" GROUP BY item_code UNION ALL SELECT item_code, SUM(cl_stk_qty) AS cl_stk FROM sun.inventory_spl WHERE inv_date= LAST_DAY(TO_DATE('"+month+"','yyyymm')) AND loc_code " +
 					" IN ( SELECT loc_code FROM LOC_SALABLE) GROUP BY item_code ) GROUP BY item_code ) CLSTK WHERE Sl.item_code= i.item_code AND ('"+month+"' = '"+month+"') AND i.item_sub_group NOT " +
 					" IN ('CU','BJ') AND sl.item_code=clstk.item_code(+) GROUP BY sl.item_ser, trim(i.item_sub_group_descr) HAVING SUM(sl.ytdsl)>0 ) GROUP BY item_ser,brand,ytdsl,ytdach,cl_stk,nomn HAVING " +
-					" ( ROUND(cl_stk/(ytdsl/nomn),1) "+nomns +") ) A , ITEMSER WHERE a.item_ser=ITEMSER.item_ser AND a.brand NOT LIKE 'DUMMY%'";
+					" ( ROUND(cl_stk/(ytdsl/nomn),1) "+nomns +") ) A , ITEMSER WHERE a.item_ser=ITEMSER.item_ser AND a.brand NOT LIKE 'DUMMY%' order by noofmth_invtry desc ";
 				  //" ( ROUND(cl_stk/(ytdsl/nomn),1) >= '"+from_mns+"' and ROUND(cl_stk/(ytdsl/nomn),1) <= '"+to_mns+"' ) ) A , ITEMSER WHERE a.item_ser=ITEMSER.item_ser AND a.brand NOT LIKE 'DUMMY%'";
 					
 			pstmt = conn.prepareStatement(sql);

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

@@ -1477,14 +1477,14 @@ public class SalesPerformance extends ValidatorEJB implements SalesPerformanceRe
 				    		+ "ROUND(SUM(a.sale_ytd_cy)/10000000,1) "
 				    		+" AS YTD_CY_SALES,ROUND(SUM(a.sale_ytd_ly)/10000000,1) AS YTD_LY_SALES, "
 				    		+" ROUND(SUM(a.hotrgt_ytd_cy)/10000000,1) AS YTD_HO_TRGT, "
-						   +" (CASE WHEN SUM (a.hotrgt_ytd_cy)= 0 THEN 0 ELSE "
-					+" (CASE WHEN ROUND(SUM (a.sale_ytd_cy)/SUM (a.hotrgt_ytd_cy)* 100,1) <-200 THEN -200 "
-				              +" WHEN ROUND(SUM (a.sale_ytd_cy)/SUM (a.hotrgt_ytd_cy)* 100,1) >200 THEN 200 ELSE "
-				              +" ROUND(SUM (a.sale_ytd_cy)/SUM (a.hotrgt_ytd_cy)* 100,1) END) end) AS YTD_ACH_PER, "					   
-										   +" (CASE WHEN SUM(a.sale_ytd_ly)<>0 "
-							  +" THEN (CASE WHEN ROUND(SUM(a.sale_ytd_cy - a.sale_ytd_ly)/SUM(a.sale_ytd_ly)*100,1) <-200 THEN -200 "
-				              +" WHEN ROUND(SUM(a.sale_ytd_cy - a.sale_ytd_ly)/SUM(a.sale_ytd_ly)*100,1) >200 THEN 200 ELSE "
-				              +" ROUND(SUM(a.sale_ytd_cy - a.sale_ytd_ly)/SUM(a.sale_ytd_ly)*100,1) END )"				    		
+						    + " (CASE WHEN SUM (a.hotrgt_ytd_cy)= 0 THEN 0 ELSE "
+					        +" (CASE WHEN ROUND(SUM (a.sale_ytd_cy)/SUM (a.hotrgt_ytd_cy)* 100,1) <-200 THEN -200 "
+				            +" WHEN ROUND(SUM (a.sale_ytd_cy)/SUM (a.hotrgt_ytd_cy)* 100,1) >200 THEN 200 ELSE "
+				            +" ROUND(SUM (a.sale_ytd_cy)/SUM (a.hotrgt_ytd_cy)* 100,1) END) end) AS YTD_ACH_PER, "					   
+							+" (CASE WHEN SUM(a.sale_ytd_ly)<>0 "
+							+" THEN (CASE WHEN ROUND(SUM(a.sale_ytd_cy - a.sale_ytd_ly)/SUM(a.sale_ytd_ly)*100,1) <-200 THEN -200 "
+				            +" WHEN ROUND(SUM(a.sale_ytd_cy - a.sale_ytd_ly)/SUM(a.sale_ytd_ly)*100,1) >200 THEN 200 ELSE "
+				            +" ROUND(SUM(a.sale_ytd_cy - a.sale_ytd_ly)/SUM(a.sale_ytd_ly)*100,1) END )"				    		
 				    		+" ELSE ROUND(0*100,1)  END) AS YTD_GR,"
 				    		+" ROUND(SUM(a.sale_Qrt1_cy)/10000000,1) AS Q1, " 
 				    		+" ROUND(SUM(a.sale_Qrt2_cy)/10000000,1) AS Q2,ROUND(SUM(a.sale_Qrt3_cy)/10000000,1) AS Q3, " 
@@ -1751,32 +1751,32 @@ public class SalesPerformance extends ValidatorEJB implements SalesPerformanceRe
                             +" SUBSTR('"+month+"' ,5,2)+9 ELSE SUBSTR('"+month+"' ,5,2)-3 END)/10000000,1) "
                             +" AS AVG_MTHLY,ROUND(SUM(a.sale_mth_cy)/10000000,1) AS MTH_CY_SALES, " 
                             +" ROUND(SUM(a.hotrgt_mth_cy)/10000000,1) AS MTH_HO_TRGT, " 
-    +" (CASE WHEN SUM (a.hotrgt_mth_cy)= 0 THEN 0 ELSE "
-	+" (CASE WHEN ROUND(SUM (a.sale_mth_cy)/SUM (a.hotrgt_mth_cy)*100,1) <-200 THEN -200 "
-              +" WHEN ROUND(SUM (a.sale_mth_cy)/SUM (a.hotrgt_mth_cy)*100,1) >200 THEN 200 ELSE "
-              +" ROUND(SUM (a.sale_mth_cy)/SUM (a.hotrgt_mth_cy)*100,1) END) end) AS MTH_ACH_PER, "                           
-		                	+" (CASE WHEN SUM(a.sale_mth_ly)<>0 "
-			  +" THEN (CASE WHEN ROUND(SUM(a.sale_mth_cy - a.sale_mth_ly)/SUM(a.sale_mth_ly)*100,1) <-200 THEN -200 "
-              +" WHEN ROUND(SUM(a.sale_mth_cy - a.sale_mth_ly)/SUM(a.sale_mth_ly)*100,1) >200 THEN 200 ELSE "
-              +" ROUND(SUM(a.sale_mth_cy - a.sale_mth_ly)/SUM(a.sale_mth_ly)*100,1) END )"
-                            +" ELSE ROUND(0*100,1)  END) AS MTH_GR,"
+						    +" (CASE WHEN SUM (a.hotrgt_mth_cy)= 0 THEN 0 ELSE "
+							+" (CASE WHEN ROUND(SUM (a.sale_mth_cy)/SUM (a.hotrgt_mth_cy)*100,1) <-200 THEN -200 "
+						    +" WHEN ROUND(SUM (a.sale_mth_cy)/SUM (a.hotrgt_mth_cy)*100,1) >200 THEN 200 ELSE "
+			                +" ROUND(SUM (a.sale_mth_cy)/SUM (a.hotrgt_mth_cy)*100,1) END) end) AS MTH_ACH_PER, "                           
+					        +" (CASE WHEN SUM(a.sale_mth_ly)<>0 "
+						    +" THEN (CASE WHEN ROUND(SUM(a.sale_mth_cy - a.sale_mth_ly)/SUM(a.sale_mth_ly)*100,1) <-200 THEN -200 "
+			                +" WHEN ROUND(SUM(a.sale_mth_cy - a.sale_mth_ly)/SUM(a.sale_mth_ly)*100,1) >200 THEN 200 ELSE "
+			                +" ROUND(SUM(a.sale_mth_cy - a.sale_mth_ly)/SUM(a.sale_mth_ly)*100,1) END )"
+			                +" ELSE ROUND(0*100,1)  END) AS MTH_GR,"
                             +" ROUND(SUM(a.sale_ytd_cy)/10000000,1) "
                             +" AS YTD_CY_SALES,ROUND(SUM(a.sale_ytd_ly)/10000000,1) AS YTD_LY_SALES, "
                             +" ROUND(SUM(a.hotrgt_ytd_cy)/10000000,1) AS YTD_HO_TRGT,(CASE WHEN SUM(a.sale_ytd_ly)<>0 "
-              +" THEN (CASE WHEN ROUND(SUM(a.sale_ytd_cy - a.sale_ytd_ly)/SUM(a.sale_ytd_ly)*100,1) <-200 THEN -200 "
-              +" WHEN ROUND(SUM(a.sale_ytd_cy - a.sale_ytd_ly)/SUM(a.sale_ytd_ly)*100,1) >200 THEN 200 ELSE "
-              +" ROUND(SUM(a.sale_ytd_cy - a.sale_ytd_ly)/SUM(a.sale_ytd_ly)*100,1) END )"              
-                            +" ELSE ROUND(0*100,1)  END) AS YTD_GR,ROUND(SUM(a.sale_Qrt1_cy)/10000000,1) AS Q1, " 
+			                + " THEN (CASE WHEN ROUND(SUM(a.sale_ytd_cy - a.sale_ytd_ly)/SUM(a.sale_ytd_ly)*100,1) <-200 THEN -200 "
+			                +" WHEN ROUND(SUM(a.sale_ytd_cy - a.sale_ytd_ly)/SUM(a.sale_ytd_ly)*100,1) >200 THEN 200 ELSE "
+			                +" ROUND(SUM(a.sale_ytd_cy - a.sale_ytd_ly)/SUM(a.sale_ytd_ly)*100,1) END )"              
+			                +" ELSE ROUND(0*100,1)  END) AS YTD_GR,ROUND(SUM(a.sale_Qrt1_cy)/10000000,1) AS Q1, " 
                             +" ROUND(SUM(a.sale_Qrt2_cy)/10000000,1) AS Q2,ROUND(SUM(a.sale_Qrt3_cy)/10000000,1) AS Q3, " 
                             +" ROUND(SUM(a.sale_Qrt4_cy)/10000000,1) AS Q4,ROUND(SUM(a.sale_ytd_cy)/100000/"
                             +" MAX(c.psr)/ (CASE WHEN SUBSTR('"+month+"' ,5,2)<4 THEN SUBSTR('"+month+"' ,5,2)+9 "
                             +" ELSE SUBSTR('"+month+"' ,5,2)-3 END) ,1) AS PMPM,SUM(b.pmpm_ly) AS PMPM_LY, "
                             +" ROUND(SUM(a.sale_ytd_cy-a.hotrgt_ytd_cy)/10000000,1) AS YTD_ACH_EXTRA, " 
                             +" CASE WHEN SUM (a.hotrgt_YTD_cy) = 0 THEN 0 ELSE "
-	+" (CASE WHEN ROUND(SUM (a.sale_YTD_cy)/SUM (a.hotrgt_YTD_cy)*100,1) <-200 THEN -200 "
-              +" WHEN ROUND(SUM (a.sale_YTD_cy)/SUM (a.hotrgt_YTD_cy)*100,1) >200 THEN 200 ELSE "
-              +" ROUND(SUM (a.sale_YTD_cy)/SUM (a.hotrgt_YTD_cy)*100,1) END) END AS YTD_ACH_PER, "                         
-                            +" (CASE WHEN SUM(a.sale_ytd_cy)<>0 THEN ROUND(SUM(a.retu_ytd_cy)/" 
+	                        +" (CASE WHEN ROUND(SUM (a.sale_YTD_cy)/SUM (a.hotrgt_YTD_cy)*100,1) <-200 THEN -200 "
+				            +" WHEN ROUND(SUM (a.sale_YTD_cy)/SUM (a.hotrgt_YTD_cy)*100,1) >200 THEN 200 ELSE "
+				            +" ROUND(SUM (a.sale_YTD_cy)/SUM (a.hotrgt_YTD_cy)*100,1) END) END AS YTD_ACH_PER, "                         
+				            +" (CASE WHEN SUM(a.sale_ytd_cy)<>0 THEN ROUND(SUM(a.retu_ytd_cy)/" 
                             +" SUM(a.sale_ytd_cy)*100,1) ELSE ROUND(0*100,1) END) AS RETU_YTD_PRCT "
                             +" FROM (SELECT dwh.fin_year , dwh.item_ser,SUM(sale_mth_cy) AS sale_mth_cy, "
                             +" SUM(sale_mth_ly) AS sale_mth_ly,SUM(trgt_mth_cy * (100+ NVL(brnd.HO_TRGT_INCR_PRCNT,0))"
@@ -1913,7 +1913,7 @@ public class SalesPerformance extends ValidatorEJB implements SalesPerformanceRe
                             +" WHERE trim(a.item_ser)=trim(b.div_code) AND b.fin_year=a.fin_year "
                             +" AND trim(a.item_ser)=trim(c.table_no) "
                             +" AND c.finyr = SUBSTR(a.fin_year,3,2)||SUBSTR(a.fin_year,6,2) "
-                            +" AND b.div_group <> 'OTHERS' AND b.div_group ='"+ divGrp + "' GROUP BY b.div_group,b.div_code,B.DIV_DESCR ORDER BY div_group,b.div_code";
+                            +" AND b.div_group <> 'OTHERS' AND b.div_group ='"+ divGrp + "' GROUP BY b.div_group,b.div_code,B.DIV_DESCR ORDER BY ROUND(SUM(a.sale_ytd_cy)/10000000,1) desc";
 								pstmt = conn.prepareStatement(sql);
 								rs = pstmt.executeQuery();
 								int count = 0;
@@ -2029,15 +2029,14 @@ public class SalesPerformance extends ValidatorEJB implements SalesPerformanceRe
 							+ "ROUND(sale_YTD_cy/10000000,2) AS sale_YTD_cy, "
 							+ "ROUND(sale_YTD_ly/10000000,2) AS sale_YTD_ly,"
                             +" CASE WHEN NVL(hotrgt_ytd_cy,0) = 0 THEN 0 ELSE "
-	+" (CASE WHEN ROUND(sale_YTD_cy/hotrgt_ytd_cy * 100,1) <-200 THEN -200 "
-              +" WHEN ROUND(sale_YTD_cy/hotrgt_ytd_cy * 100,1) >200 THEN 200 ELSE "
-              +" ROUND(sale_YTD_cy/hotrgt_ytd_cy * 100,1) END) END AS ho_ach_prcnt, "							
-                    	  + "(CASE WHEN NVL(sale_YTD_ly,0) <> 0 "
-						  
-              +" THEN (CASE WHEN ROUND((sale_YTD_cy -sale_YTD_ly)/ sale_YTD_ly* 100,1) <-200 THEN -200 "
-              +" WHEN ROUND((sale_YTD_cy -sale_YTD_ly)/ sale_YTD_ly* 100,1) >200 THEN 200 ELSE "
-              +" ROUND((sale_YTD_cy -sale_YTD_ly)/ sale_YTD_ly* 100,1) END )"              
-                            +" ELSE ROUND(0*100,1)  END) AS gr_prcnt, "						  
+	                       +" (CASE WHEN ROUND(sale_YTD_cy/hotrgt_ytd_cy * 100,1) <-200 THEN -200 "
+			               +" WHEN ROUND(sale_YTD_cy/hotrgt_ytd_cy * 100,1) >200 THEN 200 ELSE "
+			               +" ROUND(sale_YTD_cy/hotrgt_ytd_cy * 100,1) END) END AS ho_ach_prcnt, "							
+			               + "(CASE WHEN NVL(sale_YTD_ly,0) <> 0 "
+						   +" THEN (CASE WHEN ROUND((sale_YTD_cy -sale_YTD_ly)/ sale_YTD_ly* 100,1) <-200 THEN -200 "
+			               +" WHEN ROUND((sale_YTD_cy -sale_YTD_ly)/ sale_YTD_ly* 100,1) >200 THEN 200 ELSE "
+			                +" ROUND((sale_YTD_cy -sale_YTD_ly)/ sale_YTD_ly* 100,1) END )"              
+			                +" ELSE ROUND(0*100,1)  END) AS gr_prcnt, "						  
  							+ "c.psr AS NO_OF_SO,"
 							+ "ROUND(DWH.sale_ytd_cy/10000000/c.psr/(CASE WHEN SUBSTR('"+month+"',5,2)<4 	THEN SUBSTR('"+month+"',5,2)+9 ELSE SUBSTR('"+month+"',5,2)-3 END) ,2) AS PMPM,"
 							+ "ROUND(terr100/totterr*100,1) AS terr100prcnt"
@@ -2489,9 +2488,9 @@ public class SalesPerformance extends ValidatorEJB implements SalesPerformanceRe
 					+ " SUM (b.pmpm_ly) AS pmpm_ly, "
 					+ " ROUND (SUM (a.sale_ytd_cy - a.hotrgt_ytd_cy) / 10000000, 1) AS ytd_ach_extra,"
 					+"  (CASE WHEN   SUM (a.hotrgt_YTD_cy) =0 THEN  0 ELSE "
-	+" (CASE WHEN ROUND (SUM (a.sale_YTD_cy) / SUM (a.hotrgt_YTD_cy) * 100,  1) <-200 THEN -200 "
-              +" WHEN ROUND (SUM (a.sale_YTD_cy) / SUM (a.hotrgt_YTD_cy) * 100,  1) >200 THEN 200 ELSE "
-              +" ROUND (SUM (a.sale_YTD_cy) / SUM (a.hotrgt_YTD_cy) * 100,  1) END) end) AS YTD_ACH_PER, "                           
+	                +" (CASE WHEN ROUND (SUM (a.sale_YTD_cy) / SUM (a.hotrgt_YTD_cy) * 100,  1) <-200 THEN -200 "
+                    +" WHEN ROUND (SUM (a.sale_YTD_cy) / SUM (a.hotrgt_YTD_cy) * 100,  1) >200 THEN 200 ELSE "
+                    +" ROUND (SUM (a.sale_YTD_cy) / SUM (a.hotrgt_YTD_cy) * 100,  1) END) end) AS YTD_ACH_PER, "                           
 					+ " (CASE WHEN SUM (a.sale_ytd_cy) <> 0 THEN ROUND (SUM (a.retu_ytd_cy) / SUM (a.sale_ytd_cy) * 100,1) "
 					+ "  ELSE ROUND (0 * 100, 1) END) AS retu_ytd_prct " 
 					+ " FROM (SELECT   dwh.fin_year, dwh.item_ser,DWH.TERR_CODE,DWH.ZONE_DESCR, "
@@ -2650,7 +2649,7 @@ public class SalesPerformance extends ValidatorEJB implements SalesPerformanceRe
 					+ " AND b.div_group <> 'OTHERS' "
 					+ " AND trim(b.div_descr) =trim('"+divDescr +"')"
 					+ " GROUP BY b.div_group, b.div_code,CASE WHEN A.ZONE_DESCR IS NULL THEN 'xOTHERS' ELSE A.ZONE_DESCR END "
-					+ " ORDER BY div_group, b.div_code,CASE WHEN A.ZONE_DESCR IS NULL THEN 'xOTHERS' ELSE A.ZONE_DESCR END ";
+					+ " ORDER BY ROUND(SUM(a.sale_ytd_cy)/10000000,1) desc , CASE WHEN A.ZONE_DESCR IS NULL THEN 'xOTHERS' ELSE A.ZONE_DESCR END ";
 
 
 			pstmt = conn.prepareStatement(sql);
@@ -2961,7 +2960,7 @@ public class SalesPerformance extends ValidatorEJB implements SalesPerformanceRe
 					+ "  AND TRIM(b.div_DESCR) =trim('"+ divDescr + "')"
 					+ "  AND TRIM(A.ZONE_descr) = TRIM('" + zoneDescr + "')"
 					+ " GROUP BY b.div_group, b.div_code,B.DIV_DESCR,A.ZONE_CODE,A.ZONE_DESCR,CASE WHEN A.METRO_DSCR IS NULL THEN 'xOTHERS' ELSE  A.METRO_DSCR END "
-					+ " ORDER BY div_group, b.div_code,A.ZONE_CODE ,CASE WHEN A.METRO_DSCR IS NULL THEN 'xOTHERS' ELSE  A.METRO_DSCR END ";
+					+ " ORDER BY ROUND(SUM(a.sale_ytd_cy)/10000000,1) desc,CASE WHEN A.METRO_DSCR IS NULL THEN 'xOTHERS' ELSE  A.METRO_DSCR END ";
 
 
 
@@ -3268,7 +3267,7 @@ public class SalesPerformance extends ValidatorEJB implements SalesPerformanceRe
 					+ " AND trim(a.brand_name) =TRIM('"+brandName + "')"
 					+ " GROUP BY b.div_group,CASE WHEN A.ZONE_DESCR IS NULL THEN 'xOTHERS' ELSE A.ZONE_DESCR END,BRAND_NAME,BRAND_CODE "
 					+ " HAVING (ROUND (SUM (a.sale_mth_cy) / 10000000, 1) + ROUND (SUM (a.sale_ytd_cy) / 10000000, 1)) <>0 "
-					+ " ORDER BY div_group, CASE WHEN A.ZONE_DESCR IS NULL THEN 'xOTHERS' ELSE A.ZONE_DESCR END ,BRAND_NAME,BRAND_CODE ";
+					+ " ORDER BY ROUND(SUM(a.sale_ytd_cy)/10000000,1) desc, CASE WHEN A.ZONE_DESCR IS NULL THEN 'xOTHERS' ELSE A.ZONE_DESCR END ,BRAND_NAME,BRAND_CODE ";
 
 
   			pstmt = conn.prepareStatement(sql);
@@ -3580,7 +3579,7 @@ public class SalesPerformance extends ValidatorEJB implements SalesPerformanceRe
 					+ " AND TRIM(b.div_descr) =TRIM('"+ divDescr + "')"
 					+ " AND TRIM(A.ZONE_descr) = TRIM('" +zoneDescr + "')"
 					+ " GROUP BY b.div_group, b.div_code,b.div_descr,A.ZONE_CODE,A.ZONE_DESCR,BRAND_NAME,BRAND_CODE,CASE WHEN A.METRO_DSCR IS NULL THEN 'xOTHERS' ELSE  A.METRO_DSCR END "
-					+ " ORDER BY div_group, b.div_code,b.div_descr,A.ZONE_CODE ,BRAND_NAME,BRAND_CODE,CASE WHEN A.METRO_DSCR IS NULL THEN 'xOTHERS' ELSE  A.METRO_DSCR END";
+					+ " ORDER BY ROUND(SUM(a.sale_ytd_cy)/10000000,1) desc,CASE WHEN A.METRO_DSCR IS NULL THEN 'xOTHERS' ELSE  A.METRO_DSCR END";
 
 
   			pstmt = conn.prepareStatement(sql);