Update in data model query

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

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

@@ -44,6 +44,7 @@ d.rl_val AS "REPLACEMENT VALUE",
 d.sales_value,
 d.return_value,
 d.CUST_CODE__BIL,
+NVL((SELECT CITY from CUSTOMER where CUST_CODE = d.CUST_CODE),'NOTSPECIFIED') as "CITY",
 (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",

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

+select DSS.DOC_DATE as "TRANSACTION DATE",
+DSS.POS_CODE as "LEVEL CODE",
+NVL(DHH.lv4,'NA') as "LEVEL1 CODE",
+NVL(DHH.lv4_descr,'NA') as "LEVEL1 DESCRIPTION",
+NVL(DHH.lv3,'NA') as "LEVEL2 CODE",
+NVL(DHH.lv3_descr,'NA') as "LEVEL2 DESCRIPTION",
+NVL(DHH.lv2,'NA') as "LEVEL3 CODE",
+NVL(DHH.lv2_descr,'NA') as "LEVEL3 DESCRIPTION",
+NVL(DHH.lv1,'NA') as "LEVEL4 CODE",
+NVL(DHH.lv1_descr,'NA') as "LEVEL4 DESCRIPTION", 
+NVL(DHH.POS_CODE,'NA')  as "POSITION CODE",
+DHH.POOL_CODE  as "POOL CODE",
+DHH.TABLE_NO  as "TABLE NO",
+DHH.VERSION_ID  as "VERSION ID",  
+DSS.CUST_CODE as "CUSTOMER CODE",
+(SELECT CUST_NAME from CUSTOMER where CUST_CODE = DSS.CUST_CODE) as "CUSTOMER NAME",
+DSS.SITE_CODE  as "SITE CODE",
+(SELECT DESCR from SITE where SITE_CODE = DSS.SITE_CODE) as "SITE DESCRIPTION",
+DSS.ITEM_CODE AS "ITEM CODE", I.DESCR AS "ITEM DESCRIPTION", 
+I.ITEM_SER as "ITEM SERIES", 
+ISER.DESCR as "ITEM SERIES DESCRIPTION",
+ISER.PRODUCT_LINE as "PRODUCT LINE", 
+(SELECT descr from GENCODES where RPAD(fld_value, 5, ' ') = ISER.PRODUCT_LINE) as "PRODUCT LINE DESCRIPTION",
+DSS.NET_SALES_VALUE as "NET SALES VALUE",
+DSS.SALES_QTY as "SALES QUANTITY",
+DSS.GROSS_SALES_VALUE as "GROSS SALES VALUE",
+DSS.FREE_QTY as "FREE QUANTITY",
+DSS.FREE_SALES_VALUE as "FREE SALES VALUE",
+DSS.NET_SALES_QTY  as "NET SALES QUANTITY",
+DSS.REPL_VALUE as "REPLACEMENT VALUE",
+DSS.SALEABLE_RETURN_QTY  as "SALEABLE RETURN QUANTITY",
+DSS.SALEABLE_RETURN_AMT  as "SALEABLE RETURN VALUE",
+DSS.BREAKAGE_RETURN_QTY  as "DAMAGED RETURN QUANTITY",
+DSS.BREAKAGE_RETURN_AMT  as "DAMAGED RETURN VALUE",
+DSS.EXPIRY_RETURN_QTY  as "EXPIRY RETURN QUANTITY",
+DSS.EXPIRY_RETURN_AMT  as "EXPIRY RETURN VALUE",
+DSS.CORRECTION_RETURN_QTY  as "CANCELED RETURN QUANTITY",
+DSS.CORRECTION_RETURN_AMT  as "CANCELED RETURN VALUE",
+DSS.REPL_RETURN_QTY  as "REPLACEMENT RETURN QUANTITY",
+DSS.REPL_RETURN_VALUE  as "REPLACEMENT RETURN VALUE",
+DSS.RETURN_QTY  as "RETURN QUANTITY",
+DSS.GROSS_RETURN_VALUE  as "GROSS RETURN VALUE",
+DSS.NET_RETURN_VALUE  as "NET RETURN VALUE"  ,
+DSS.TRAN_ID,
+DSS.REPL_QTY as "REPLACEMENT QUANTITY",
+DSS.DISC_AMT,
+DSS.MRP,
+DSS.PTR,
+DSS.PTS,
+DSS.HSN_CODE,
+DSS.PACK,
+DUE_DATE,
+DSS.CGST_AMT,
+DSS.CGST_RATE,
+DSS.SGST_RATE,
+DSS.SGST_AMT,
+DSS.ITEM_BRAND,
+DSS.IGST_AMT,
+DSS.IGST_RATE,
+DSS.REF_SER,
+DSS.SALES_VALUE,
+DSS.RETURN_VALUE,
+DSS.CUST_CODE__BIL,
+NVL((SELECT CITY from CUSTOMER where CUST_CODE = DSS.CUST_CODE),'NOTSPECIFIED') as "CITY",
+(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",
+DSS.target_value as BUDGET,
+( (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
+LEFT OUTER JOIN ITEMSER ISER ON I.ITEM_SER = ISER.ITEM_SER
+LEFT OUTER JOIN
+(
+select lv1.pos_code lv1,lv1.pos_code__repto lv1_repo,lv1.descr as lv1_descr,
+lv2.pos_code lv2,lv2.pos_code__repto lv2_repo,lv2.descr as lv2_descr,
+lv3.pos_code lv3,lv3.pos_code__repto lv3_repo,lv3.descr as lv3_descr,
+lv4.pos_code lv4,lv4.pos_code__repto lv4_repo,lv4.descr as lv4_descr,
+lv1.pos_code,lv1.table_no,lv1.version_id,lv1.pool_code
+from org_structure lv1
+left outer join org_structure lv2 on lv1.pos_code__repto=lv2.pos_code and lv1.table_no=lv2.table_no and lv1.version_id=lv2.version_id 
+left outer join org_structure lv3 on lv2.pos_code__repto=lv3.pos_code and lv2.table_no=lv3.table_no and lv2.version_id=lv3.version_id
+left outer join org_structure lv4 on lv3.pos_code__repto=lv4.pos_code and lv3.table_no=lv4.table_no and lv3.version_id=lv4.version_id 
+) DHH ON DHH.POS_CODE = DSS.POS_CODE
+ AND DHH.version_id in (select version_id from version where to_date(sysdate) between eff_from and valid_upto )
+ AND DHH.table_no = nvl( ISER.TABLE_NO__HIER, ISER.ITEM_SER )
+ WHERE DSS.DOC_DATE >= ?
+ and DSS.DOC_DATE <= ?
+ AND I.ITEM_SER >= ?
+ AND I.ITEM_SER <= ?
+ AND DSS.SITE_CODE = ?
\ No newline at end of file

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

@@ -59,7 +59,6 @@ DSS.CGST_AMT,
 DSS.CGST_RATE,
 DSS.SGST_RATE,
 DSS.SGST_AMT,
-DSS.CITY,
 DSS.ITEM_BRAND,
 DSS.IGST_AMT,
 DSS.IGST_RATE,
@@ -67,6 +66,7 @@ DSS.REF_SER,
 DSS.SALES_VALUE,
 DSS.RETURN_VALUE,
 DSS.CUST_CODE__BIL,
+NVL((SELECT CITY from CUSTOMER where CUST_CODE = DSS.CUST_CODE),''NOTSPECIFIED'') as "CITY",
 (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",

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

@@ -48,6 +48,7 @@ d.rl_val AS "REPLACEMENT VALUE",
 d.sales_value,
 d.return_value,
 d.CUST_CODE__BIL,
+NVL((SELECT CITY from CUSTOMER where CUST_CODE = d.CUST_CODE),''NOTSPECIFIED'') as "CITY",
 (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",