Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev

xiaoding721

2024-11-21 e18d66cac7fbf43b0d341ee8976d6550a9a4f1af

 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def

@@ -17,18 +17,16 @@
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'InterfaceDataset'
            FilterArguments: 'search:QMacroPlanner::FormAssemblyOnlinePlanVersion.dhSearch'
            FixedFilter: 'object.Column().TimeUnit() = search.TimeUnit() and object.Column().StartDate() >= search.StartDate() and object.Column().StartDate() <= search.EndDate()'
            Source: 'InterfaceDataset'
            DataType: 'OfflinePlanArchiveVersion'
            Source: 'DataHolderTable'
            Taborder: 0
            Transformation: 'OfflinePlanArchiveVersion.Row.Cell'
            Transformation: 'Row.Cell'
          ]
        }
      ]
      Properties:
      [
        Attributes: 'Value'
        Attributes: 'Quantity;ActualProductionQty'
        Column: 'Column'
        Row: 'Row'
        Taborder: 0
@@ -46,20 +44,18 @@
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'InterfaceDataset'
            DataType: 'OfflinePlanArchiveVersion'
            Description: "( search.Generation() = '<All>' or object.Product_MP().Generation() = search.Generation() ) and ( search.MqbMlb() = '<All>' or object.Product_MP().MQBMLB() = search.MqbMlb() ) and ( search.Power() = '<All>' or object.Product_MP().Power() = search.Power() )"
            FilterArguments: 'search:QMacroPlanner::FormAssemblyOnlinePlanVersion.dhSearch'
            FixedFilter: "( search.Product() = '<All>' or object.ProductID() = search.Product() ) and ( search.ProductionLine() = '<All>' or object.ProductionLine() = search.ProductionLine() )"
            Source: 'InterfaceDataset'
            Source: 'DataHolderTable'
            Taborder: 0
            Transformation: 'OfflinePlanArchiveVersion.Row'
            Transformation: 'Row'
          ]
        }
      ]
      Properties:
      [
        Legend: 'ProductID'
        SortCriteria: 'ProductID'
        Legend: 'Name'
        SortCriteria: 'Name'
        Taborder: 1
      ]
    }
@@ -75,12 +71,10 @@
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'InterfaceDataset'
            FilterArguments: 'search:QMacroPlanner::FormAssemblyOnlinePlanVersion.dhSearch'
            FixedFilter: 'object.TimeUnit() = search.TimeUnit() and object.StartDate() >= search.StartDate() and object.StartDate() <= search.EndDate()'
            Source: 'InterfaceDataset'
            DataType: 'OfflinePlanArchiveVersion'
            Source: 'DataHolderTable'
            Taborder: 0
            Transformation: 'OfflinePlanArchiveVersion.Column'
            Transformation: 'Column'
          ]
        }
      ]
@@ -96,6 +90,7 @@
  ]
  Properties:
  [
    AllowMultipleAttributes: true
    Columns: 'MatrixEditorColumnsTable'
    ContextMenu: 'matrixeditorContextMenuTable'
    Rows: 'MatrixEditorRowsTable'