Updated changes for purchase dashboard

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

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

@@ -35,14 +35,27 @@ BEGIN
                 TRAN_CODE  ,                 
                 NO_ART  ,                  
                 NET_WEIGHT ,                    
-                REMARKS ,                    
+                REMARKS ,                  
                 BATCH_NO  ,                    
                 MFG_DATE ,                            
                 EXP_DATE ,                       
                 QC_REQD ,
                 SITE_CODE ,
                 LINE_NO ,    
-                TRAN_SER                 
+                TRAN_SER   ,
+                CGST_RATE ,
+                CGST_TAXABLE_AMT ,
+		        CGST_AMT ,
+		        SGST_RATE ,
+		        SGST_TAXABLE_AMT ,
+		        SGST_AMT ,
+			    IGST_RATE ,
+			    IGST_TAXABLE_AMT ,
+			    IGST_AMT ,
+			    CESS_RATE ,
+			    CESS_TAXABLE_AMT ,
+			    CESS_AMT,
+			    TAX_CHARGES
           )
 
         SELECT 
@@ -80,7 +93,27 @@ BEGIN
             PRD.QC_REQD,
             PR.SITE_CODE,
             PRD.LINE_NO,
-            PR.TRAN_SER
+            PR.TRAN_SER,
+            NVL(FN_RGET_TAX_NEW(PR.TRAN_SER,PR.TRAN_ID,CAST(PRD.LINE_NO AS CHAR(3)),'CGST_PUR_REG',' ',' ','P'),0) * (PR.EXCH_RATE) AS CGST_RATE ,
+		    NVL(FN_RGET_TAX_NEW(PR.TRAN_SER,PR.TRAN_ID,CAST(PRD.LINE_NO AS CHAR(3)),'CGST_PUR_REG',' ',' ','B'),0) * (PR.EXCH_RATE) AS CGST_TAXABLE_AMT ,
+		    NVL(FN_RGET_TAX_NEW(PR.TRAN_SER,PR.TRAN_ID,CAST(PRD.LINE_NO AS CHAR(3)),'CGST_PUR_REG',' ',' ','T'),0) * (PR.EXCH_RATE) AS CGST_AMT ,
+		    NVL(FN_RGET_TAX_NEW(PR.TRAN_SER,PR.TRAN_ID,CAST(PRD.LINE_NO AS CHAR(3)),'SGST_PUR_REG',' ',' ','P'),0) * (PR.EXCH_RATE) AS SGST_RATE ,
+		    NVL(FN_RGET_TAX_NEW(PR.TRAN_SER,PR.TRAN_ID,CAST(PRD.LINE_NO AS CHAR(3)),'SGST_PUR_REG',' ',' ','B'),0) * (PR.EXCH_RATE) AS SGST_TAXABLE_AMT ,
+		    NVL(FN_RGET_TAX_NEW(PR.TRAN_SER,PR.TRAN_ID,CAST(PRD.LINE_NO AS CHAR(3)),'SGST_PUR_REG',' ',' ','T'),0) * (PR.EXCH_RATE) AS SGST_AMT ,
+		    NVL(FN_RGET_TAX_NEW(PR.TRAN_SER,PR.TRAN_ID,CAST(PRD.LINE_NO AS CHAR(3)),'IGST_PUR_REG',' ',' ','P'),0) * (PR.EXCH_RATE) AS IGST_RATE ,
+		    NVL(FN_RGET_TAX_NEW(PR.TRAN_SER,PR.TRAN_ID,CAST(PRD.LINE_NO AS CHAR(3)),'IGST_PUR_REG',' ',' ','B'),0) * (PR.EXCH_RATE) AS IGST_TAXABLE_AMT ,
+		    NVL(FN_RGET_TAX_NEW(PR.TRAN_SER,PR.TRAN_ID,CAST(PRD.LINE_NO AS CHAR(3)),'IGST_PUR_REG',' ',' ','T'),0) * (PR.EXCH_RATE) AS IGST_AMT ,
+		    NVL(FN_RGET_TAX_NEW(PR.TRAN_SER,PR.TRAN_ID,CAST(PRD.LINE_NO AS CHAR(3)),'CESS_PUR_REG',' ',' ','P'),0) * (PR.EXCH_RATE) AS CESS_RATE ,
+		    NVL(FN_RGET_TAX_NEW(PR.TRAN_SER,PR.TRAN_ID,CAST(PRD.LINE_NO AS CHAR(3)),'CESS_PUR_REG',' ',' ','B'),0) * (PR.EXCH_RATE) AS CESS_TAXABLE_AMT ,
+		    NVL(FN_RGET_TAX_NEW(PR.TRAN_SER,PR.TRAN_ID,CAST(PRD.LINE_NO AS CHAR(3)),'CESS_PUR_REG',' ',' ','T'),0) * (PR.EXCH_RATE) AS CESS_AMT,
+		    (SELECT SUM(TAX_AMT)
+				FROM taxtran ti,  tax tx
+     		    WHERE tx.tax_code = ti.tax_code
+      			AND ti.tran_code = PR.TRAN_SER
+      			AND TI.TRAN_ID = PR.TRAN_ID
+      			AND TX.TAX_TYPE  NOT IN ('H','I','J')
+      			AND TI.LINE_NO = PRD.LINE_NO
+      			) AS TAX_CHARGES
 
         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

@@ -12,8 +12,8 @@ values ('dwh_purchase','1','explore','fm-component','LINK','Explore',null,'A','r
 null,null,null,null,null,null,null,null,'1',11,null);
 
 
-
-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 ('DWH_PURCHASE','PURCHASE DATA','S','SELECT RECEIPT_NO AS "RECEIPT NO",
+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 ('DWH_PURCHASE','PURCHASE DATA','S','SELECT RECEIPT_NO AS "RECEIPT NO",
   RECEIPT_DATE AS "RECEIPT DATE",
   SUPPLIER_CODE AS "SUPPLIER CODE",
   SUPPLIER_NAME AS "SUPPLIER NAME",
@@ -50,9 +50,9 @@ Insert into DATA_MODEL (DATA_MODEL,DESCR,DATA_SOURCE,SOURCE_DET,SOURCE_INPUT,FOR
   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,
-'MONTH'||'&'||'SITE_CODE',null);
+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,
+'fromDate'||'&'||'toDate'||'&'||'SITE_CODE',null);
 
 
 Insert into DATA_MODEL_USE (DATA_MODEL,OBJ_NAME,FORM_NAME,FIELD_NAME,IS_CRITICAL,POPHELP) 

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

@@ -33,10 +33,27 @@ 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),
-    TRAN_SER                         CHAR(5)
+    LINE_NO                          		  CHAR(3),
+    TRAN_SER                                  CHAR(5),
+    
+	IGST_RATE                   		 NUMBER(14,3), 
+	IGST_TAXABLE_AMT 					 NUMBER(14,3), 
+	IGST_AMT 							 NUMBER(14,3), 
+	CGST_RATE 							 NUMBER(14,3), 
+	CGST_TAXABLE_AMT					 NUMBER(14,3), 
+	CGST_AMT 							 NUMBER(14,3), 
+	SGST_RATE 							 NUMBER(14,3), 
+    SGST_TAXABLE_AMT					 NUMBER(14,3), 
+	SGST_AMT							 NUMBER(14,3), 
+	CESS_RATE							 NUMBER(14,3), 
+	CESS_TAXABLE_AMT					 NUMBER(14,3), 
+	CESS_AMT							 NUMBER(14,3) ,
+	TAX_CHARGES                          NUMBER(14,3)
 
 );
 
 ALTER TABLE DWH_PURCHASE
-ADD PRIMARY KEY (RECEIPT_NO,ITEM_CODE,LOT_NO,LOT_SL,LINE_NO);
+ADD PRIMARY KEY (RECEIPT_NO,ITEM_CODE,LOT_NO,LOT_SL,LINE_NO);
\ No newline at end of file
+
+
+