20260511chenwu定版

ec的store name 修复
retail的niad直取数据修复，niadfree report 页面的表直接拿dwd数据
nida free report页面数据错列问题修复

Retail/01 load_tmp_data.py

@@ -423,12 +423,12 @@ LEVEL_MARKET_RD = 'RD Market'
 # MAGIC         when right(quarter,2) = 'Q4' THEN '12' END) 
 # MAGIC     AS month,
 # MAGIC     quarter,
-# MAGIC     replace(price,',','' ),
-# MAGIC     replace(sales_unit,',','' ),
-# MAGIC     replace(sales_value,',','' ),
-# MAGIC     digital_spread_rate,
-# MAGIC     weighted_spread_rate,
-# MAGIC     counting_unit,
+# MAGIC     CAST ( avg( replace(price,',','' )) AS decimal(20,8) ) price,
+# MAGIC     CAST ( sum(replace(sales_unit,',','' )) as decimal(20,8)) sales_unit,
+# MAGIC     CAST ( sum(replace(sales_value,',','' )) as decimal(20,8)) sales_value,
+# MAGIC     CAST ( avg(digital_spread_rate) AS decimal(20,8)) digital_spread_rate,
+# MAGIC     CAST ( avg(weighted_spread_rate) as  decimal(20,8)) weighted_spread_rate,
+# MAGIC     CAST ( max(counting_unit) as decimal(20,8)) ,
 # MAGIC     null,
 # MAGIC     null,
 # MAGIC     null,
@@ -443,6 +443,25 @@ LEVEL_MARKET_RD = 'RD Market'
 # MAGIC     0,
 # MAGIC     null
 # MAGIC from dwd.dwd_gnd_ext_retail_nataional_niad
+# MAGIC GROUP BY 
+# MAGIC     zk_product_id,
+# MAGIC     zk_region,
+# MAGIC     zk_rx_otc,
+# MAGIC     zk_medicine_type,
+# MAGIC     zk_medicine_tier1,
+# MAGIC     zk_medicine_tier2,
+# MAGIC     zk_medicine_tier3,
+# MAGIC     zk_medicine_tier4,
+# MAGIC     zk_common_name,
+# MAGIC     zk_dosage_form,
+# MAGIC     zk_user_type,
+# MAGIC     zk_category_name,
+# MAGIC     zk_product_name,
+# MAGIC     zk_brand_name,
+# MAGIC     zk_manu_des,
+# MAGIC     zk_corp_des,
+# MAGIC     zk_pack_des,
+# MAGIC     quarter
 
 # COMMAND ----------
 

Retail/04 map_to_dws_table.ipynb

@@ -9,12 +9,12 @@
       "byteLimit": 2048000,
       "rowLimit": 10000
      },
-     "finishTime": 1778484351983,
+     "finishTime": 1778490019473,
      "inputWidgets": {},
      "nuid": "4d16488f-0327-4ced-b23f-41f960a90d2f",
      "showTitle": false,
-     "startTime": 1778484351892,
-     "submitTime": 1778484351680,
+     "startTime": 1778490019349,
+     "submitTime": 1778490019146,
      "tableResultSettingsMap": {},
      "title": ""
     }
@@ -35,12 +35,12 @@
       "implicitDf": true,
       "rowLimit": 10000
      },
-     "finishTime": 1778484383881,
+     "finishTime": 1778490037824,
      "inputWidgets": {},
      "nuid": "1168666b-255b-44a3-968b-4156c93dad53",
      "showTitle": false,
-     "startTime": 1778484351988,
-     "submitTime": 1778484351685,
+     "startTime": 1778490019478,
+     "submitTime": 1778490019152,
      "tableResultSettingsMap": {
       "0": {
        "dataGridStateBlob": "{\"version\":1,\"tableState\":{\"columnPinning\":{\"left\":[\"#row_number#\"],\"right\":[]},\"columnSizing\":{},\"columnVisibility\":{}},\"settings\":{\"columns\":{}},\"syncTimestamp\":1777430717962}",
@@ -376,12 +376,12 @@
       "byteLimit": 2048000,
       "rowLimit": 10000
      },
-     "finishTime": 1778484383981,
+     "finishTime": 1778490037922,
      "inputWidgets": {},
      "nuid": "efe5e7ee-82b5-46d9-85f7-650756dffbf8",
      "showTitle": false,
-     "startTime": 1778484383903,
-     "submitTime": 1778484351693,
+     "startTime": 1778490037828,
+     "submitTime": 1778490019162,
      "tableResultSettingsMap": {},
      "title": ""
     }

Retail/13 DM_TF_EXT_RETAIL_SALES.sql

@@ -38,7 +38,7 @@
 
 -- COMMAND ----------
 
--- CREATE TABLE catalog_e2_ngbi_qas.DM.DM_TF_EXT_RETAIL_NIAD_SALES (
+-- CREATE TABLE DM.DM_TF_EXT_RETAIL_NIAD_SALES (
 --   YYYYMM STRING,
 --   PACK_CODE STRING,
 --   CORP_CODE STRING,