Updated changes for sale trend and sales trend by month dashboard

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

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

@@ -66,7 +66,8 @@ DSS.IGST_RATE,
 DSS.REF_SER,
 DSS.SALES_VALUE,
 DSS.RETURN_VALUE,
-DSS.CUST_CODE__BIL
+DSS.CUST_CODE__BIL,
+(SELECT CUST_TYPE from CUSTOMER where CUST_CODE = DSS.CUST_CODE) as "CUST TYPE"
 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

@@ -2,110 +2,119 @@ Delete from DATA_MODEL where DATA_MODEL = 'SALES_ANALYSIS';
 
 Insert into DATA_MODEL (DATA_MODEL,DESCR,DATA_SOURCE,SOURCE_DET,SOURCE_INPUT,FORMAT,CHG_DATE,CHG_USER,CHG_TERM,VALID_DAYS,SCOPE_NAME,SYNC_DATA_MODEL) 
 values ('SALES_ANALYSIS','SALES ANALYSIS DATA','S',
-'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.CUST_CODE as "CUSTOMER CODE",
-(select CUST_NAME from CUSTOMER where CUST_CODE=D.CUST_CODE) as "CUSTOMER NAME",
-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
-from
+'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
+FROM
 (
-select
-D.DOC_DATE,
-D.POS_CODE,
-D.CUST_CODE,
-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 ,
-D.SALES_VALUE,
-D.RETURN_VALUE,
-D.CUST_CODE__BIL
-from DWH_SALES_SUM D 
-group by D.SITE_CODE,D.CUST_CODE,D.ITEM_CODE,D.DOC_DATE,D.POS_CODE,D.SALES_VALUE,
-D.RETURN_VALUE,
-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 D.DOC_DATE >= ?
- and D.DOC_DATE <= ?
- and I.ITEM_SER >= ?
- and I.ITEM_SER <= ?
- and D.SITE_CODE >= ?
- and D.SITE_CODE <= ?',
+SELECT
+ TO_CHAR(d.doc_date, ''MM/YYYY'') AS doc_date,
+d.pos_code,
+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
+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 <= ?',
  ':fromDate,:toDate,:ITEM_SER__FR,:ITEM_SER__TO,:SITE_CODE_FR,:SITE_CODE_TO','json',SYSDATE,'ADMIN','SYSTEM',null,
- 'fromDate'||'&'||'toDate'||'&'||'ITEM_SER__FR'||'&'||'ITEM_SER__TO'||'&'||'SITE_CODE_FR'||'&'||'SITE_CODE_TO',null);
+  'fromDate'||'&'||'toDate'||'&'||'ITEM_SER__TO'||'&'||'SITE_CODE_FR'||'&'||'SITE_CODE_TO',null);
\ No newline at end of file