20260511_chenwu_niad拆分的修改及部分bug修复暂定版本

2026-05-11 07:31:58 +00:00
parent 3a03ba1ad2
commit 4689311dc0
9 changed files with 569 additions and 460 deletions
--- a/UNIONALL/DM_TF_EXT_RETAIL_MARKET_SALES_NIAD.sql
+++ b/UNIONALL/DM_TF_EXT_RETAIL_MARKET_SALES_NIAD.sql
@@ -0,0 +1,233 @@
+-- Databricks notebook source
+-- CREATE OR REPLACE TABLE DM.DM_TF_EXT_RETAIL_MARKET_SALES (
+--   MARKET STRING,
+--   KEY_COMPETITOR STRING,
+--   CLASS STRING,
+--   YYYYMM STRING,
+--   PACK_COD STRING,
+--   CORP_COD STRING,
+--   AUDIT_COD STRING,
+--   PLATFORM_TYPE STRING,
+--   STORE_NAME STRING,
+--   STORE_TYPE STRING,
+--   REGION_TYPE STRING,
+--   DATA_SOURCE STRING,
+--   PACK_FLAG STRING,
+--   PROD_FLAG STRING,
+--   DTP_FLAG STRING,
+--   CMPS_FLAG STRING,
+--   NEW_CODE STRING COMMENT '主数据关联CODE',
+--   INST_CODE STRING COMMENT '内部机构编码',
+--   AIA_HP_FLAG STRING,
+--   DEPT_NAME STRING COMMENT '科室名称',
+--   H_LEVEL STRING,
+--   REIMBURSE STRING COMMENT '报销情况',
+--   REIMBURSE_TYPE STRING COMMENT '报销类型',
+--   PRESCRIPTION_TYPE STRING COMMENT '处方来源',
+--   PRESCRIPTION DECIMAL(35,10),
+--   PRESCRIPTION_LY DECIMAL(35,10),
+--   VA STRING,
+--   UT STRING,
+--   CU STRING,
+--   PT STRING,
+--   SALES_UNIT_CAL DECIMAL(35,6),
+--   SALES_UNIT_CAL_LY DECIMAL(35,6),
+--   SALES_VALUE_CAL DECIMAL(35,6),
+--   SALES_VALUE_CAL_LY DECIMAL(35,6),
+--   CONUTING_UNIT DECIMAL(35,6),
+--   CONUTING_UNIT_LY DECIMAL(35,6),
+--   PDOT DECIMAL(35,6),
+--   PDOT_LY DECIMAL(35,6),
+--   ETL_INSERT_DT TIMESTAMP,
+--   ETL_UPDATE_DT TIMESTAMP
+--   )
+-- USING delta
+-- PARTITIONED BY (DATA_SOURCE)
+-- -- LOCATION 'abfss://master@azcdatalakeprd.dfs.core.chinacloudapi.cn/DM/dm_tf_ext_retail_market_sales';
+-- -- 上面是生产环境location，下面是测试环境location
+-- LOCATION 'abfss://master@retaildlstoragetest.dfs.core.chinacloudapi.cn/DM/dm_tf_ext_retail_market_sales';
+
+
+-- COMMAND ----------
+
+INSERT OVERWRITE TABLE
+  DM.DM_TF_EXT_RETAIL_MARKET_SALES(
+  MARKET,
+  KEY_COMPETITOR,
+  CLASS,
+  YYYYMM,
+  PACK_COD,
+  CORP_COD,
+  AUDIT_COD,
+  PLATFORM_TYPE,
+  STORE_NAME,
+  STORE_TYPE,
+  REGION_TYPE,
+  DATA_SOURCE,
+  PACK_FLAG,
+  PROD_FLAG,
+  DTP_FLAG,
+  CMPS_FLAG,
+  NEW_CODE,
+  INST_CODE,
+  AIA_HP_FLAG,
+  DEPT_NAME,
+  H_LEVEL,
+  REIMBURSE,
+  REIMBURSE_TYPE,
+  PRESCRIPTION_TYPE,
+  PRESCRIPTION,
+  PRESCRIPTION_LY,
+  VA,
+  UT,
+  CU,
+  PT,
+  SALES_UNIT_CAL,
+  SALES_UNIT_CAL_LY,
+  SALES_VALUE_CAL,
+  SALES_VALUE_CAL_LY,
+  CONUTING_UNIT,
+  CONUTING_UNIT_LY,
+  PDOT,
+  PDOT_LY,
+  ETL_INSERT_DT,
+  ETL_UPDATE_DT
+  )
+WITH
+  t1_filtered AS (
+    SELECT
+      *
+    FROM
+      DM.DM_TF_EXT_RETAIL_NIAD_SALES
+  ),
+  mapping_cleaned AS (
+    SELECT
+      *
+    FROM
+      (
+        SELECT
+          PACK_CODE,
+          'Retail(Quarterly)' DATASOURCE,
+          MARKET,
+          KEY_COMPETITOR,
+          CLASS,
+          MARKET_RATIO,
+          Value_brand_Ratio,
+          Unit_brand_Ratio,
+          CountingUnit_brand_Ratio,
+          PDOT_brand_Ratio,
+          GREATEST                 (
+            starttime,
+            Value_brand_Ratio_start,
+            Unit_brand_start,
+            CountingUnit_brand_start,
+            PDOT_brand_start
+          ) AS eff_start,
+          LEAST (
+            endtime,
+            Value_brand_Ratio_end,
+            Unit_brand_end,
+            CountingUnit_brand_end,
+            PDOT_brand_end
+          ) AS eff_end
+        FROM
+          DM.dm_td_ext_retail_market_pack_mapping
+      ) tmp
+    WHERE
+      eff_start <= eff_end -- 在外层子查询中过滤
+  )  ,
+  joined AS (
+    SELECT
+      /*+ BROADCAST(t2, t3) */ 
+      t1.*,
+      -- 当年                    ratio
+      t2.MARKET,
+      t2.KEY_COMPETITOR,
+      t2.CLASS,
+      t2.MARKET_RATIO AS cy_market_ratio,
+      t2.Value_brand_Ratio AS cy_value_ratio,
+      t2.Unit_brand_Ratio AS cy_unit_ratio,
+      t2.CountingUnit_brand_Ratio AS cy_cu_ratio,
+      t2.PDOT_brand_Ratio AS cy_pdot_ratio,
+      -- 去年 ratio
+      t3.MARKET_RATIO AS ly_market_ratio,
+      t3.Value_brand_Ratio AS ly_value_ratio,
+      t3.Unit_brand_Ratio AS ly_unit_ratio,
+      t3.CountingUnit_brand_Ratio AS ly_cu_ratio,
+      t3.PDOT_brand_Ratio AS ly_pdot_ratio
+    FROM
+      t1_filtered t1
+      LEFT JOIN mapping_cleaned t2 ON t1.PACK_CODE = t2.PACK_CODE
+      AND t1.DATA_SOURCE = t2.DATASOURCE
+      AND t1.YYYYMM >= t2.eff_start
+      AND t1.YYYYMM <= t2.eff_end
+      LEFT JOIN mapping_cleaned t3 ON t1.PACK_CODE = t3.PACK_CODE
+      AND t1.DATA_SOURCE = t3.DATASOURCE
+      AND (t1.YYYYMM - 100) >= t3.eff_start
+      AND (t1.YYYYMM - 100) <= t3.eff_end
+      AND t2.MARKET = t3.MARKET -- 保持原逻辑
+  )
+SELECT
+  NVL(MARKET, 'ALL Market')     AS MARKET,
+  NVL(KEY_COMPETITOR, 'OTHERS') AS KEY_COMPETITOR,
+  CASE 
+    WHEN trim(lower(CLASS)) = 'others' THEN 'OTHERS'
+    WHEN CLASS IS NULL THEN 'OTHERS'
+    ELSE CLASS 
+  END AS CLASS,
+  YYYYMM,
+  PACK_CODE,
+  CORP_CODE,
+  AUDIT_CODE,
+  PLATFORM_TYPE,
+  STORE_NAME,
+  STORE_TYPE,
+  REGION_TYPE,
+  DATA_SOURCE,
+  PACK_FLAG,
+  PROD_FLAG,
+  DTP_FLAG,
+  CMPS_FLAG,
+  NEW_CODE,
+  INST_CODE,
+  NULL                          AS AIA_HP_FLAG,
+  DEPT_NAME,
+  H_LEVEL,
+  REIMBURSE,
+  REIMBURSE_TYPE,
+  PRESCRIPTION_SOURCE           AS PRESCRIPTION_TYPE,
+  CAST(PRESCRIPTION AS DECIMAL(35, 6)) AS PRESCRIPTIONAS,
+  CAST(PRESCRIPTION_LY AS DECIMAL(35, 6)) AS PRESCRIPTION_LY,
+  --                            预计算公用因子，避免重复计算
+  NVL(NVL(cy_market_ratio, 1) * cy_value_ratio, 1) AS VA,
+  NVL(NVL(cy_market_ratio, 1) * cy_unit_ratio, 1) AS UT,
+  NVL(NVL(cy_market_ratio, 1) * cy_cu_ratio, 1) AS CU,
+  NVL(NVL(cy_market_ratio, 1) * cy_pdot_ratio, 1) AS PT,
+  CAST(
+    SALES_UNIT_CAL * NVL(cy_unit_ratio, 1) * NVL(cy_market_ratio, 1) AS DECIMAL(35, 6)
+  ) AS SALES_UNIT_CAL,
+  CAST(
+    SALES_UNIT_CAL_LY * NVL(ly_unit_ratio, 1) * NVL(ly_market_ratio, 1) AS DECIMAL(35, 6)
+  ) AS SALES_UNIT_CAL_LY,
+  CAST(
+    SALES_VALUE_CAL * NVL(cy_value_ratio, 1) * NVL(cy_market_ratio, 1) AS DECIMAL(35, 6)
+  ) AS SALES_VALUE_CAL,
+  CAST(
+    SALES_VALUE_CAL_LY * NVL(ly_value_ratio, 1) * NVL(ly_market_ratio, 1) AS DECIMAL(35, 6)
+  ) AS SALES_VALUE_CAL_LY,
+  CAST(
+    CONUTING_UNIT * NVL(cy_cu_ratio, 1) * NVL(cy_market_ratio, 1) AS DECIMAL(35, 6)
+  ) AS CONUTING_UNIT,
+  CAST(
+    CONUTING_UNIT_LY * NVL(ly_cu_ratio, 1) * NVL(ly_market_ratio, 1) AS DECIMAL(35, 6)
+  ) AS CONUTING_UNIT_LY,
+  CAST(
+    CONUTING_UNIT * NVL(cy_pdot_ratio, 1) * NVL(cy_market_ratio, 1) AS DECIMAL(35, 6)
+  ) AS PDOT,
+  CAST(
+    CONUTING_UNIT_LY * NVL(ly_pdot_ratio, 1) * NVL(ly_market_ratio, 1) AS DECIMAL(35, 6)
+  ) AS PDOT_LY,
+  FROM_UTC_TIMESTAMP(CURRENT_TIMESTAMP(), 'UTC+8') AS ETL_INSERT_DT,
+  FROM_UTC_TIMESTAMP(CURRENT_TIMESTAMP(), 'UTC+8') AS ETL_UPDATE_DT
+FROM
+  joined;
--- a/UNIONALL/DM_TF_EXT_UNIONALL_MARKET_SALES.sql
+++ b/UNIONALL/DM_TF_EXT_UNIONALL_MARKET_SALES.sql
@@ -223,6 +223,7 @@

 -- COMMAND ----------

+-- DBTITLE 1,market_sales
 INSERT OVERWRITE TABLE
  DM.DM_TF_EXT_UNIONALL_MARKET_SALES
 WITH
@@ -522,146 +523,3 @@ SELECT
  FROM_UTC_TIMESTAMP(CURRENT_TIMESTAMP(), 'UTC+8') AS ETL_UPDATE_DT
 FROM
  joined;
-
-- COMMAND ----------
-
-INSERT into TABLE
-  DM.DM_TF_EXT_UNIONALL_MARKET_SALES
-WITH
-  t1_filtered AS (
-    SELECT
-      *
-    FROM
-      DM.DM_TF_EXT_RETAIL_NIAD_SALES
-  ),
-  mapping_cleaned AS (
-    SELECT
-      *
-    FROM
-      (
-        SELECT
-          PACK_CODE,
-          DATASOURCE,
-          MARKET,
-          KEY_COMPETITOR,
-          CLASS,
-          MARKET_RATIO,
-          Value_brand_Ratio,
-          Unit_brand_Ratio,
-          CountingUnit_brand_Ratio,
-          PDOT_brand_Ratio,
-          GREATEST                 (
-            starttime,
-            Value_brand_Ratio_start,
-            Unit_brand_start,
-            CountingUnit_brand_start,
-            PDOT_brand_start
-          ) AS eff_start,
-          LEAST (
-            endtime,
-            Value_brand_Ratio_end,
-            Unit_brand_end,
-            CountingUnit_brand_end,
-            PDOT_brand_end
-          ) AS eff_end
-        FROM
-          DM.dm_td_ext_unionall_market_pack_mapping
-      ) tmp
-    WHERE
-      eff_start <= eff_end -- 在外层子查询中过滤
-  )  ,
-  joined AS (
-    SELECT
-      /*+ BROADCAST(t2, t3) */ 
-      t1.*,
-      -- 当年                    ratio
-      t2.MARKET,
-      t2.KEY_COMPETITOR,
-      t2.CLASS,
-      t2.MARKET_RATIO AS cy_market_ratio,
-      t2.Value_brand_Ratio AS cy_value_ratio,
-      t2.Unit_brand_Ratio AS cy_unit_ratio,
-      t2.CountingUnit_brand_Ratio AS cy_cu_ratio,
-      t2.PDOT_brand_Ratio AS cy_pdot_ratio,
-      -- 去年 ratio
-      t3.MARKET_RATIO AS ly_market_ratio,
-      t3.Value_brand_Ratio AS ly_value_ratio,
-      t3.Unit_brand_Ratio AS ly_unit_ratio,
-      t3.CountingUnit_brand_Ratio AS ly_cu_ratio,
-      t3.PDOT_brand_Ratio AS ly_pdot_ratio
-    FROM
-      t1_filtered t1
-      LEFT JOIN mapping_cleaned t2 ON t1.PACK_CODE = t2.PACK_CODE
-      AND t1.DATA_SOURCE = t2.DATASOURCE
-      AND t1.YYYYMM >= t2.eff_start
-      AND t1.YYYYMM <= t2.eff_end
-      LEFT JOIN mapping_cleaned t3 ON t1.PACK_CODE = t3.PACK_CODE
-      AND t1.DATA_SOURCE = t3.DATASOURCE
-      AND (t1.YYYYMM - 100) >= t3.eff_start
-      AND (t1.YYYYMM - 100) <= t3.eff_end
-      AND t2.MARKET = t3.MARKET -- 保持原逻辑
-  )
-SELECT
-  NVL(MARKET, 'ALL Market')     AS MARKET,
-  NVL(KEY_COMPETITOR, 'OTHERS') AS KEY_COMPETITOR,
-  CASE 
-    WHEN trim(lower(CLASS)) = 'others' THEN 'OTHERS'
-    WHEN CLASS IS NULL THEN 'OTHERS'
-    ELSE CLASS 
-  END AS CLASS,
-  YYYYMM,
-  PACK_CODE,
-  CORP_CODE,
-  AUDIT_CODE,
-  PLATFORM_TYPE,
-  STORE_NAME,
-  STORE_TYPE,
-  REGION_TYPE,
-  DATA_SOURCE,
-  PACK_FLAG,
-  PROD_FLAG,
-  DTP_FLAG,
-  CMPS_FLAG,
-  NEW_CODE,
-  INST_CODE,
-  NULL                          AS AIA_HP_FLAG,
-  DEPT_NAME,
-  H_LEVEL,
-  REIMBURSE,
-  REIMBURSE_TYPE,
-  PRESCRIPTION_SOURCE           AS PRESCRIPTION_TYPE,
-  PRESCRIPTION,
-  PRESCRIPTION_LY,
-  --                            预计算公用因子，避免重复计算
-  NVL(NVL(cy_market_ratio, 1) * cy_value_ratio, 1) AS VA,
-  NVL(NVL(cy_market_ratio, 1) * cy_unit_ratio, 1) AS UT,
-  NVL(NVL(cy_market_ratio, 1) * cy_cu_ratio, 1) AS CU,
-  NVL(NVL(cy_market_ratio, 1) * cy_pdot_ratio, 1) AS PT,
-  CAST(
-    SALES_UNIT_CAL * NVL(cy_unit_ratio, 1) * NVL(cy_market_ratio, 1) AS DECIMAL(35, 6)
-  ) AS SALES_UNIT_CAL,
-  CAST(
-    SALES_UNIT_CAL_LY * NVL(ly_unit_ratio, 1) * NVL(ly_market_ratio, 1) AS DECIMAL(35, 6)
-  ) AS SALES_UNIT_CAL_LY,
-  CAST(
-    SALES_VALUE_CAL * NVL(cy_value_ratio, 1) * NVL(cy_market_ratio, 1) AS DECIMAL(35, 6)
-  ) AS SALES_VALUE_CAL,
-  CAST(
-    SALES_VALUE_CAL_LY * NVL(ly_value_ratio, 1) * NVL(ly_market_ratio, 1) AS DECIMAL(35, 6)
-  ) AS SALES_VALUE_CAL_LY,
-  CAST(
-    CONUTING_UNIT * NVL(cy_cu_ratio, 1) * NVL(cy_market_ratio, 1) AS DECIMAL(35, 6)
-  ) AS CONUTING_UNIT,
-  CAST(
-    CONUTING_UNIT_LY * NVL(ly_cu_ratio, 1) * NVL(ly_market_ratio, 1) AS DECIMAL(35, 6)
-  ) AS CONUTING_UNIT_LY,
-  CAST(
-    CONUTING_UNIT * NVL(cy_pdot_ratio, 1) * NVL(cy_market_ratio, 1) AS DECIMAL(35, 6)
-  ) AS PDOT,
-  CAST(
-    CONUTING_UNIT_LY * NVL(ly_pdot_ratio, 1) * NVL(ly_market_ratio, 1) AS DECIMAL(35, 6)
-  ) AS PDOT_LY,
-  FROM_UTC_TIMESTAMP(CURRENT_TIMESTAMP(), 'UTC+8') AS ETL_INSERT_DT,
-  FROM_UTC_TIMESTAMP(CURRENT_TIMESTAMP(), 'UTC+8') AS ETL_UPDATE_DT
-FROM
-  joined;
--- a/UNIONALL/DM_TF_EXT_UNIONALL_SALES_MAPPING.sql
+++ b/UNIONALL/DM_TF_EXT_UNIONALL_SALES_MAPPING.sql
@@ -80,13 +80,15 @@ SELECT
  T0.STORE_TYPE,
  T0.REGION_TYPE,
  T0.DATA_SOURCE,
-  CASE WHEN P.MARKET IS NOT NULL THEN 1 
-  WHEN T0.PACK_FLAG  = 0 THEN 0 ELSE 2 END PACK_FLAG,
-  CASE WHEN P.MARKET IS NOT NULL THEN 1
+  CASE WHEN P.MARKET IS NOT NULL AND T0.PACK_FLAG = 1 THEN 1 
+  WHEN P.MARKET IS NOT NULL THEN 2
+  ELSE 0 END PACK_FLAG,
+  CASE WHEN P.MARKET IS NOT NULL AND T0.PROD_FLAG  = 1 THEN 1
+  WHEN P.MARKET IS NOT NULL THEN 2
  WHEN T0.MARKET = 'Metoprolol Succinate Market' AND PACK.PROD_DES = 'BETALOC ZOK' THEN 1
  WHEN T0.MARKET = 'Atorvastatin Market' AND PACK.PROD_DES = 'LIPITOR' THEN 1
  WHEN T0.MARKET = 'AZITHROMYCIN Market' AND PACK.PROD_DES = 'ZITHROMAX' THEN 1
-  WHEN T0.PROD_FLAG = 0 THEN 0 ELSE 2 END PROD_FLAG,
+  ELSE 0 END PROD_FLAG,
  T0.DTP_FLAG,
  CASE WHEN P.MARKET IS NOT NULL THEN 1 
  WHEN T0.MARKET = 'Metoprolol Succinate Market' AND PACK.PROD_DES = 'BETALOC ZOK' THEN 1
@@ -137,58 +139,6 @@ WHERE

 -- COMMAND ----------

-CREATE OR REPLACE TEMPORARY VIEW RETAIL_EXTERNAL_SALES_ALL AS
-SELECT
-  T0.MARKET,
-  T0.KEY_COMPETITOR,
-  T0.CLASS,
-  T0.YYYYMM,
-  T0.PACK_COD,
-  T0.CORP_COD,
-  T0.AUDIT_COD,
-  T0.PLATFORM_TYPE,
-  T0.STORE_NAME,
-  T0.STORE_TYPE,
-  T0.REGION_TYPE,
-  T0.DATA_SOURCE,
-  CASE WHEN T1.PACK_COD IS NOT NULL THEN 1 ELSE T0.PACK_FLAG END PACK_FLAG,
-  CASE WHEN T2.PROD_COD IS NOT NULL THEN 1 ELSE T0.PROD_FLAG END PROD_FLAG,
-  T0.DTP_FLAG,
-  CASE WHEN T3.CMPS_COD IS NOT NULL THEN 1 ELSE T0.CMPS_FLAG END CMPS_FLAG,
-  T0.NEW_CODE,
-  T0.INST_CODE,
-  T0.AIA_HP_FLAG,
-  T0.DEPT_NAME,
-  T0.H_LEVEL,
-  T0.REIMBURSE,
-  T0.REIMBURSE_TYPE,
-  T0.PRESCRIPTION_TYPE,
-  T0.VA,
-  T0.UT,
-  T0.CU,
-  T0.PT,
-  T0.SALES_UNIT_CAL,
-  T0.SALES_UNIT_CAL_LY,
-  T0.SALES_VALUE_CAL,
-  T0.SALES_VALUE_CAL_LY,
-  T0.CONUTING_UNIT,
-  T0.CONUTING_UNIT_LY,
-  T0.PDOT,
-  T0.PDOT_LY,
-  T0.PRESCRIPTION,
-  T0.PRESCRIPTION_LY,
-  T0.MERGED_DATA_DTP_OTHERS
-FROM
-  RETAIL_EXTERNAL_SALES AS T0
-LEFT JOIN (SELECT DISTINCT PACK_COD FROM RETAIL_EXTERNAL_SALES WHERE PACK_FLAG = 1) T1
-  ON T0.PACK_COD = T1.PACK_COD
-LEFT JOIN (SELECT DISTINCT PROD_COD FROM RETAIL_EXTERNAL_SALES WHERE PROD_FLAG = 1) T2
-  ON T0.PROD_COD = T2.PROD_COD
-LEFT JOIN (SELECT DISTINCT CMPS_COD FROM RETAIL_EXTERNAL_SALES WHERE CMPS_FLAG = 1) T3
-  ON T0.CMPS_COD = T3.CMPS_COD
-
-- COMMAND ----------
-
 CREATE OR REPLACE TEMPORARY VIEW ALL_EXTERNAL_SALES AS
 --DTP
 SELECT
@@ -287,12 +237,13 @@ SELECT
  1 MERGED_DATA_DTP_OTHERS
 FROM
  DM.DM_TF_EXT_UNIONALL_MARKET_SALES AS T0
-    LEFT JOIN (
+    INNER JOIN (
      SELECT
        OTHERS_MONTH
      FROM
        tmp.tmp_dm_td_ext_ec_niad_month
    ) T1 --EC取非niad先来数据部分
+  ON T0.YYYYMM <= T1.others_month
 WHERE
  T0.DATA_SOURCE = 'EC(Monthly)'
  AND SUBSTR(T0.YYYYMM, 5, 2) IN ('03', '06', '09', '12')
@@ -339,7 +290,7 @@ SELECT
  T0.PRESCRIPTION_LY,
  T0.MERGED_DATA_DTP_OTHERS
 FROM
-  RETAIL_EXTERNAL_SALES_ALL AS T0
+  RETAIL_EXTERNAL_SALES AS T0
 --OTHERS DATA SOURCE
 UNION ALL
 SELECT
@@ -389,14 +340,6 @@ WHERE

 -- COMMAND ----------

-
-
-- COMMAND ----------
-
-select distinct PACK_FLAG,PROD_FLAG from DM.DM_TF_EXT_UNIONALL_MARKET_SALES where DATA_SOURCE = 'Retail(Quarterly)'
-
-- COMMAND ----------
-
 create or replace table tmp.tmp_tf_ext_aia_target_inst 
 -- LOCATION 'abfss://master@azcdatalakeprd.dfs.core.chinacloudapi.cn/TMP/tmp_tf_ext_aia_target_inst';
 -- 上面是生产环境location，下面是测试环境location
@@ -535,7 +478,7 @@ FROM

 -- COMMAND ----------

-- delete from dm.DM_TF_EXT_UNIONALL_SALES_MAPPING where DATA_SOURCE IN ('Retail(Quarterly)', 'EC(Monthly)')
+delete from dm.DM_TF_EXT_UNIONALL_SALES_MAPPING where DATA_SOURCE IN ('Retail(Quarterly)', 'EC(Monthly)')

 -- COMMAND ----------

--- a/UNIONALL/DM_TF_EXT_UNIONALL_SALES_MAPPING_NIAD.sql
+++ b/UNIONALL/DM_TF_EXT_UNIONALL_SALES_MAPPING_NIAD.sql
@@ -209,7 +209,7 @@ SELECT /*+ BROADCAST(m) */
  CAST(round(kpi.DIGITAL_SPREAD_RATE,2) AS string)||'%'  AS DIGITAL_SPREAD_RATE,
  CAST(round(kpi.WEIGHTED_SPREAD_RATE,2) AS string)||'%' AS WEIGHTED_SPREAD_RATE
  
-FROM DM.DM_TF_EXT_UNIONALL_MARKET_SALES t
+FROM DM.DM_TF_EXT_RETAIL_MARKET_SALES t
 LEFT SEMI JOIN niad_pack_cods m ON t.PACK_COD = m.PACK_COD
 LEFT JOIN kpi_pivot kpi
       ON kpi.pack_code = t.PACK_COD