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

@@ -6,6 +6,6 @@
}, },
"config": { "config": {
"version": "2.0", "version": "2.0",
"logicalId": "86b6a650-ebd1-4dbe-92d1-548f16a5425d" "logicalId": "16c8aecb-2392-49dd-abb3-57f1bb0875bc"
} }
} }

View File

@@ -1,5 +1,5 @@
{ {
"$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.7.0/schema.json", "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.8.0/schema.json",
"name": "055356e59a9e4694cb1c", "name": "055356e59a9e4694cb1c",
"position": { "position": {
"x": 0, "x": 0,
@@ -272,38 +272,7 @@
"filterConfig": { "filterConfig": {
"filters": [ "filters": [
{ {
"name": "Filter962532dab34b2ab2a164", "name": "Filter0b0ba353a32bdb988530",
"ordinal": 0,
"field": {
"Column": {
"Expression": {
"SourceRef": {
"Entity": "Dim_BrandDefaultMKT"
}
},
"Property": "BRAND_NAME"
}
},
"type": "Categorical"
},
{
"name": "Filter4bc039d60d2e20007a6a",
"ordinal": 1,
"field": {
"Column": {
"Expression": {
"SourceRef": {
"Entity": "Dim_BrandDefaultMKT"
}
},
"Property": "MARKET"
}
},
"type": "Categorical"
},
{
"name": "Filterc26252015507a5f83245",
"ordinal": 2,
"field": { "field": {
"Measure": { "Measure": {
"Expression": { "Expression": {
@@ -311,7 +280,7 @@
"Entity": "Measure" "Entity": "Measure"
} }
}, },
"Property": "External.Sales.KPI" "Property": "External.Sales.KPI.Filter"
} }
}, },
"type": "Advanced", "type": "Advanced",
@@ -338,7 +307,7 @@
"Source": "m" "Source": "m"
} }
}, },
"Property": "External.Sales.KPI" "Property": "External.Sales.KPI.Filter"
} }
}, },
"Right": { "Right": {
@@ -354,6 +323,78 @@
] ]
}, },
"howCreated": "User" "howCreated": "User"
},
{
"name": "c0622963edc1161ae0ae",
"field": {
"Column": {
"Expression": {
"SourceRef": {
"Entity": "Dim_Class"
}
},
"Property": "CLASS"
}
},
"type": "Categorical",
"filter": {
"Version": 2,
"From": [
{
"Name": "d",
"Entity": "Dim_Class",
"Type": 0
}
],
"Where": [
{
"Condition": {
"Not": {
"Expression": {
"In": {
"Expressions": [
{
"Column": {
"Expression": {
"SourceRef": {
"Source": "d"
}
},
"Property": "CLASS"
}
}
],
"Values": [
[
{
"Literal": {
"Value": "null"
}
}
]
]
}
}
}
}
}
]
},
"objects": {
"general": [
{
"properties": {
"isInvertedSelectionMode": {
"expr": {
"Literal": {
"Value": "true"
}
}
}
}
}
]
}
} }
], ],
"filterSortOrder": "Custom" "filterSortOrder": "Custom"

View File

@@ -1,5 +1,5 @@
{ {
"$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.7.0/schema.json", "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.9.0/schema.json",
"name": "b144e3c18e0b07b546aa", "name": "b144e3c18e0b07b546aa",
"position": { "position": {
"x": 3.4545454545454541, "x": 3.4545454545454541,
@@ -521,7 +521,7 @@
"autoSizeColumnWidth": { "autoSizeColumnWidth": {
"expr": { "expr": {
"Literal": { "Literal": {
"Value": "false" "Value": "true"
} }
} }
} }

View File

@@ -1,5 +1,5 @@
{ {
"$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.6.0/schema.json", "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.8.0/schema.json",
"name": "38556d0b11cec6b75711", "name": "38556d0b11cec6b75711",
"position": { "position": {
"x": 1.6849953401677542, "x": 1.6849953401677542,
@@ -411,6 +411,20 @@
] ]
}, },
"howCreated": "User" "howCreated": "User"
},
{
"name": "70162a3f9af55bda6801",
"field": {
"Column": {
"Expression": {
"SourceRef": {
"Entity": "Dim_PackInfo"
}
},
"Property": "PROD_DES"
}
},
"type": "Categorical"
} }
] ]
} }

View File

@@ -373,7 +373,7 @@
"howCreated": "User" "howCreated": "User"
}, },
{ {
"name": "60a75bcc9810c2cadd59", "name": "dd3ee784671890f146fb",
"ordinal": 2, "ordinal": 2,
"field": { "field": {
"Measure": { "Measure": {
@@ -382,23 +382,7 @@
"Entity": "00_KPI" "Entity": "00_KPI"
} }
}, },
"Property": "External.Value.MTH" "Property": "01.Value"
}
},
"type": "Advanced",
"howCreated": "User"
},
{
"name": "a2a68698907e2651da20",
"ordinal": 3,
"field": {
"Measure": {
"Expression": {
"SourceRef": {
"Entity": "Measure"
}
},
"Property": "External.Sales.KPI.Filter"
} }
}, },
"type": "Advanced", "type": "Advanced",
@@ -406,8 +390,8 @@
"Version": 2, "Version": 2,
"From": [ "From": [
{ {
"Name": "m", "Name": "0",
"Entity": "Measure", "Entity": "00_KPI",
"Type": 0 "Type": 0
} }
], ],
@@ -422,10 +406,10 @@
"Measure": { "Measure": {
"Expression": { "Expression": {
"SourceRef": { "SourceRef": {
"Source": "m" "Source": "0"
} }
}, },
"Property": "External.Sales.KPI.Filter" "Property": "01.Value"
} }
}, },
"Right": { "Right": {

View File

@@ -98,44 +98,6 @@
"Value": "true" "Value": "true"
} }
} }
},
"selfFilter": {
"filter": {
"Version": 2,
"From": [
{
"Name": "d",
"Entity": "Dim_Market",
"Type": 0
}
],
"Where": [
{
"Condition": {
"Contains": {
"Left": {
"Column": {
"Expression": {
"SourceRef": {
"Source": "d"
}
},
"Property": "MARKET"
}
},
"Right": {
"Literal": {
"Value": "'niad'"
}
}
}
},
"Annotations": {
"PowerBI.MParameterBehavior": 1
}
}
]
}
} }
} }
} }

View File

@@ -1,5 +1,5 @@
{ {
"$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.8.0/schema.json", "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.9.0/schema.json",
"name": "56e94c6f599350886d73", "name": "56e94c6f599350886d73",
"position": { "position": {
"x": 1.4210854715202004E-14, "x": 1.4210854715202004E-14,
@@ -14,7 +14,24 @@
"query": { "query": {
"queryState": { "queryState": {
"Columns": { "Columns": {
"projections": [], "projections": [
{
"field": {
"Column": {
"Expression": {
"SourceRef": {
"Entity": "Dim_Calendar_Alt"
}
},
"Property": "YEAR_QUATER"
}
},
"queryRef": "Dim_Calendar_Alt.YEAR_QUATER",
"nativeQueryRef": "Year_Q",
"active": true,
"displayName": "Year_Q"
}
],
"fieldParameters": [ "fieldParameters": [
{ {
"parameterExpr": { "parameterExpr": {
@@ -28,7 +45,7 @@
} }
}, },
"index": 0, "index": 0,
"length": 0 "length": 1
} }
] ]
}, },
@@ -1468,8 +1485,7 @@
"Property": "YEAR_QUATER" "Property": "YEAR_QUATER"
} }
}, },
"type": "TopN", "type": "TopN"
"howCreated": "User"
}, },
{ {
"name": "Filterfab02c7f0849e69d7257", "name": "Filterfab02c7f0849e69d7257",
@@ -1607,7 +1623,7 @@
[ [
{ {
"Literal": { "Literal": {
"Value": "'''Dim_Calendar_Alt''[YYYYMM]'" "Value": "'''Dim_Calendar_Alt''[YEAR_QUATER]'"
} }
} }
] ]
@@ -1635,7 +1651,7 @@
"0": [ "0": [
{ {
"Literal": { "Literal": {
"Value": "'''Dim_Calendar_Alt''[YYYYMM]'" "Value": "'''Dim_Calendar_Alt''[YEAR_QUATER]'"
} }
} }
] ]
@@ -1659,7 +1675,7 @@
}, },
"valueMap": [ "valueMap": [
{ {
"0": "Year_M" "0": "Year_Q"
} }
] ]
} }

View File

@@ -1,5 +1,5 @@
{ {
"$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.8.0/schema.json", "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.9.0/schema.json",
"name": "6a528bf18a90ba148a9e", "name": "6a528bf18a90ba148a9e",
"position": { "position": {
"x": 1.2434497875801753E-14, "x": 1.2434497875801753E-14,
@@ -23,12 +23,13 @@
"Entity": "Dim_Calendar_Alt" "Entity": "Dim_Calendar_Alt"
} }
}, },
"Property": "YYYYMM" "Property": "YEAR_QUATER"
} }
}, },
"queryRef": "Dim_Calendar_Alt.YYYYMM", "queryRef": "Dim_Calendar_Alt.YEAR_QUATER",
"nativeQueryRef": "YYYYMM", "nativeQueryRef": "Year_Q",
"active": true "active": true,
"displayName": "Year_Q"
} }
], ],
"fieldParameters": [ "fieldParameters": [
@@ -343,8 +344,7 @@
"Property": "YEAR_QUATER" "Property": "YEAR_QUATER"
} }
}, },
"type": "TopN", "type": "TopN"
"howCreated": "User"
}, },
{ {
"name": "Filter7614f47a8030b363057a", "name": "Filter7614f47a8030b363057a",
@@ -389,7 +389,8 @@
"Property": "YYYYMM" "Property": "YYYYMM"
} }
}, },
"type": "Categorical" "type": "Categorical",
"howCreated": "User"
}, },
{ {
"name": "38326c4dae2a7081a0b9", "name": "38326c4dae2a7081a0b9",

View File

@@ -1,5 +1,5 @@
{ {
"$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.8.0/schema.json", "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.9.0/schema.json",
"name": "8e41e8c300c793d9215a", "name": "8e41e8c300c793d9215a",
"position": { "position": {
"x": 0, "x": 0,
@@ -23,12 +23,13 @@
"Entity": "Dim_Calendar_Alt" "Entity": "Dim_Calendar_Alt"
} }
}, },
"Property": "YYYYMM" "Property": "YEAR_QUATER"
} }
}, },
"queryRef": "Dim_Calendar_Alt.YYYYMM", "queryRef": "Dim_Calendar_Alt.YEAR_QUATER",
"nativeQueryRef": "YYYYMM", "nativeQueryRef": "Year_Q",
"active": true "active": true,
"displayName": "Year_Q"
} }
], ],
"fieldParameters": [ "fieldParameters": [
@@ -1484,8 +1485,7 @@
"Property": "YEAR_QUATER" "Property": "YEAR_QUATER"
} }
}, },
"type": "TopN", "type": "TopN"
"howCreated": "User"
}, },
{ {
"name": "Filterfab02c7f0849e69d7257", "name": "Filterfab02c7f0849e69d7257",
@@ -1577,7 +1577,8 @@
"Property": "YYYYMM" "Property": "YYYYMM"
} }
}, },
"type": "Categorical" "type": "Categorical",
"howCreated": "User"
}, },
{ {
"name": "19bc038eb03ab13c25a0", "name": "19bc038eb03ab13c25a0",

View File

@@ -1,5 +1,5 @@
{ {
"$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.8.0/schema.json", "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.9.0/schema.json",
"name": "92ce1850d0a00e62ddad", "name": "92ce1850d0a00e62ddad",
"position": { "position": {
"x": 1.2434497875801753E-14, "x": 1.2434497875801753E-14,
@@ -14,7 +14,24 @@
"query": { "query": {
"queryState": { "queryState": {
"Category": { "Category": {
"projections": [], "projections": [
{
"field": {
"Column": {
"Expression": {
"SourceRef": {
"Entity": "Dim_Calendar_Alt"
}
},
"Property": "YEAR_QUATER"
}
},
"queryRef": "Dim_Calendar_Alt.YEAR_QUATER",
"nativeQueryRef": "Year_Q",
"active": true,
"displayName": "Year_Q"
}
],
"fieldParameters": [ "fieldParameters": [
{ {
"parameterExpr": { "parameterExpr": {
@@ -28,7 +45,7 @@
} }
}, },
"index": 0, "index": 0,
"length": 0 "length": 1
} }
] ]
}, },
@@ -310,8 +327,7 @@
"Property": "YEAR_QUATER" "Property": "YEAR_QUATER"
} }
}, },
"type": "Categorical", "type": "Categorical"
"howCreated": "User"
}, },
{ {
"name": "Filterf284c871b5e9aa0c444d", "name": "Filterf284c871b5e9aa0c444d",
@@ -417,7 +433,7 @@
[ [
{ {
"Literal": { "Literal": {
"Value": "'''Dim_Calendar_Alt''[YYYYMM]'" "Value": "'''Dim_Calendar_Alt''[YEAR_QUATER]'"
} }
} }
] ]
@@ -445,7 +461,7 @@
"0": [ "0": [
{ {
"Literal": { "Literal": {
"Value": "'''Dim_Calendar_Alt''[YYYYMM]'" "Value": "'''Dim_Calendar_Alt''[YEAR_QUATER]'"
} }
} }
] ]
@@ -469,7 +485,7 @@
}, },
"valueMap": [ "valueMap": [
{ {
"0": "Year_M" "0": "Year_Q"
} }
] ]
} }

View File

@@ -1,5 +1,5 @@
{ {
"$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.8.0/schema.json", "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.9.0/schema.json",
"name": "a16ef363295bdd777431", "name": "a16ef363295bdd777431",
"position": { "position": {
"x": 1.2434497875801753E-14, "x": 1.2434497875801753E-14,
@@ -23,13 +23,12 @@
"Entity": "Dim_Calendar_Alt" "Entity": "Dim_Calendar_Alt"
} }
}, },
"Property": "YEAR_QUATER" "Property": "YYYYMM"
} }
}, },
"queryRef": "Dim_Calendar_Alt.YEAR_QUATER", "queryRef": "Dim_Calendar_Alt.YYYYMM",
"nativeQueryRef": "Year_Q", "nativeQueryRef": "YYYYMM",
"active": true, "active": true
"displayName": "Year_Q"
} }
], ],
"fieldParameters": [ "fieldParameters": [
@@ -346,7 +345,8 @@
"Property": "YEAR_QUATER" "Property": "YEAR_QUATER"
} }
}, },
"type": "Categorical" "type": "Categorical",
"howCreated": "User"
}, },
{ {
"name": "Filter18c2b7254b7d9a101858", "name": "Filter18c2b7254b7d9a101858",
@@ -376,8 +376,7 @@
"Property": "YYYYMM" "Property": "YYYYMM"
} }
}, },
"type": "Categorical", "type": "Categorical"
"howCreated": "User"
}, },
{ {
"name": "1f69d6f9976c4419a496", "name": "1f69d6f9976c4419a496",

View File

@@ -1,5 +1,5 @@
{ {
"$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.8.0/schema.json", "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.9.0/schema.json",
"name": "ab8436b1c39992085c19", "name": "ab8436b1c39992085c19",
"position": { "position": {
"x": 0.412214314862156, "x": 0.412214314862156,
@@ -88,7 +88,7 @@
[ [
{ {
"Literal": { "Literal": {
"Value": "'202512'" "Value": "'R'"
} }
} }
] ]
@@ -116,7 +116,7 @@
"0": [ "0": [
{ {
"Literal": { "Literal": {
"Value": "'202512'" "Value": "'R'"
} }
} }
] ]
@@ -140,7 +140,7 @@
}, },
"valueMap": [ "valueMap": [
{ {
"0": "202512" "0": "R"
} }
] ]
} }
@@ -379,6 +379,20 @@
] ]
}, },
"howCreated": "User" "howCreated": "User"
},
{
"name": "6ddad4d76b1b54e66ca2",
"field": {
"Column": {
"Expression": {
"SourceRef": {
"Entity": "Dim_Calendar"
}
},
"Property": "YYYYMM_EXTERNAL"
}
},
"type": "Categorical"
} }
] ]
} }

View File

@@ -1,5 +1,5 @@
{ {
"$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.8.0/schema.json", "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.9.0/schema.json",
"name": "beaf29701729ae2bd5de", "name": "beaf29701729ae2bd5de",
"position": { "position": {
"x": 0, "x": 0,
@@ -23,13 +23,12 @@
"Entity": "Dim_Calendar_Alt" "Entity": "Dim_Calendar_Alt"
} }
}, },
"Property": "YEAR_QUATER" "Property": "YYYYMM"
} }
}, },
"queryRef": "Dim_Calendar_Alt.YEAR_QUATER", "queryRef": "Dim_Calendar_Alt.YYYYMM",
"nativeQueryRef": "Year_Q", "nativeQueryRef": "YYYYMM",
"active": true, "active": true
"displayName": "Year_Q"
} }
], ],
"fieldParameters": [ "fieldParameters": [
@@ -79,7 +78,7 @@
}, },
"queryRef": "Fact_Retail.prod or pack", "queryRef": "Fact_Retail.prod or pack",
"nativeQueryRef": "PACK_DES", "nativeQueryRef": "PACK_DES",
"active": true, "active": false,
"displayName": "PACK_DES" "displayName": "PACK_DES"
} }
] ]
@@ -1500,7 +1499,8 @@
"Property": "YEAR_QUATER" "Property": "YEAR_QUATER"
} }
}, },
"type": "Categorical" "type": "Categorical",
"howCreated": "User"
}, },
{ {
"name": "Filtere1e6ea85996510626733", "name": "Filtere1e6ea85996510626733",
@@ -1599,8 +1599,7 @@
"Property": "YYYYMM" "Property": "YYYYMM"
} }
}, },
"type": "Categorical", "type": "Categorical"
"howCreated": "User"
}, },
{ {
"name": "979708950c023abe94b8", "name": "979708950c023abe94b8",

View File

@@ -1,5 +1,5 @@
{ {
"$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.7.0/schema.json", "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.8.0/schema.json",
"name": "0548c76c98a576f4c57a", "name": "0548c76c98a576f4c57a",
"position": { "position": {
"x": 0, "x": 0,
@@ -272,38 +272,7 @@
"filterConfig": { "filterConfig": {
"filters": [ "filters": [
{ {
"name": "Filter962532dab34b2ab2a164", "name": "Filter0b0ba353a32bdb988530",
"ordinal": 0,
"field": {
"Column": {
"Expression": {
"SourceRef": {
"Entity": "Dim_BrandDefaultMKT"
}
},
"Property": "BRAND_NAME"
}
},
"type": "Categorical"
},
{
"name": "Filter4bc039d60d2e20007a6a",
"ordinal": 1,
"field": {
"Column": {
"Expression": {
"SourceRef": {
"Entity": "Dim_BrandDefaultMKT"
}
},
"Property": "MARKET"
}
},
"type": "Categorical"
},
{
"name": "Filterc26252015507a5f83245",
"ordinal": 2,
"field": { "field": {
"Measure": { "Measure": {
"Expression": { "Expression": {
@@ -311,7 +280,7 @@
"Entity": "Measure" "Entity": "Measure"
} }
}, },
"Property": "External.Sales.KPI" "Property": "External.Sales.KPI.Filter"
} }
}, },
"type": "Advanced", "type": "Advanced",
@@ -338,7 +307,7 @@
"Source": "m" "Source": "m"
} }
}, },
"Property": "External.Sales.KPI" "Property": "External.Sales.KPI.Filter"
} }
}, },
"Right": { "Right": {
@@ -354,6 +323,78 @@
] ]
}, },
"howCreated": "User" "howCreated": "User"
},
{
"name": "c0622963edc1161ae0ae",
"field": {
"Column": {
"Expression": {
"SourceRef": {
"Entity": "Dim_Class"
}
},
"Property": "CLASS"
}
},
"type": "Categorical",
"filter": {
"Version": 2,
"From": [
{
"Name": "d",
"Entity": "Dim_Class",
"Type": 0
}
],
"Where": [
{
"Condition": {
"Not": {
"Expression": {
"In": {
"Expressions": [
{
"Column": {
"Expression": {
"SourceRef": {
"Source": "d"
}
},
"Property": "CLASS"
}
}
],
"Values": [
[
{
"Literal": {
"Value": "null"
}
}
]
]
}
}
}
}
}
]
},
"objects": {
"general": [
{
"properties": {
"isInvertedSelectionMode": {
"expr": {
"Literal": {
"Value": "true"
}
}
}
}
}
]
}
} }
], ],
"filterSortOrder": "Custom" "filterSortOrder": "Custom"

View File

@@ -1,5 +1,5 @@
{ {
"$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/report/3.2.0/schema.json", "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/report/3.3.0/schema.json",
"themeCollection": { "themeCollection": {
"baseTheme": { "baseTheme": {
"name": "CY22SU11", "name": "CY22SU11",
@@ -43,7 +43,7 @@
"expanded": { "expanded": {
"expr": { "expr": {
"Literal": { "Literal": {
"Value": "false" "Value": "true"
} }
} }
}, },
@@ -64,17 +64,6 @@
"variance8E4BB1B41A8942A7B897C7014A6E1F56" "variance8E4BB1B41A8942A7B897C7014A6E1F56"
], ],
"resourcePackages": [ "resourcePackages": [
{
"name": "chartsTwo226D5C0C954C4A8F94E747EECBCB7FC8",
"type": "CustomVisual",
"items": [
{
"name": "chartsTwo226D5C0C954C4A8F94E747EECBCB7FC8.pbiviz.json",
"path": "chartsTwo226D5C0C954C4A8F94E747EECBCB7FC8.pbiviz.json",
"type": "CustomVisualMetadata"
}
]
},
{ {
"name": "SharedResources", "name": "SharedResources",
"type": "SharedResources", "type": "SharedResources",
@@ -86,6 +75,17 @@
} }
] ]
}, },
{
"name": "chartsTwo226D5C0C954C4A8F94E747EECBCB7FC8",
"type": "CustomVisual",
"items": [
{
"name": "resources/chartsTwo226D5C0C954C4A8F94E747EECBCB7FC8.pbiviz.json",
"path": "chartsTwo226D5C0C954C4A8F94E747EECBCB7FC8.pbiviz.json",
"type": "CustomVisualMetadata"
}
]
},
{ {
"name": "RegisteredResources", "name": "RegisteredResources",
"type": "RegisteredResources", "type": "RegisteredResources",

View File

@@ -6,6 +6,6 @@
}, },
"config": { "config": {
"version": "2.0", "version": "2.0",
"logicalId": "bcbe6f4e-ce6c-4a10-9fb7-ca20371860a8" "logicalId": "e651f9f7-6c0e-468b-b3e6-610ef7960ab4"
} }
} }

View File

@@ -21,7 +21,7 @@ expression limit = "10" meta [IsParameterQuery=true, Type="Text", IsParameterQue
annotation PBI_ResultType = Text annotation PBI_ResultType = Text
/// 切换数据源Http路径使用 /// 切换数据源Http路径使用
expression HttpPath = "sql/protocolv1/o/1064580724995799/1118-074021-486fqthp" meta [IsParameterQuery=true, List={"sql/protocolv1/o/1064580724995799/1118-074021-486fqthp", "sql/protocolv1/o/4124350841043461/0410-074134-do66802w"}, DefaultValue="sql/protocolv1/o/1064580724995799/1118-074021-486fqthp", Type="Text", IsParameterQueryRequired=true] expression HttpPath = "sql/protocolv1/o/4124350841043461/0410-074134-do66802w" meta [IsParameterQuery=true, List={"sql/protocolv1/o/1064580724995799/1118-074021-486fqthp", "sql/protocolv1/o/4124350841043461/0410-074134-do66802w"}, DefaultValue="sql/protocolv1/o/1064580724995799/1118-074021-486fqthp", Type="Text", IsParameterQueryRequired=true]
lineageTag: 9c59df5e-b5dc-4259-a64d-7ae346dcb3e7 lineageTag: 9c59df5e-b5dc-4259-a64d-7ae346dcb3e7
queryGroup: 参数 queryGroup: 参数
@@ -30,7 +30,7 @@ expression HttpPath = "sql/protocolv1/o/1064580724995799/1118-074021-486fqthp" m
annotation PBI_NavigationStepName = Navigation annotation PBI_NavigationStepName = Navigation
/// 切换数据目录使用 /// 切换数据目录使用
expression CatalogName = "catalog_e2_ngbi_qas" meta [IsParameterQuery=true, List={"catalog_e2_ngbi_qas", "catalog_e2_ngbi_prd"}, DefaultValue="catalog_e2_ngbi_prd", Type="Text", IsParameterQueryRequired=true] expression CatalogName = "catalog_e2_ngbi_prd" meta [IsParameterQuery=true, List={"catalog_e2_ngbi_qas", "catalog_e2_ngbi_prd"}, DefaultValue="catalog_e2_ngbi_prd", Type="Text", IsParameterQueryRequired=true]
lineageTag: f262d2bb-985d-406a-aacb-2c1d5b1430ac lineageTag: f262d2bb-985d-406a-aacb-2c1d5b1430ac
queryGroup: 参数 queryGroup: 参数
@@ -39,7 +39,7 @@ expression CatalogName = "catalog_e2_ngbi_qas" meta [IsParameterQuery=true, List
annotation PBI_NavigationStepName = Navigation annotation PBI_NavigationStepName = Navigation
/// 切换服务器主机地址使用 /// 切换服务器主机地址使用
expression ServerAddress = "adb-1064580724995799.3.databricks.azure.cn" meta [IsParameterQuery=true, List={"adb-1064580724995799.3.databricks.azure.cn", "adb-4124350841043461.1.databricks.azure.cn"}, DefaultValue="adb-1064580724995799.3.databricks.azure.cn", Type="Text", IsParameterQueryRequired=true] expression ServerAddress = "adb-4124350841043461.1.databricks.azure.cn" meta [IsParameterQuery=true, List={"adb-1064580724995799.3.databricks.azure.cn", "adb-4124350841043461.1.databricks.azure.cn"}, DefaultValue="adb-1064580724995799.3.databricks.azure.cn", Type="Text", IsParameterQueryRequired=true]
lineageTag: 08b2d8cc-13df-48c6-970c-d788d6b1da4f lineageTag: 08b2d8cc-13df-48c6-970c-d788d6b1da4f
queryGroup: 参数 queryGroup: 参数
@@ -205,7 +205,7 @@ expression Fact_Sales_SQL = ```
COALESCE(MARKET, '') || DATA_SOURCE AS MARKET_KEY, COALESCE(MARKET, '') || DATA_SOURCE AS MARKET_KEY,
COALESCE(PACK_COD, '') || DATA_SOURCE || NEW_CODE AS PACK_SOURCE, COALESCE(PACK_COD, '') || DATA_SOURCE || NEW_CODE AS PACK_SOURCE,
COALESCE(AUDIT_COD, '') || DATA_SOURCE AS AUDIT_SOURCE, COALESCE(AUDIT_COD, '') || DATA_SOURCE AS AUDIT_SOURCE,
COALESCE(AUDIT_COD, '') || DATA_SOURCE AS AUDIT_KEY, COALESCE(AUDIT_COD, '') || DATA_SOURCE || REGION_TYPE AS AUDIT_KEY,
COALESCE(MARKET, '') || COALESCE(CLASS, '') || DATA_SOURCE AS CLASS_KEY, COALESCE(MARKET, '') || COALESCE(CLASS, '') || DATA_SOURCE AS CLASS_KEY,
COALESCE(STORE_TYPE, '') || DATA_SOURCE AS STORE_TYPE_SOURCE, COALESCE(STORE_TYPE, '') || DATA_SOURCE AS STORE_TYPE_SOURCE,

View File

@@ -70,7 +70,7 @@ annotation PBI_QueryOrder = ["Measure THC","Dim_PackInfo_Retail","Dim_MergeDataS
annotation __TEdtr = 1 annotation __TEdtr = 1
annotation __LastRPTime = 134132553209188708 annotation __LastRPTime = 134236262901892344
annotation PBI_ProTooling = ["CalcGroup","DaxQueryView_Desktop","TMDLView_Desktop","DevMode"] annotation PBI_ProTooling = ["CalcGroup","DaxQueryView_Desktop","TMDLView_Desktop","DevMode"]

View File

@@ -34,6 +34,7 @@ table DM_AUTH_NONSALES_ORG
[Name = CatalogName, Kind = "Database"] [Name = CatalogName, Kind = "Database"]
}[Data], }[Data],
" "
WITH TEMP_TABLE (
SELECT SELECT
USER_KCODE, USER_KCODE,
TA TA
@@ -41,7 +42,19 @@ table DM_AUTH_NONSALES_ORG
dm.dm_auth_nonsales_org dm.dm_auth_nonsales_org
WHERE WHERE
TA IS NOT NULL 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, & UsingLimit,
null, null,

View File

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

View File

@@ -352,7 +352,8 @@ table Fact_Retail
) B ) B
ON A.PACK_CODE = B.PACK_CODE ON A.PACK_CODE = B.PACK_CODE
where 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 GROUP BY
A.PACK_CODE, A.PACK_CODE,
A.CORP_COD, A.CORP_COD,
@@ -404,6 +405,7 @@ table Fact_Retail
end as STR_KPI_VAL_EN_1 end as STR_KPI_VAL_EN_1
FROM FROM
dm_zk_retail_sales_kpi A dm_zk_retail_sales_kpi A
WHERE YYYYMM>=202101
" "
& UsingLimit, & UsingLimit,
null, null,

View File

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