Updated changes for sales trend and purchase dashboard

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

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

@@ -83,7 +83,7 @@ public class UpdateDWHPurchase implements Schedule
 						.append("  ITEM_CODE , ") 
 						.append("  QUANTITY , ") 
 						.append("  LOT_NO, ") 
-						.append("  LOT_SL , ") 
+						.append("  LOT_SL, ") 
 						.append("  DISC_AMT , ") 
 						.append("  RATE, ") 
 						.append("  TAX_AMT , ") 
@@ -116,8 +116,8 @@ public class UpdateDWHPurchase implements Schedule
 						.append("  S.CITY, ") 
 						.append("  PRD.ITEM_CODE, ") 
 						.append("  PRD.QUANTITY , ") 
-						.append("  PRD.LOT_NO , ") 
-						.append("  PRD.LOT_SL , ") 
+						.append("  NVL(PRD.LOT_NO,'NA') AS  LOT_NO, ") 
+						.append("  NVL(PRD.LOT_SL,'NA') AS LOT_SL, ") 
 						.append("  PR.DISCOUNT AS DISC_AMT, ") 
 						.append("  PRD.RATE    AS RATE, ") 
 						.append("  PRD.TAX_AMT, ") 
@@ -126,8 +126,8 @@ public class UpdateDWHPurchase implements Schedule
 						.append("  PR.INVOICE_DATE, ") 
 						.append("  PR.DC_NO   AS CHALLAN_NO, ") 
 						.append("  PR.DC_DATE AS CHALLAN_DATE, ") 
-						.append("  (SELECT T.TRAN_NAME FROM TRANSPORTER T WHERE PR.TRAN_CODE =T.TRAN_CODE ") 
-						.append("  ) AS TRAN_NAME, ") 
+						.append("  NVL((SELECT TRAN_NAME FROM  TRANSPORTER T WHERE PR.TRAN_CODE =T.TRAN_CODE),'NA') ") 
+						.append("  AS TRAN_NAME, ") 
 						.append("  PR.LR_NO, ") 
 						.append("  PR.LR_DATE, ") 
 						.append("  PR.TRAN_TYPE, ") 

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

@@ -79,6 +79,7 @@ public class UpdateDWHSalesSum implements Schedule
 						.append("   SITE_CODE,   ")
 						.append("   CUST_CODE,   ")
 						.append("   ITEM_CODE,   ")
+						.append("   LOT_NO,   ")
 						.append("   DOC_DATE,   ")
 						.append("   POS_CODE,   ")
 						.append("   SALES_QTY,   ")
@@ -124,6 +125,7 @@ public class UpdateDWHSalesSum implements Schedule
 						.append("  DSSV.SITE_CODE                                                                     AS SITE_CODE, ")
 						.append("  DSSV.CUST_CODE                                                                     AS CUST_CODE, ")
 						.append("  DSSV.ITEM_CODE                                                                     AS ITEM_CODE, ")
+						.append("  NVL(DSSV.LOT_NO,'NA')                                                              AS LOT_NO, ")
 						.append("  DSSV.TRAN_DATE                                                                     AS DOC_DATE, ")
 						.append("  NVL((SELECT   ORG.POS_CODE ")
 						.append("        FROM  ORG_STRUCTURE_CUST ORG   ")
@@ -176,6 +178,7 @@ public class UpdateDWHSalesSum implements Schedule
 						.append("      INVOICE.SITE_CODE, ")
 						.append("      INVOICE.CUST_CODE, ")
 						.append("      INVOICE_TRACE.ITEM_CODE, ")
+						.append("      INVOICE_TRACE.LOT_NO, ")
 						.append("      INVOICE.TRAN_DATE, ")
 						.append("      INVOICE.INV_TYPE            AS TRAN_TYPE, ")
 						.append("      ITEM.HSN_NO                 AS HSN_CODE, ")
@@ -276,6 +279,7 @@ public class UpdateDWHSalesSum implements Schedule
 						.append("      SRETURN.SITE_CODE, ")
 						.append("      SRETURN.CUST_CODE, ")
 						.append("      SRETURNDET.ITEM_CODE, ")
+						.append("      SRETURNDET.LOT_NO, ")
 						.append("      SRETURN.TRAN_DATE, ")
 						.append("      SRETURN.TRAN_TYPE, ")
 						.append("      ITEM.HSN_NO       AS HSN_CODE, ")
@@ -478,6 +482,7 @@ public class UpdateDWHSalesSum implements Schedule
 						.append("  DSSV.SITE_CODE, ")
 						.append("  DSSV.CUST_CODE, ")
 						.append("  DSSV.ITEM_CODE, ")
+						.append("  DSSV.LOT_NO, ")
 						.append("  DSSV.TRAN_DATE, ")
 						.append("  DSSV.MRP, ")
 						.append("  DSSV.PTR, ")

webitm-dashboard/ibase/dashboard/module-resource/scm/Purchase/SQL/DWH_PURCHASE_PLSQL.sql

-
 create or replace PROCEDURE DWH_PURCH(
     AS_FR_DATE DATE,
     AS_TO_DATE DATE)
@@ -52,8 +51,8 @@ BEGIN
             S.CITY,
             PRD.ITEM_CODE,
             PRD.QUANTITY ,
-            PRD.LOT_NO ,
-            PRD.LOT_SL ,
+            NVL(PRD.LOT_NO,'NA') AS  LOT_NO,
+            NVL(PRD.LOT_SL,'NA') AS LOT_SL,
             PR.DISCOUNT AS DISC_AMT,
             PRD.RATE AS RATE,
             PRD.TAX_AMT,
@@ -62,7 +61,7 @@ BEGIN
             PR.INVOICE_DATE,
             PR.DC_NO AS CHALLAN_NO,
             PR.DC_DATE AS CHALLAN_DATE,
-            (SELECT T.TRAN_NAME FROM  TRANSPORTER T WHERE PR.TRAN_CODE =T.TRAN_CODE) AS TRAN_NAME,
+            NVL((SELECT TRAN_NAME FROM  TRANSPORTER T WHERE PR.TRAN_CODE =T.TRAN_CODE),'NA') AS TRAN_NAME,
             PR.LR_NO,
             PR.LR_DATE,
             PR.TRAN_TYPE,
@@ -86,8 +85,6 @@ BEGIN
         PR.CONFIRMED ='Y'
         AND PR.TRAN_DATE >= AS_FR_DATE
         AND PR.TRAN_DATE <= AS_TO_DATE
-
-
         ;
 
     /*========== INSERT for DWH_SALES_SUM Ended ==========*/
@@ -97,11 +94,9 @@ BEGIN
 END;
 
 
-EXEC DWH_PURCH('01-MAR-19','31-MAR-19');
+
 EXEC DWH_PURCH('01-JAN-19','31-JAN-19');
 EXEC DWH_PURCH('01-FEB-19','28-FEB-19');
-EXEC DWH_PURCH('01-NOV-19','31-NOV-19');
-EXEC DWH_PURCH('01-DEC-19','31-DEC-19');
-
-
+EXEC DWH_PURCH('01-MAR-19','31-MAR-19');
+EXEC DWH_PURCH('01-APR-19','30-APR-19');
+EXEC DWH_PURCH('01-MAY-19','31-MAY-19');
\ No newline at end of file
-

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

@@ -12,6 +12,7 @@ BEGIN
           SITE_CODE, 
           CUST_CODE, 
           ITEM_CODE,
+          LOT_NO, 
           DOC_DATE, 
           POS_CODE, 
           SALES_QTY, 
@@ -57,6 +58,7 @@ BEGIN
               DSSV.SITE_CODE                                                                     AS SITE_CODE,
               DSSV.CUST_CODE                                                                     AS CUST_CODE,
               DSSV.ITEM_CODE                                                                     AS ITEM_CODE,
+              NVL(DSSV.LOT_NO,'NA')                                                              AS LOT_NO,
               DSSV.TRAN_DATE                                                                     AS DOC_DATE,
               NVL((SELECT   ORG.POS_CODE
                     FROM  ORG_STRUCTURE_CUST ORG  
@@ -109,6 +111,7 @@ BEGIN
                   INVOICE.SITE_CODE,
                   INVOICE.CUST_CODE,
                   INVOICE_TRACE.ITEM_CODE,
+                  INVOICE_TRACE.LOT_NO,
                   INVOICE.TRAN_DATE,
                   INVOICE.INV_TYPE            AS TRAN_TYPE,
                   ITEM.HSN_NO                 AS HSN_CODE,
@@ -209,6 +212,7 @@ BEGIN
                   SRETURN.SITE_CODE,
                   SRETURN.CUST_CODE,
                   SRETURNDET.ITEM_CODE,
+                  SRETURNDET.LOT_NO,
                   SRETURN.TRAN_DATE,
                   SRETURN.TRAN_TYPE,
                   ITEM.HSN_NO       AS HSN_CODE,
@@ -411,6 +415,7 @@ BEGIN
               DSSV.SITE_CODE,
               DSSV.CUST_CODE,
               DSSV.ITEM_CODE,
+              DSSV.LOT_NO,
               DSSV.TRAN_DATE,
               DSSV.MRP,
               DSSV.PTR,
@@ -432,5 +437,9 @@ BEGIN
   END IF;
 END;
 
-
-
+EXEC DWH_SALES('01-JAN-19','31-JAN-19');
+EXEC DWH_SALES('01-FEB-19','28-FEB-19');
+EXEC DWH_SALES('01-MAR-19','31-MAR-19');
+EXEC DWH_SALES('01-APR-19','30-APR-19');
+EXEC DWH_SALES('01-MAY-19','31-MAY-19');
+EXEC DWH_SALES('01-DEC-18','31-DEC-18');

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

 
 CREATE TABLE DWH_SALES_SUM
-   (	SITE_CODE VARCHAR2(8 BYTE), 
-	CUST_CODE VARCHAR2(30 CHAR), 
-	ITEM_CODE VARCHAR2(30 CHAR), 
+(
+    TRAN_ID                     CHAR(10) NOT NULL,
+    SITE_CODE                   CHAR(5) NOT NULL,
+    CUST_CODE                   CHAR(10) NOT NULL,
+    ITEM_CODE                   CHAR(10) NOT NULL,
+    POS_CODE                    CHAR(10),
+
+    ITEM_SER                    CHAR(5),
+    TRAN_TYPE                   CHAR(3),
+
     SALES_QTY                   NUMBER(14,3),
     GROSS_SALES_VALUE           NUMBER(14,3),
     FREE_QTY                    NUMBER(14,3),
     FREE_SALES_VALUE            NUMBER(14,3),
+    NET_SALES_QTY               NUMBER(14,3),
     NET_SALES_VALUE             NUMBER(14,3),
-	DOC_DATE DATE
-   );
+
+    REPL_QTY                    NUMBER(14,3),
\ No newline at end of file
+
+    SALEABLE_RETURN_QTY         NUMBER(14,3),
+    SALEABLE_RETURN_AMT         NUMBER(14,3),
+    BREAKAGE_RETURN_QTY         NUMBER(14,3),
+    BREAKAGE_RETURN_AMT         NUMBER(14,3),
+    EXPIRY_RETURN_QTY           NUMBER(14,3),
+    EXPIRY_RETURN_AMT           NUMBER(15,4),
+    CORRECTION_RETURN_QTY       NUMBER(14,3),
+    CORRECTION_RETURN_AMT       NUMBER(14,3),
+    REPL_RETURN_QTY             NUMBER(14,3),
+    REPL_RETURN_VALUE           NUMBER(14,3),
+
+    RETURN_QTY                  NUMBER(14,3),
+    GROSS_RETURN_VALUE          NUMBER(14,3),
+    NET_RETURN_VALUE            NUMBER(14,3),
+
+    CGST_RATE                   NUMBER(14,3),
+    CGST_AMT                    NUMBER(14,3),
+    SGST_RATE                   NUMBER(14,3),
+    SGST_AMT                    NUMBER(14,3),
+    MRP                         NUMBER(14,3),
+    PTR                         NUMBER(14,3),
+    PTS                         NUMBER(14,3),
+    HSN_CODE                    VARCHAR2(20),
+    DISC_AMT                    NUMBER(14,3),
+    DUE_DATE                    DATE,
+    PACK                        VARCHAR2(60)   ,
+    REF_SER                     CHAR(6)  ,  
+    DOC_DATE                    DATE ,
+    CITY                         VARCHAR2(20),
+    ITEM_BRAND                 VARCHAR2(500),
+    IGST_RATE                    NUMBER(14,3),
+    IGST_AMT                     NUMBER(14,3),
+    REPL_VALUE                   NUMBER(14,3),
+    TARGET_QTY                   NUMBER(14,3),
+    TARGET_VALUE                 NUMBER(14,3),
+    LOT_NO                       CHAR(15)
+);
+
+ALTER TABLE DWH_SALES_SUM ADD CONSTRAINT DWH_SALES_SUM_PK PRIMARY KEY (TRAN_ID,SITE_CODE, CUST_CODE, ITEM_CODE, DOC_DATE,LOT_NO );
+
+
+CREATE INDEX DSS_UNIQUE_INDEX
+ON DWH_SALES_SUM (TRAN_ID,SITE_CODE,CUST_CODE,ITEM_CODE,LOT_NO,DOC_DATE);
+
+CREATE INDEX DSS_INDEX 
+ON DWH_SALES_SUM (TRAN_ID,SITE_CODE, CUST_CODE, ITEM_CODE,LOT_NO, DOC_DATE, MRP, PTR, PTS);