Updated changes for data model

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

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

@@ -47,7 +47,10 @@ 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"
+nvl((SELECT CITY from CUSTOMER where CUST_CODE = d.CUST_CODE__BIL),'NA') as "CUSTOMER CITY BILL",
+d.target_value as BUDGET,
+( ( ( d.target_qty - d.net_qty ) / d.target_qty ) * 100 ) as ACHIEVEMENT,
+d.target_qty
 FROM
 (
 SELECT
@@ -55,6 +58,8 @@ SELECT
 d.pos_code,
 d.CUST_CODE,
 d.CUST_CODE__BIL,
+d.target_value,
+d.target_qty,
 d.site_code,
 d.item_code,
 SUM(d.net_sales_value) AS net_val,
@@ -87,6 +92,8 @@ d.site_code,
 d.item_code,
 d.pos_code,
 d.CUST_CODE,
+d.target_value,
+d.target_qty,
 d.CUST_CODE__BIL
 ) d
 LEFT OUTER JOIN item  i ON d.item_code = i.item_code
@@ -120,15 +127,4 @@ FROM
 WHERE i.item_ser >= ?
  AND i.item_ser <=?
  AND d.site_code >= ?
- AND d.site_code <= ?
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
\ No newline at end of file
+ AND d.site_code <= ?
\ No newline at end of file

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

@@ -69,7 +69,10 @@ DSS.RETURN_VALUE,
 DSS.CUST_CODE__BIL,
 (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"
+(SELECT CITY from CUSTOMER where CUST_CODE = DSS.CUST_CODE__BIL) as "CUSTOMER CITY BILL",
+DSS.target_value as BUDGET,
+( ( ( DSS.target_qty - DSS.NET_SALES_QTY ) / DSS.target_qty ) * 100 ) as ACHIEVEMENT,
+DSS.target_qty
 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

@@ -51,7 +51,10 @@ 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"
+(SELECT CITY from CUSTOMER where CUST_CODE = d.CUST_CODE__BIL) as "CUSTOMER CITY BILL",
+d.target_value as BUDGET,
+( ( ( d.target_qty - d.net_val ) / d.target_qty ) * 100 ) as ACHIEVEMENT,
+d.target_qty
 FROM
 (
 SELECT
@@ -59,6 +62,8 @@ SELECT
 d.pos_code,
 d.CUST_CODE,
 d.CUST_CODE__BIL,
+d.target_value,
+d.target_qty,
 d.site_code,
 d.item_code,
 SUM(d.net_sales_value) AS net_val,
@@ -91,7 +96,9 @@ d.site_code,
 d.item_code,
 d.pos_code,
 d.CUST_CODE,
-d.CUST_CODE__BIL
+d.CUST_CODE__BIL,
+d.target_value,
+d.target_qty
 ) 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