Updated changes for sales trend and purchase dashboard

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

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

@@ -108,7 +108,8 @@ public class UpdateDWHPurchase implements Schedule
 						.append("  EXP_DATE , ") 
 						.append("  QC_REQD ,") 
 						.append("  SITE_CODE, ") 
-						.append("  LINE_NO ") 
+						.append("  LINE_NO, ") 
+						.append("  TRAN_SER ") 
 						.append("  ) ") 
 						.append(" SELECT PR.TRAN_ID AS RECEIPT_NO, ") 
 						.append("  PR.TRAN_DATE    AS RECEIPT_DATE, ") 
@@ -145,7 +146,8 @@ public class UpdateDWHPurchase implements Schedule
 						.append("  PRD.EXPIRY_DATE AS EXP_DATE, ") 
 						.append("  PRD.QC_REQD, ") 
 						.append("  PR.SITE_CODE, ") 
-						.append("  PRD.LINE_NO ") 
+						.append("  PRD.LINE_NO, ") 
+						.append("  PR.TRAN_SER ") 
 						.append(" FROM PORCPDET PRD ") 
 						.append(" INNER JOIN PORCP PR ") 
 						.append(" ON PR.TRAN_ID =PRD.TRAN_ID ") 

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

@@ -41,7 +41,8 @@ BEGIN
                 EXP_DATE ,                       
                 QC_REQD ,
                 SITE_CODE ,
-                LINE_NO                        
+                LINE_NO ,    
+                TRAN_SER                 
           )
 
         SELECT 
@@ -78,7 +79,8 @@ BEGIN
             PRD.EXPIRY_DATE AS EXP_DATE,
             PRD.QC_REQD,
             PR.SITE_CODE,
-            PRD.LINE_NO
+            PRD.LINE_NO,
+            PR.TRAN_SER
 
         FROM PORCPDET PRD
         INNER JOIN PORCP PR ON PR.TRAN_ID =PRD.TRAN_ID

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

@@ -47,7 +47,8 @@ Insert into DATA_MODEL (DATA_MODEL,DESCR,DATA_SOURCE,SOURCE_DET,SOURCE_INPUT,FOR
   QC_REQD AS "QC REQD",
   SITE_CODE AS "SITE CODE",
   (RATE * QUANTITY) AS VALUE,
-  To_char(RECEIPT_DATE, ''MON'') AS MONTH
+  To_char(RECEIPT_DATE, ''MON'') AS MONTH,
+  TRAN_SER
   FROM DWH_PURCHASE
 where  To_char(RECEIPT_DATE, ''MMYYYY'') between ''01'' || to_char( sysdate , ''YYYY'')  and  ? || to_char( sysdate , ''YYYY'')
 AND SITE_CODE IN (?) ',':MONTH,:SITE_CODE','json',SYSDATE,'ADMIN','SYSTEM',null,

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

@@ -33,7 +33,8 @@ CREATE TABLE DWH_PURCHASE
     EXP_DATE                                     DATE,  /* Ref From PORCPDET(EXPIRY_DATE) */
     QC_REQD                                   CHAR(1),  /* Ref From PORCP(QC_REQD) */
     SITE_CODE                        CHAR(5) NOT NULL,   /* Ref From PORCP(SITE_CODE) */
-    LINE_NO                          CHAR(3)
+    LINE_NO                          CHAR(3),
+    TRAN_SER                         CHAR(5)
 
 );
 

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

@@ -63,7 +63,9 @@ DSS.CITY,
 DSS.ITEM_BRAND,
 DSS.IGST_AMT,
 DSS.IGST_RATE,
-DSS.REF_SER
+DSS.REF_SER,
+DSS.SALES_VALUE,
+DSS.RETURN_VALUE
 from DWH_SALES_SUM DSS 
 LEFT OUTER JOIN ITEM I ON DSS.ITEM_CODE = I.ITEM_CODE
 LEFT OUTER JOIN ITEMSER ISER ON I.ITEM_SER = ISER.ITEM_SER
@@ -86,4 +88,4 @@ left outer join org_structure lv4 on lv3.pos_code__repto=lv4.pos_code and lv3.ta
  AND I.ITEM_SER <= ?
  AND DSS.SITE_CODE = ?',
  ':MONTH,:ITEM_SER__FR,:ITEM_SER__TO,:SITE_CODE_TO','json',SYSDATE,'ADMIN','SYSTEM',null,
- 'MONTH'||'&'||'ITEM_SER__FR'||'&'||'ITEM_SER__TO'||'&'||'SITE_CODE_TO',null);
+ 'MONTH'||'&'||'ITEM_SER__FR'||'&'||'ITEM_SER__TO'||'&'||'SITE_CODE_TO',null);
\ No newline at end of file