Skip to content

B
business-java
Commit 92f70859 authored by pborate's avatar pborate
Browse files
Options

Updated changes for sale and purchase dashboard 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@202044 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c99bc2c8
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 33 deletions
webitm-dashboard/ibase/dashboard/module-resource/scm/Purchase/SQL/DWH_PURCHASE_PLSQL.sql
View file @ 92f70859
......@@ -136,4 +136,6 @@ EXEC DWH_PURCH('01-JAN-19','31-JAN-19');
EXEC DWH_PURCH('01-FEB-19','28-FEB-19');
EXEC DWH_PURCH('01-MAR-19','31-MAR-19');
EXEC DWH_PURCH('01-APR-19','30-APR-19');
EXEC DWH_PURCH('01-DEC-18','31-DEC-18');
\ No newline at end of file
EXEC DWH_PURCH('01-DEC-18','31-DEC-18');
webitm-dashboard/ibase/dashboard/module-resource/scm/Purchase/SQL/Purchase_dashboard_datamodel.sql
View file @ 92f70859
......@@ -48,7 +48,20 @@ CHG_DATE,CHG_USER,CHG_TERM,VALID_DAYS,SCOPE_NAME,SYNC_DATA_MODEL) values ('DWH_P
SITE_CODE AS "SITE CODE",
(RATE * QUANTITY) AS VALUE,
To_char(RECEIPT_DATE, ''MON'') AS MONTH,
TRAN_SER
TRAN_SER,
IGST_RATE ,
IGST_TAXABLE_AMT,
IGST_AMT ,
CGST_RATE,
CGST_TAXABLE_AMT,
CGST_AMT,
SGST_RATE,
SGST_TAXABLE_AMT,
SGST_AMT,
CESS_RATE,
CESS_TAXABLE_AMT,
CESS_AMT ,
TAX_CHARGES
FROM DWH_PURCHASE
where RECEIPT_DATE between ? and ?
AND SITE_CODE In ((select column_value from TABLE(fn_get_site_input(?)))) ',':fromDate,:toDate,:SITE_CODE','json',SYSDATE,'ADMIN','SYSTEM',null,
......
webitm-dashboard/ibase/dashboard/module-resource/scm/Purchase/SQL/dwh_purchase_create_table.sql
View file @ 92f70859
......@@ -56,4 +56,8 @@ ALTER TABLE DWH_PURCHASE
ADD PRIMARY KEY (RECEIPT_NO,ITEM_CODE,LOT_NO,LOT_SL,LINE_NO);
CREATE INDEX DWH_PURCHASE_SITE_RCPT_DATE_X
ON APPVIS.DWH_PURCHASE (site_code,RECEIPT_DATE);
webitm-dashboard/ibase/dashboard/module-resource/scm/Sales Trends/SQL/dwh_sales_procedure.sql
View file @ 92f70859
......@@ -12,6 +12,7 @@ BEGIN
TRAN_ID,
SITE_CODE,
CUST_CODE,
CUST_CODE__BIL,
ITEM_CODE,
LOT_NO,
LINE_TYPE,
......@@ -58,9 +59,10 @@ BEGIN
ITEM_BRAND,
ITEM_SER
)
SELECT DSSV.TRAN_ID,
SELECT DSSV.TRAN_ID,
DSSV.SITE_CODE AS SITE_CODE,
DSSV.CUST_CODE AS CUST_CODE,
DSSV.CUST_CODE_BILL AS CUST_CODE__BIL,
DSSV.ITEM_CODE AS ITEM_CODE,
DSSV.LOT_NO AS LOT_NO,
DSSV.LINE_TYPE AS LINE_TYPE,
......@@ -112,6 +114,7 @@ BEGIN
INVOICE.INVOICE_ID AS TRAN_ID,
INVOICE.SITE_CODE,
INVOICE.CUST_CODE,
INVOICE.CUST_CODE__BIL AS CUST_CODE_BILL,
INVOICE_TRACE.ITEM_CODE,
nvl(INVOICE_TRACE.LOT_NO,'NA') as lot_no,
nvl(INVOICE_TRACE.LINE_TYPE,'NA') as line_type,
......@@ -212,14 +215,15 @@ BEGIN
INNER JOIN ITEM ON INVOICE_TRACE.ITEM_CODE = ITEM.ITEM_CODE
LEFT OUTER JOIN CUSTOMER DC ON INVOICE.CUST_CODE = DC.CUST_CODE
WHERE INVOICE.CONFIRMED = 'Y'
AND INVOICE.TRAN_DATE >= AS_FR_DATE
AND INVOICE.TRAN_DATE <= AS_TO_DATE
AND INVOICE.TRAN_DATE >= AS_FR_DATE
AND INVOICE.TRAN_DATE <= AS_TO_DATE
UNION ALL
SELECT 'S-RET' AS REF_SER,
ITEM.ITEM_SER,
SRETURN.TRAN_ID,
SRETURN.SITE_CODE,
SRETURN.CUST_CODE,
SRETURN.CUST_CODE__BILL AS CUST_CODE_BILL,
SRETURNDET.ITEM_CODE,
nvl(SRETURNDET.LOT_NO,'NA') as lot_no,
nvl(SRETURNDET.LINE_TYPE,'NA') as line_type,
......@@ -380,6 +384,7 @@ BEGIN
GROUP BY DSSV.TRAN_ID,
DSSV.SITE_CODE,
DSSV.CUST_CODE,
DSSV.CUST_CODE_BILL,
DSSV.ITEM_CODE,
DSSV.LOT_NO,
DSSV.LINE_TYPE,
......@@ -407,4 +412,15 @@ BEGIN
EXCEPTION
WHEN OTHERS THEN
dbms_output.put_line(' Error occured ');
END;
\ No newline at end of file
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-JUN-19','30-JUN-19');
EXEC DWH_SALES('01-DEC-18','31-DEC-18');
webitm-dashboard/ibase/dashboard/module-resource/scm/Sales Trends/SQL/dwh_sales_sum.sql
View file @ 92f70859
......@@ -31,7 +31,7 @@ CREATE TABLE DWH_SALES_SUM
REPL_RETURN_QTY NUMBER(14,3),
REPL_RETURN_VALUE NUMBER(14,3),
RETURN_QTY NUMBER(14,3),
RETURN_QTY NUMBER(14,3),
GROSS_RETURN_VALUE NUMBER(14,3),
NET_RETURN_VALUE NUMBER(14,3),
RETURN_VALUE NUMBER(14,3),
......@@ -56,8 +56,9 @@ CREATE TABLE DWH_SALES_SUM
REPL_VALUE NUMBER(14,3),
TARGET_QTY NUMBER(14,3),
TARGET_VALUE NUMBER(14,3),
LOT_NO CHAR(15),
LINE_TYPE VARCHAR2(3)
LOT_NO CHAR(15),
LINE_TYPE VARCHAR2(3),
CUST_CODE__BIL CHAR(10)
);
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,LINE_TYPE );
......
webitm-dashboard/ibase/dashboard/module-resource/scm/Sales Trends/SQL/salesTrendByLevel_data_model.sql
View file @ 92f70859
......@@ -65,7 +65,8 @@ DSS.IGST_AMT,
DSS.IGST_RATE,
DSS.REF_SER,
DSS.SALES_VALUE,
DSS.RETURN_VALUE
DSS.RETURN_VALUE,
DSS.CUST_CODE__BIL
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/salesTrendByMonth_data_model.sql
View file @ 92f70859
......@@ -65,7 +65,8 @@ DSS.IGST_AMT,
DSS.IGST_RATE,
DSS.REF_SER,
DSS.SALES_VALUE,
DSS.RETURN_VALUE
DSS.RETURN_VALUE,
DSS.CUST_CODE__BIL
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
View file @ 92f70859
......@@ -23,14 +23,14 @@ D.SITE_CODE as "SITE CODE",
D.ITEM_CODE as "ITEM CODE",
I.DESCR as "ITEM DESCRIPTION",
I.ITEM_SER as "ITEM SERIES",
ISS.DESCR as "ITEM SERIES DESCRIPTION",
ISS.PRODUCT_LINE as "PRODUCT LINE",
(select DESCR from GENCODES where RPAD(FLD_VALUE,5,'' '')=ISS.PRODUCT_LINE) as "PRODUCT LINE DESCRIPTION",
D.NET_VALUE as "NET SALES VALUE",
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.GROSS_VALUE as "GROSS SALES VALUE",
D.GR_VAL as "GROSS SALES VALUE",
D.FR_QTY as "FREE QUANTITY",
D.FREE_VALUE as "FREE SALES VALUE",
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",
......@@ -41,13 +41,14 @@ 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_VALUE as "REPLACEMENT RETURN VALUE",
D.REPL_RET_VAL as "REPLACEMENT RETURN VALUE",
D.RET_QTY as "RETURN QUANTITY",
D.GR_RET_VALUE as "GROSS RETURN VALUE",
D.NET_RET_VALUE as "NET RETURN VALUE",
D.RL_VALUE as "REPLACEMENT VALUE",
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
from
(
select
......@@ -56,11 +57,11 @@ D.POS_CODE,
D.CUST_CODE,
D.SITE_CODE,
D.ITEM_CODE,
SUM(D.NET_SALES_VALUE) as NET_VALUE,
SUM(D.NET_SALES_VALUE) as NET_VAL,
SUM(D.SALES_QTY) as SAL_QTY,
SUM(D.GROSS_SALES_VALUE) as GROSS_VALUE,
SUM(D.GROSS_SALES_VALUE) as GR_VAL,
SUM(D.FREE_QTY) as FR_QTY,
SUM(D.FREE_SALES_VALUE) as FREE_VALUE,
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,
......@@ -71,19 +72,21 @@ 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_VALUE,
SUM(D.REPL_RETURN_VALUE) as REPL_RET_VAL,
SUM(D.RETURN_QTY) as RET_QTY,
SUM(D.GROSS_RETURN_VALUE) as GR_RET_VALUE,
SUM(D.NET_RETURN_VALUE) as NET_RET_VALUE,
SUM(D.REPL_VALUE) as RL_VALUE ,
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.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.RETURN_VALUE,
D.CUST_CODE__BIL
) D
left outer join ITEM I on D.ITEM_CODE=I.ITEM_CODE
left outer join ITEMSER ISS on I.ITEM_SER=ISS.ITEM_SER
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,
......@@ -97,7 +100,7 @@ left outer join ORG_STRUCTURE L3 on L2.POS_CODE__REPTO=L3.POS_CODE and L2.TABLE_
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(ISS.TABLE_NO__HIER, ISS.ITEM_SER)
and H.TABLE_NO=NVL(IR.TABLE_NO__HIER, IR.ITEM_SER)
where D.DOC_DATE >= ?
and D.DOC_DATE <= ?
and I.ITEM_SER >= ?
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment