Merge remote-tracking branch 'origin/dev' into dev

lihongji

2024-10-17 0dc9f85a5442956570399722b5636387942ff827

 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_MatrixEditor510#127.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
  ]
}