chore: update report visuals, semantic model definitions, and cleanup legacy queries

This commit is contained in:
2026-05-14 10:11:41 +08:00
parent 7118b73c5b
commit 84ae943bdb
50 changed files with 1949 additions and 902 deletions

View File

@@ -1,7 +1,17 @@
table 00_KPI
lineageTag: 39b8e218-c376-43f5-9748-3dbaa502b75b
measure chenwutest1 = COUNTROWS(FACT_SALES) //TOCSV ( VALUES ( Fact_Sales[market] ) )
measure chenwutest1 = ```
CALCULATE (
SUM ( Fact_EC[KPI_VAL] ),
Fact_EC[KPI_NAME] = "top_corp_sales",
Fact_EC[TA] = "",
Fact_EC[TOTAL_FLAG] = "y",
Fact_EC[PLATFORM] = "B2C全平台京东+天猫)",
REMOVEFILTERS ( Fact_EC[CORP_COD] ),
KEEPFILTERS ( Fact_EC[CORP_COD] = "" )
)
```
displayFolder: 01Normal
lineageTag: 327243a7-d1c4-4efa-bec8-96f85ad40cec
@@ -138,8 +148,8 @@ table 00_KPI
lineageTag: 593c4a0e-9a8f-452a-8838-9cb3267497c1
measure '00.base.if.countTA' =
//COUNTROWS ( ALL ( Dim_MarketTA ) )<>MAX (Config_TA_Countrows[@countrows])
FALSE ()
COUNTROWS ( ALL ( Dim_MarketTA ) )<>MAX (Config_TA_Countrows[count_all_ta])
//FALSE ()
displayFolder: 01Normal\00base
lineageTag: a07a34b4-9afd-4471-bd7e-3650c34cbdf9
@@ -1574,13 +1584,13 @@ table 00_KPI
annotation PBI_FormatHint = {"isGeneralNumber":true}
measure '00.Retail.NIAD.PDOT' = SUM ( Fact_Sales_NIAD[CONUTING_UNIT] )
measure '00.Retail.NIAD.PDOT' = SUM ( Fact_Sales_NIAD[PDOT] )
displayFolder: 02FreeReport_NIAD\00
lineageTag: 04b73112-a012-4bab-b05e-774810797bec
annotation PBI_FormatHint = {"isGeneralNumber":true}
measure '00.Retail.NIAD.PDOT.LY' = SUM ( Fact_Sales_NIAD[CONUTING_UNIT_LY] )
measure '00.Retail.NIAD.PDOT.LY' = SUM ( Fact_Sales_NIAD[PDOT_LY] )
displayFolder: 02FreeReport_NIAD\00
lineageTag: 8b95b9d7-235a-4d7e-b6ea-94e79fcce762
@@ -3574,7 +3584,8 @@ table 00_KPI
DS = "Retail" && _visualtag = 1,
CALCULATE (
MAX ( Fact_Direct_Retail_national_corp_rank[rank] ),
Fact_Direct_Retail_national_corp_rank[corp_cod] = "A5Z"
Fact_Direct_Retail_national_corp_rank[corp_cod] = "A5Z",
Fact_Direct_Retail_national_corp_rank[ta] = "Retail Total"
),
IF (
[ExternalTotal.Sales.KPI] <> BLANK ( ),
@@ -4333,14 +4344,13 @@ table 00_KPI
|| ISFILTERED ( Dim_PackInfo[PROD_DES] )
|| ISFILTERED ( Dim_PackInfo[PROD_DES_C] ) )
-- 是否过滤到"品牌/产品"层级
VAR _isfilter_not_packinfo_only_mole =
ISFILTERED ( Dim_PackInfo[MOLECULE_CODE_DESC] )
|| ISFILTERED ( Dim_PackInfo[MOLECULE_DES_C] )
|| ISFILTERED ( Dim_PackInfo[CMPS_COD] )
|| ISFILTERED ( Dim_PackInfo[CMPS_DES] )
|| ISFILTERED ( Dim_PackInfo[CMPS_DES_C] )
-- 仅分子/成分层级过滤(未细化到品牌/包装)→ 使用 CMPS_FLAG
//VAR _isfilter_not_packinfo_only_mole =
// ISFILTERED ( Dim_PackInfo[MOLECULE_CODE_DESC] )
// || ISFILTERED ( Dim_PackInfo[MOLECULE_DES_C] )
// || ISFILTERED ( Dim_PackInfo[CMPS_COD] )
// || ISFILTERED ( Dim_PackInfo[CMPS_DES] )
// || ISFILTERED ( Dim_PackInfo[CMPS_DES_C] )
//-- 仅分子/成分层级过滤(未细化到品牌/包装)→ 使用 CMPS_FLAG
RETURN
SWITCH (
@@ -4373,33 +4383,12 @@ table 00_KPI
[External.Sales.MTH],
KEEPFILTERS ( Fact_Sales[PROD_FLAG] = 1 )
),
_isfilter_not_packinfo_only_mole,
CALCULATE (
[External.Sales.MTH],
KEEPFILTERS ( Fact_Sales[CMPS_FLAG] = 1 )
),
[External.Sales.MTH]
),
NOT _isfilter_province,
SWITCH (
TRUE ( ),
isfilter_packinfo,
CALCULATE (
[External.Sales.MTH],
TREATAS ( { 1, 2 }, Fact_Sales[PACK_FLAG] )
),
_isfilter_brandinfo,
CALCULATE (
[External.Sales.MTH],
TREATAS ( { 1, 2 }, Fact_Sales[PROD_FLAG] )
),
_isfilter_not_packinfo_only_mole,
CALCULATE (
[External.Sales.MTH],
TREATAS ( { 1, 0 }, Fact_Sales[CMPS_FLAG] )
),
[External.Sales.MTH]
CALCULATE (
[External.Sales.MTH],
KEEPFILTERS ( Fact_Sales[PROD_FLAG] = 1 )
)
),
NOT _isfilter_province, [External.Sales.MTH],
[External.Sales.MTH]
),
@@ -4478,14 +4467,13 @@ table 00_KPI
|| ISFILTERED ( Dim_PackInfo[PROD_DES] )
|| ISFILTERED ( Dim_PackInfo[PROD_DES_C] ) )
-- 是否过滤到"品牌/产品"层级
VAR _isfilter_not_packinfo_only_mole =
ISFILTERED ( Dim_PackInfo[MOLECULE_CODE_DESC] )
|| ISFILTERED ( Dim_PackInfo[MOLECULE_DES_C] )
|| ISFILTERED ( Dim_PackInfo[CMPS_COD] )
|| ISFILTERED ( Dim_PackInfo[CMPS_DES] )
|| ISFILTERED ( Dim_PackInfo[CMPS_DES_C] )
-- 仅分子/成分层级过滤(未细化到品牌/包装)→ 使用 CMPS_FLAG
//VAR _isfilter_not_packinfo_only_mole =
// ISFILTERED ( Dim_PackInfo[MOLECULE_CODE_DESC] )
// || ISFILTERED ( Dim_PackInfo[MOLECULE_DES_C] )
// || ISFILTERED ( Dim_PackInfo[CMPS_COD] )
// || ISFILTERED ( Dim_PackInfo[CMPS_DES] )
// || ISFILTERED ( Dim_PackInfo[CMPS_DES_C] )
//-- 仅分子/成分层级过滤(未细化到品牌/包装)→ 使用 CMPS_FLAG
RETURN
SWITCH (
@@ -4518,33 +4506,35 @@ table 00_KPI
[External.Sales.LY.MTH],
KEEPFILTERS ( Fact_Sales[PROD_FLAG] = 1 )
),
_isfilter_not_packinfo_only_mole,
CALCULATE (
[External.Sales.LY.MTH],
KEEPFILTERS ( Fact_Sales[CMPS_FLAG] = 1 )
),
[External.Sales.LY.MTH]
//_isfilter_not_packinfo_only_mole,
// CALCULATE (
// [External.Sales.LY.MTH],
// KEEPFILTERS ( Fact_Sales[CMPS_FLAG] = 1 )
// ),
CALCULATE (
[External.Sales.LY.MTH],
KEEPFILTERS ( Fact_Sales[PROD_FLAG] = 1 )
)
),
NOT _isfilter_province,
SWITCH (
TRUE ( ),
isfilter_packinfo,
CALCULATE (
[External.Sales.LY.MTH],
TREATAS ( { 1, 2 }, Fact_Sales[PACK_FLAG] )
),
_isfilter_brandinfo,
CALCULATE (
[External.Sales.LY.MTH],
TREATAS ( { 1, 2 }, Fact_Sales[PROD_FLAG] )
),
_isfilter_not_packinfo_only_mole,
CALCULATE (
[External.Sales.LY.MTH],
TREATAS ( { 1, 0 }, Fact_Sales[CMPS_FLAG] )
),
[External.Sales.LY.MTH]
),
//SWITCH (
// TRUE ( ),
// isfilter_packinfo,
// CALCULATE (
// [External.Sales.LY.MTH],
// TREATAS ( { 1, 2, 3 }, Fact_Sales[PACK_FLAG] )
// ),
// _isfilter_brandinfo,
// CALCULATE (
// [External.Sales.LY.MTH],
// TREATAS ( { 1, 2, 3 }, Fact_Sales[PROD_FLAG] )
// ),
// //_isfilter_not_packinfo_only_mole,
// // CALCULATE (
// // [External.Sales.LY.MTH],
// // TREATAS ( { 1, 0 }, Fact_Sales[CMPS_FLAG] )
// // ),
[External.Sales.LY.MTH],
[External.Sales.LY.MTH]
),