Updated changes for sales Trend and purchase dashboard

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

webitm-dashboard/ibase/dashboard/fin/ejb/UpdateDWHPurchase.java

@@ -257,7 +257,7 @@ public class UpdateDWHPurchase implements Schedule
 		
 		try 
 		{
-			sql = "select ref_id, ref_ser, ref_date from dwh_tran_load where update_stat = 'P' and ref_ser = 'P-RCP'";
+			sql = "select ref_id, ref_ser, ref_date from dwh_tran_load where update_stat = 'P' and ref_ser in ('P-RCP','P-RET') ";
 			pstmt = conn.prepareStatement(sql);
 			rs = pstmt.executeQuery();
 			while(rs.next())

webitm-dashboard/ibase/dashboard/fin/ejb/UpdateDWHSalesSum.java

@@ -85,6 +85,7 @@ public class UpdateDWHSalesSum implements Schedule
 						.append("    POS_CODE,  ")
 						.append("    SALES_QTY,  ")
 						.append("    GROSS_SALES_VALUE,  ")
+						.append("    SALES_VALUE, ")
 						.append("    FREE_QTY,  ")
 						.append("    FREE_SALES_VALUE,  ")
 						.append("    NET_SALES_QTY,  ")
@@ -103,6 +104,7 @@ public class UpdateDWHSalesSum implements Schedule
 						.append("    REPL_RETURN_VALUE,  ")
 						.append("    RETURN_QTY,  ")
 						.append("    GROSS_RETURN_VALUE,    ")
+						.append("    RETURN_VALUE,    ")
 						.append("    NET_RETURN_VALUE,  ")
 						.append("    CGST_RATE,    ")
 						.append("    CGST_AMT,  ")
@@ -132,10 +134,11 @@ public class UpdateDWHSalesSum implements Schedule
 						.append("  DSSV.POS_CODE                                                                     AS POS_CODE, ")
 						.append("  SUM( DSSV.SALES_QTY )                                                              AS SALES_QTY, ")
 						.append("  SUM( DSSV.GROSS_SALES_VALUE - DSSV.DISC_AMT_INV )                                  AS GROSS_SALES_VALUE, ")
+						.append("  SUM( DSSV.GROSS_SALES_VALUE )                                                      AS SALES_VALUE, ")
 						.append("  SUM( DSSV.FREE_QTY )                                                               AS FREE_QTY, ")
 						.append("  SUM( DSSV.FREE_SALES_VALUE )                                                       AS FREE_SALES_VALUE, ")
 						.append("  SUM( DSSV.SALES_QTY         + DSSV.FREE_QTY + DSSV.REPL_QTY - DSSV.RETURN_QTY + DSSV.REPL_RETURN_QTY ) AS NET_SALES_QTY, ")
-						.append("  SUM( DSSV.GROSS_SALES_VALUE - DSSV.DISC_AMT_INV - DSSV.GROSS_RETURN_VALUE  - DSSV.DISC_AMT_RET + DSSV.REPL_RETURN_VALUE - DSSV.DISC_AMT_REPL_RET)  AS NET_SALES_VALUE, ")
+						.append("  SUM( ( DSSV.GROSS_SALES_VALUE - DSSV.DISC_AMT_INV ) - ( DSSV.GROSS_RETURN_VALUE  - DSSV.DISC_AMT_RET ) + ( DSSV.REPL_RETURN_VALUE - DSSV.DISC_AMT_REPL_RET ) )  AS NET_SALES_VALUE, ")
 						.append("  SUM( DSSV.REPL_QTY )                                                                       AS REPL_QTY, ")
 						.append("  SUM( DSSV.REPL_VALUE - DSSV.DISC_AMT_REPL)                                                 AS REPL_VALUE, ")
 						.append("  SUM( DSSV.SALEABLE_RETURN_QTY )                                                            AS SALEABLE_RETURN_QTY, ")
@@ -150,6 +153,7 @@ public class UpdateDWHSalesSum implements Schedule
 						.append("  SUM( DSSV.REPL_RETURN_VALUE - DSSV.DISC_AMT_REPL_RET)                                      AS REPL_RETURN_VALUE, ")
 						.append("  SUM( DSSV.RETURN_QTY )                                                                     AS RETURN_QTY, ")
 						.append("  SUM( DSSV.GROSS_RETURN_VALUE - DSSV.DISC_AMT_RET)                                          AS GROSS_RETURN_VALUE, ")
+						.append("  SUM( DSSV.GROSS_RETURN_VALUE )                                                             AS RETURN_VALUE, ")
 						.append("  SUM( DSSV.NET_RETURN_VALUE )                                                               AS NET_RETURN_VALUE, ")
 						.append("  DSSV.CGST_RATE, ")
 						.append("  SUM(DSSV.CGST_AMT) AS CGST_AMT, ")
@@ -286,7 +290,7 @@ public class UpdateDWHSalesSum implements Schedule
 						.append("      nvl(SRETURNDET.LOT_NO,'NA') as lot_no, ")
 						.append("      nvl(SRETURNDET.LINE_TYPE,'NA') as line_type, ")
 						.append("      SRETURN.TRAN_DATE, ")
-						.append("NVL((SELECT   ORG.POS_CODE ")
+						.append("       NVL((SELECT   ORG.POS_CODE ")
 						.append("            FROM  ORG_STRUCTURE_CUST ORG   ")
 						.append("            WHERE ORG.CUST_CODE=SRETURN.CUST_CODE  ")
 						.append("            AND ORG.VERSION_ID IN (SELECT V.VERSION_ID FROM VERSION V WHERE TO_DATE(SYSDATE) BETWEEN V.EFF_FROM AND V.VALID_UPTO) ")
@@ -510,7 +514,6 @@ public class UpdateDWHSalesSum implements Schedule
 						.append("  DSSV.IGST_RATE, ")
 						.append("  DSSV.REF_SER, ")
 						.append("  DSSV.ITEM_SER ")
-
 						;
 	
 						pstmt = userDbConn.prepareStatement(sql.toString());

webitm-dashboard/ibase/dashboard/module-resource/scm/Sales Trends/SQL/dwh_sales_procedure.sql

@@ -18,6 +18,7 @@ BEGIN
           POS_CODE, 
           SALES_QTY, 
           GROSS_SALES_VALUE, 
+          SALES_VALUE,
           FREE_QTY, 
           FREE_SALES_VALUE, 
           NET_SALES_QTY, 
@@ -36,6 +37,7 @@ BEGIN
           REPL_RETURN_VALUE, 
           RETURN_QTY, 
           GROSS_RETURN_VALUE,   
+          RETURN_VALUE,   
           NET_RETURN_VALUE, 
           CGST_RATE,   
           CGST_AMT, 
@@ -65,10 +67,11 @@ BEGIN
               DSSV.POS_CODE                                                                     AS POS_CODE,
               SUM( DSSV.SALES_QTY )                                                              AS SALES_QTY,
               SUM( DSSV.GROSS_SALES_VALUE - DSSV.DISC_AMT_INV )                                  AS GROSS_SALES_VALUE,
+              SUM( DSSV.GROSS_SALES_VALUE )                                                      AS SALES_VALUE,
               SUM( DSSV.FREE_QTY )                                                               AS FREE_QTY,
               SUM( DSSV.FREE_SALES_VALUE )                                                       AS FREE_SALES_VALUE,
               SUM( DSSV.SALES_QTY         + DSSV.FREE_QTY + DSSV.REPL_QTY - DSSV.RETURN_QTY + DSSV.REPL_RETURN_QTY ) AS NET_SALES_QTY,
-              SUM( DSSV.GROSS_SALES_VALUE - DSSV.DISC_AMT_INV - DSSV.GROSS_RETURN_VALUE  - DSSV.DISC_AMT_RET + DSSV.REPL_RETURN_VALUE - DSSV.DISC_AMT_REPL_RET)  AS NET_SALES_VALUE,
+              SUM( ( DSSV.GROSS_SALES_VALUE - DSSV.DISC_AMT_INV ) - ( DSSV.GROSS_RETURN_VALUE  - DSSV.DISC_AMT_RET ) + ( DSSV.REPL_RETURN_VALUE - DSSV.DISC_AMT_REPL_RET ) )  AS NET_SALES_VALUE,
               SUM( DSSV.REPL_QTY )                                                                       AS REPL_QTY,
               SUM( DSSV.REPL_VALUE - DSSV.DISC_AMT_REPL)                                                 AS REPL_VALUE,
               SUM( DSSV.SALEABLE_RETURN_QTY )                                                            AS SALEABLE_RETURN_QTY,
@@ -83,6 +86,7 @@ BEGIN
               SUM( DSSV.REPL_RETURN_VALUE - DSSV.DISC_AMT_REPL_RET)                                      AS REPL_RETURN_VALUE,
               SUM( DSSV.RETURN_QTY )                                                                     AS RETURN_QTY,
               SUM( DSSV.GROSS_RETURN_VALUE - DSSV.DISC_AMT_RET)                                          AS GROSS_RETURN_VALUE,
+              SUM( DSSV.GROSS_RETURN_VALUE )                                                             AS RETURN_VALUE,
               SUM( DSSV.NET_RETURN_VALUE )                                                               AS NET_RETURN_VALUE,
               DSSV.CGST_RATE,
               SUM(DSSV.CGST_AMT) AS CGST_AMT,

webitm-dashboard/ibase/dashboard/module-resource/scm/Sales Trends/SQL/dwh_sales_sum.sql

@@ -12,6 +12,7 @@ CREATE TABLE DWH_SALES_SUM
 
     SALES_QTY                   NUMBER(14,3),
     GROSS_SALES_VALUE           NUMBER(14,3),
+    SALES_VALUE                 NUMBER(14,3),
     FREE_QTY                    NUMBER(14,3),
     FREE_SALES_VALUE            NUMBER(14,3),
     NET_SALES_QTY               NUMBER(14,3),
@@ -33,6 +34,7 @@ CREATE TABLE DWH_SALES_SUM
     RETURN_QTY                  NUMBER(14,3),
     GROSS_RETURN_VALUE          NUMBER(14,3),
     NET_RETURN_VALUE            NUMBER(14,3),
+    RETURN_VALUE                NUMBER(14,3),
 
     CGST_RATE                   NUMBER(14,3),
     CGST_AMT                    NUMBER(14,3),