Updated changes in procedure

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

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

+SELECT
+d.doc_date AS "TRANSACTION DATE",
+d.pos_code AS "LEVEL CODE",
+nvl(h.l4, 'NA') AS "LEVEL1 CODE",
+nvl(h.l4_descr, 'NA') AS "LEVEL1 DESCRIPTION",
+nvl(h.l3, 'NA') AS "LEVEL2 CODE",
+nvl(h.l3_descr, 'NA') AS "LEVEL2 DESCRIPTION",
+nvl(h.l2, 'NA') AS "LEVEL3 CODE",
+nvl(h.l2_descr, 'NA') AS "LEVEL3 DESCRIPTION",
+nvl(h.L1, 'NA') AS "LEVEL4 CODE",
+nvl(h.L1_DESCR, 'NA') AS "LEVEL4 DESCRIPTION",
+nvl(h.POS_CODE, 'NA') AS "POSITION CODE",
+h.pool_code AS "POOL CODE",
+h.table_no  AS "TABLE NO",
+h.version_id AS "VERSION ID",
+d.site_code AS "SITE CODE",
+( SELECT descr FROM site WHERE site_code = d.site_code ) AS "SITE DESCRIPTION",
+d.item_code AS "ITEM CODE",
+i.descr  AS "ITEM DESCRIPTION",
+i.item_ser  AS "ITEM SERIES",
+ir.descr AS "ITEM SERIES DESCRIPTION",
+ir.product_line AS "PRODUCT LINE",
+( SELECT descr FROM gencodes WHERE rpad(fld_value, 5, ' ') = ir.product_line ) AS "PRODUCT LINE DESCRIPTION",
+d.net_val AS "NET SALES VALUE",
+d.sal_qty AS "SALES QUANTITY",
+d.gr_val AS "GROSS SALES VALUE",
+d.fr_qty AS "FREE QUANTITY",
+d.fr_val AS "FREE SALES VALUE",
+d.net_qty AS "NET SALES QUANTITY",
+d.sal_ret_qty  AS "SALEABLE RETURN QUANTITY",
+d.sal_ret_amt  AS "SALEABLE RETURN VALUE",
+d.brk_ret_qty  AS "DAMAGED RETURN QUANTITY",
+d.brk_ret_amt  AS "DAMAGED RETURN VALUE",
+d.exp_ret_qty  AS "EXPIRY RETURN QUANTITY",
+d.exp_ret_amt  AS "EXPIRY RETURN VALUE",
+d.cor_ret_qty  AS "CANCELED RETURN QUANTITY",
+d.cor_ret_amt  AS "CANCELED RETURN VALUE",
+d.repl_ret_qty AS "REPLACEMENT RETURN QUANTITY",
+d.repl_ret_val AS "REPLACEMENT RETURN VALUE",
+d.ret_qty AS "RETURN QUANTITY",
+d.gr_ret_val AS "GROSS RETURN VALUE",
+d.net_ret_val  AS "NET RETURN VALUE",
+d.rl_val AS "REPLACEMENT VALUE",
+d.sales_value,
+d.return_value,
+d.CUST_CODE__BIL,
+(SELECT CUST_TYPE from CUSTOMER where CUST_CODE = d.CUST_CODE) as "CUST TYPE",
+(SELECT CUST_NAME from CUSTOMER where CUST_CODE = d.CUST_CODE) as "CUSTOMER NAME",
+(SELECT CUST_NAME from CUSTOMER where CUST_CODE = d.CUST_CODE__BIL) as "CUSTOMER NAME BILL",
+nvl((SELECT CITY from CUSTOMER where CUST_CODE = d.CUST_CODE__BIL),'NA') as "CUSTOMER CITY BILL"
+FROM
+(
+SELECT
+ TO_CHAR(d.doc_date, 'MM/YYYY') AS doc_date,
+d.pos_code,
+d.CUST_CODE,
+d.CUST_CODE__BIL,
+d.site_code,
+d.item_code,
+SUM(d.net_sales_value) AS net_val,
+SUM(d.sales_qty) AS sal_qty,
+SUM(d.gross_sales_value) AS gr_val,
+SUM(d.free_qty) AS fr_qty,
+SUM(d.free_sales_value) AS fr_val,
+SUM(d.net_sales_qty) AS net_qty,
+SUM(d.saleable_return_qty) AS sal_ret_qty,
+SUM(d.saleable_return_amt) AS sal_ret_amt,
+SUM(d.breakage_return_qty) AS brk_ret_qty,
+SUM(d.breakage_return_amt) AS brk_ret_amt,
+SUM(d.expiry_return_qty) AS exp_ret_qty,
+SUM(d.expiry_return_amt) AS exp_ret_amt,
+SUM(d.correction_return_qty) AS cor_ret_qty,
+SUM(d.correction_return_amt) AS cor_ret_amt,
+SUM(d.repl_return_qty) AS repl_ret_qty,
+SUM(d.repl_return_value) AS repl_ret_val,
+SUM(d.return_qty) AS ret_qty,
+SUM(d.gross_return_value) AS gr_ret_val,
+SUM(d.net_return_value) AS net_ret_val,
+SUM(d.repl_value) AS rl_val,
+SUM(d.sales_value) as sales_value,
+SUM(d.return_value) as return_value
+FROM dwh_sales_sum d
+ WHERE d.doc_date >= ? AND d.doc_date <= ?
+ GROUP BY
+ TO_CHAR(d.doc_date, 'MM/YYYY'),
+d.site_code,
+d.item_code,
+d.pos_code,
+d.CUST_CODE,
+d.CUST_CODE__BIL
+) d
+LEFT OUTER JOIN item  i ON d.item_code = i.item_code
+LEFT OUTER JOIN itemser ir ON i.item_ser = ir.item_ser
+LEFT OUTER JOIN (
+SELECT
+  l1.pos_code l1,
+  l1.pos_code__repto l1_repo,
+  l1.descr AS l1_descr,
+ l2.pos_code l2,
+ l2.pos_code__repto l2_repo,
+ l2.descr AS l2_descr,
+ l3.pos_code l3,
+ l3.pos_code__repto l3_repo,
+ l3.descr AS l3_descr,
+ l4.pos_code l4,
+ l4.pos_code__repto l4_repo,
+ l4.descr AS l4_descr,
+  l1.pos_code,
+  l1.table_no,
+  l1.version_id,
+  l1.pool_code
+FROM
+  org_structure l1
+  LEFT OUTER JOIN org_structure l2 ON l1.pos_code__repto = l2.pos_code AND l1.table_no = l2.table_no AND l1.version_id = l2.version_id
+  LEFT OUTER JOIN org_structure l3 ON l2.pos_code__repto = l3.pos_code AND l2.table_no = l3.table_no AND l2.version_id = l3.version_id
+  LEFT OUTER JOIN org_structure l4 ON l3.pos_code__repto = l4.pos_code AND l3.table_no = l4.table_no AND l3.version_id = l4.version_id
+) h ON h.pos_code = d.pos_code
+  AND h.version_id IN (SELECT version_id FROM version WHERE TO_DATE(SYSDATE) BETWEEN eff_from AND valid_upto )
+ AND h.table_no = nvl(ir.table_no__hier, ir.item_ser)
+WHERE i.item_ser >= ?
+ AND i.item_ser <=?
+ AND d.site_code >= ?
+ AND d.site_code <= ?
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
\ No newline at end of file

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

@@ -408,6 +408,35 @@ BEGIN
     /*========== INSERT for DWH_SALES_SUM Ended ==========*/
     COMMIT ;
     /* ==================== DWH_SALES_SUM Data Insertion END ==================== */
+    
+    /* ==================== DWH_SALES_SUM Data Updation START ==================== */
+    
+    UPDATE DWH_SALES_SUM t1
+	SET (t1.TARGET_QTY, t1.TARGET_VALUE) = ( SELECT t2.TARGET_QTY, t2.TARGET_VALUE
+	     FROM (
+	            select SITE_CODE, CUST_CODE, POS_CODE, ITEM_CODE, ITEM_SER, SUM(H_NET_AMT) as TARGET_VALUE, SUM(QUANTITY) as TARGET_QTY
+	            from (
+	                  select SBC.TRAN_ID, SBCD.LINE_NO, SBC.SITE_CODE, SBC.CUST_CODE, SBC.POS_CODE, SBCD.ITEM_CODE, SBC.ITEM_SER, SBC.NET_AMT as H_NET_AMT,
+	                  SBCD.RATE, SBCD.QUANTITY, SBCD.NET_AMT as D_NET_AMT
+	                  from SALES_BUDGET_CUST SBC
+	                  LEFT JOIN SALES_BUDGET_CUST_DET SBCD
+	                  ON SBC.TRAN_ID = SBCD.TRAN_ID
+	            )
+	            where SITE_CODE is not null
+	            And CUST_CODE is not null
+	            And POS_CODE is not null
+	            And ITEM_CODE is not null
+	            And ITEM_SER is not null
+	            group by SITE_CODE, CUST_CODE, POS_CODE, ITEM_CODE, ITEM_SER
+	    ) t2
+	    WHERE t1.SITE_CODE = t2.SITE_CODE
+	    and t1.CUST_CODE = t2.CUST_CODE
+	    and t1.POS_CODE = t2.POS_CODE
+	    and t1.ITEM_CODE = t2.ITEM_CODE
+	    and t1.ITEM_SER = t2.ITEM_SER
+	);
+     COMMIT ;
+    /* ==================== DWH_SALES_SUM Data Updation END ==================== */
   END IF;
   EXCEPTION 
   	WHEN OTHERS	THEN

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

@@ -67,7 +67,9 @@ DSS.REF_SER,
 DSS.SALES_VALUE,
 DSS.RETURN_VALUE,
 DSS.CUST_CODE__BIL,
-(SELECT CUST_TYPE from CUSTOMER where CUST_CODE = DSS.CUST_CODE) as "CUST TYPE"
+(SELECT CUST_TYPE from CUSTOMER where CUST_CODE = DSS.CUST_CODE) as "CUST TYPE",
+(SELECT CUST_NAME from CUSTOMER where CUST_CODE = DSS.CUST_CODE__BIL) as "CUSTOMER NAME BILL",
+(SELECT CITY from CUSTOMER where CUST_CODE = DSS.CUST_CODE__BIL) as "CUSTOMER CITY BILL"
 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

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

@@ -46,12 +46,19 @@ d.gr_ret_val AS "GROSS RETURN VALUE",
 d.net_ret_val  AS "NET RETURN VALUE",
 d.rl_val AS "REPLACEMENT VALUE",
 d.sales_value,
-d.return_value
+d.return_value,
+d.CUST_CODE__BIL,
+(SELECT CUST_TYPE from CUSTOMER where CUST_CODE = d.CUST_CODE) as "CUST TYPE",
+(SELECT CUST_NAME from CUSTOMER where CUST_CODE = d.CUST_CODE) as "CUSTOMER NAME",
+(SELECT CUST_NAME from CUSTOMER where CUST_CODE = d.CUST_CODE__BIL) as "CUSTOMER NAME BILL",
+(SELECT CITY from CUSTOMER where CUST_CODE = d.CUST_CODE__BIL) as "CUSTOMER CITY BILL"
 FROM
 (
 SELECT
  TO_CHAR(d.doc_date, ''MM/YYYY'') AS doc_date,
 d.pos_code,
+d.CUST_CODE,
+d.CUST_CODE__BIL,
 d.site_code,
 d.item_code,
 SUM(d.net_sales_value) AS net_val,
@@ -82,7 +89,9 @@ FROM dwh_sales_sum d
  TO_CHAR(d.doc_date, ''MM/YYYY''),
 d.site_code,
 d.item_code,
-d.pos_code
+d.pos_code,
+d.CUST_CODE,
+d.CUST_CODE__BIL
 ) d
 LEFT OUTER JOIN item  i ON d.item_code = i.item_code
 LEFT OUTER JOIN itemser ir ON i.item_ser = ir.item_ser
@@ -118,3 +127,7 @@ WHERE i.item_ser >= ?
  AND d.site_code <= ?',
  ':fromDate,:toDate,:ITEM_SER__FR,:ITEM_SER__TO,:SITE_CODE_FR,:SITE_CODE_TO','json',SYSDATE,'ADMIN','SYSTEM',null,
   'fromDate'||'&'||'toDate'||'&'||'ITEM_SER__TO'||'&'||'SITE_CODE_FR'||'&'||'SITE_CODE_TO',null);
+  
+
+  
+  
\ No newline at end of file