Updated changes for data model

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

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

@@ -47,9 +47,9 @@ 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",
+(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_qty ) / d.target_qty ) * 100 ) as ACHIEVEMENT,
+( (d.target_qty - (d.target_qty - d.sal_qty))/d.target_qty * 100 ) as ACHIEVEMENT,
 d.target_qty
 FROM
 (
@@ -92,9 +92,9 @@ d.site_code,
 d.item_code,
 d.pos_code,
 d.CUST_CODE,
+d.CUST_CODE__BIL,
 d.target_value,
-d.target_qty,
-d.CUST_CODE__BIL
+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

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

@@ -71,7 +71,7 @@ DSS.CUST_CODE__BIL,
 (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",
 DSS.target_value as BUDGET,
-( ( ( DSS.target_qty - DSS.NET_SALES_QTY ) / DSS.target_qty ) * 100 ) as ACHIEVEMENT,
+( (DSS.target_qty - (DSS.target_qty - DSS.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

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

@@ -53,7 +53,7 @@ d.CUST_CODE__BIL,
 (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",
 d.target_value as BUDGET,
-( ( ( d.target_qty - d.net_val ) / d.target_qty ) * 100 ) as ACHIEVEMENT,
+( (d.target_qty - (d.target_qty - d.sal_qty))/d.target_qty * 100 ) as ACHIEVEMENT,
 d.target_qty
 FROM
 (