20260519生产同步修复较多问题

This commit is contained in:
2026-05-20 16:06:43 +08:00
parent b02475424a
commit 6e957a44f6
23 changed files with 5355 additions and 4427 deletions

View File

@@ -34,6 +34,7 @@ table DM_AUTH_NONSALES_ORG
[Name = CatalogName, Kind = "Database"]
}[Data],
"
WITH TEMP_TABLE (
SELECT
USER_KCODE,
TA
@@ -41,7 +42,19 @@ table DM_AUTH_NONSALES_ORG
dm.dm_auth_nonsales_org
WHERE
TA IS NOT NULL
GROUP BY 1,2
GROUP BY 1,2)
SELECT
*
FROM
TEMP_TABLE
UNION ALL
SELECT
USER_KCODE,
'ALL' TA
FROM
TEMP_TABLE
GROUP BY
1
"
& UsingLimit,
null,

View File

@@ -598,7 +598,7 @@ table Dim_RC
annotation PBI_NavigationStepName = Navigation
annotation PBI_ResultType = Table
annotation PBI_ResultType = Exception
annotation TabularEditor_TableGroup = 04_DimTable

View File

@@ -352,7 +352,8 @@ table Fact_Retail
) B
ON A.PACK_CODE = B.PACK_CODE
where
(B.pack_code IS NULL and a.KPI_NAME in ('weig_dist_rate','weighted_spread_rate','num_dist_rate','digital_spread_rate')) OR a.KPI_NAME NOT IN ('weig_dist_rate','weighted_spread_rate','num_dist_rate','digital_spread_rate')
(B.pack_code IS not null and GEO_KEY <> 'ROC')
OR B.pack_code IS null
GROUP BY
A.PACK_CODE,
A.CORP_COD,
@@ -404,6 +405,7 @@ table Fact_Retail
end as STR_KPI_VAL_EN_1
FROM
dm_zk_retail_sales_kpi A
WHERE YYYYMM>=202101
"
& UsingLimit,
null,

View File

@@ -247,7 +247,7 @@ table Measure
measure 'External.Sales.KPI.Market' =
VAR PV = [External.Sales.KPI]
VAR CV = [External.MKTPack.Count]
VAR CV = IF ( ISFILTERED ( Config_PageFlag_FreeReportNIAD ), COUNTROWS ( Fact_Sales_NIAD ) , [External.MKTPack.Count])
VAR T =
SWITCH (
TRUE ( )
@@ -2731,13 +2731,25 @@ table Measure
|| ISFILTERED ( Dim_BrandDefaultMKT ),
IF (
[External.Sales.KPI.Market] <> 0,
CALCULATE (
[External.Sales.KPI]
, ALLSELECTED ( Dim_DataSource )
, REMOVEFILTERS ( Dim_PackInfo )
, TREATAS (
VALUES ( Fact_Sales[CLASS_KEY] ),
Dim_Class[CLASS_SOURCE]
IF (
ISFILTERED ( Config_PageFlag_FreeReportNIAD ),
CALCULATE (
[External.Sales.KPI],
ALLSELECTED ( Dim_DataSource ),
REMOVEFILTERS ( Dim_PackInfo ),
TREATAS (
VALUES ( Fact_Sales_NIAD[CLASS_SOURCE] ),
Dim_Class[CLASS_SOURCE]
)
),
CALCULATE (
[External.Sales.KPI],
ALLSELECTED ( Dim_DataSource ),
REMOVEFILTERS ( Dim_PackInfo ),
TREATAS (
VALUES ( Fact_Sales[CLASS_KEY] ),
Dim_Class[CLASS_SOURCE]
)
)
)
)
@@ -5130,13 +5142,25 @@ table Measure
|| ISFILTERED ( Dim_BrandDefaultMKT ),
IF (
[External.Sales.LY.KPI.Market] <> 0,
CALCULATE (
[External.Sales.LY.KPI],
ALLSELECTED ( Dim_DataSource ),
REMOVEFILTERS ( Dim_PackInfo ),
TREATAS (
VALUES ( Fact_Sales[CLASS_KEY] ),
Dim_Class[CLASS_SOURCE]
IF (
ISFILTERED ( Config_PageFlag_FreeReportNIAD ),
CALCULATE (
[External.Sales.LY.KPI],
ALLSELECTED ( Dim_DataSource ),
REMOVEFILTERS ( Dim_PackInfo ),
TREATAS (
VALUES ( Fact_Sales_NIAD[CLASS_SOURCE] ),
Dim_Class[CLASS_SOURCE]
)
),
CALCULATE (
[External.Sales.LY.KPI],
ALLSELECTED ( Dim_DataSource ),
REMOVEFILTERS ( Dim_PackInfo ),
TREATAS (
VALUES ( Fact_Sales[CLASS_KEY] ),
Dim_Class[CLASS_SOURCE]
)
)
)
)
@@ -7370,9 +7394,7 @@ table Measure
annotation PBI_FormatHint = {"isGeneralNumber":true}
measure 'External.Sales.KPI.Filter' =
CALCULATE([External.Value.MTH],MQY[Period]="mth")
measure 'External.Sales.KPI.Filter' = CALCULATE ( [01.Value], ALL ( Dim_Calendar ) )
displayFolder: OLD\External Sales
lineageTag: 301fa5ea-de21-48e3-a333-ac18f0dbef45
@@ -11006,7 +11028,7 @@ table Measure
measure 'External.Sales.LY.KPI.Market' =
VAR PV = [External.Sales.LY.KPI]
VAR CV = [External.MKTPack.Count]
VAR CV = IF ( ISFILTERED ( Config_PageFlag_FreeReportNIAD ), COUNTROWS ( Fact_Sales_NIAD ) , [External.MKTPack.Count])
VAR T =
SWITCH (
TRUE ( )