From 0dc9f85a5442956570399722b5636387942ff827 Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期四, 17 十月 2024 13:15:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_MatrixEditor510#127.def | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_MatrixEditor510\043127.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_MatrixEditor510\043127.def"
index e0b9cd6..9580f0a 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_MatrixEditor510\043127.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_MatrixEditor510\043127.def"
@@ -45,8 +45,8 @@
Properties:
[
DataType: 'LocalTable'
- FilterArguments: 'checkedProduct:QMacroPlanner::FormAnnualPlanReport.dhFinelProduct;checkedStockingPoint:QMacroPlanner::FormAnnualPlanReport.dhFinelStockingPoint'
- FixedFilter: 'exists( checkedProduct,Elements,entity,entity.ID() = object.ProductID()) and exists( checkedStockingPoint,Elements,entity,entity.DisplayName() = object.StockingPointID())'
+ FilterArguments: 'checkedProduct:QMacroPlanner::FormAnnualPlanReport.dhFinelProduct;checkedEntitys:QMacroPlanner::FormAnnualPlanReport.dhFinelEntitys'
+ FixedFilter: 'exists( checkedProduct,Elements,entity,entity.ID() = object.ProductID()) and exists( checkedEntitys,Elements,entity,entity.DisplayName() = object.ProductionLine())'
Source: 'dhComparisonData854'
Taborder: 0
Transformation: 'LocalRow'
@@ -97,6 +97,6 @@
Columns: 'MatrixEditorColumns391'
ContextMenu: 'matrixeditorContextMenuDemandComparison527'
Rows: 'MatrixEditorRows221'
- Taborder: 2
+ Taborder: 0
]
}
--
Gitblit v1.9.3