From 866f26844a9e5d6fbcde9c7c474656b093afad3e Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期四, 02 一月 2025 20:32:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg
---
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def
index b67b8eb..6c6f4ef 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def
@@ -18,8 +18,6 @@
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'
Taborder: 0
Transformation: 'OfflinePlanArchiveVersion.Row.Cell'
@@ -28,7 +26,7 @@
]
Properties:
[
- Attributes: 'Value'
+ Attributes: 'Order;Quantity;ActualProductionQty'
Column: 'Column'
Row: 'Row'
Taborder: 0
@@ -47,9 +45,8 @@
Properties:
[
DataType: 'InterfaceDataset'
- 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() )"
+ FilterArguments: 'units:QLibMacroPlannerWebUI::ApplicationMacroPlanner.DataHolderUnit;products:QLibMacroPlannerWebUI::ApplicationMacroPlanner.DataHolderProduct'
+ FixedFilter: '( units.Size() = 0 or exists( units, Elements, unit, unit.ID() = object.ProductionLine() ) ) and ( products.Size() = 0 or exists( products, Elements, product, product.ID() = object.Name() ) )'
Source: 'InterfaceDataset'
Taborder: 0
Transformation: 'OfflinePlanArchiveVersion.Row'
@@ -58,8 +55,8 @@
]
Properties:
[
- Legend: 'ProductID'
- SortCriteria: 'ProductID'
+ Legend: 'ShowName'
+ SortCriteria: 'Name'
Taborder: 1
]
}
@@ -76,8 +73,9 @@
Properties:
[
DataType: 'InterfaceDataset'
- FilterArguments: 'search:QMacroPlanner::FormAssemblyOnlinePlanVersion.dhSearch'
- FixedFilter: 'object.TimeUnit() = search.TimeUnit() and ( search.StartDate().IsMinInfinity() or object.StartDate() >= search.StartDate() ) and ( search.EndDate().IsMaxInfinity() or object.StartDate() <= search.EndDate() )'
+ Description: '( search.StartDate().IsMinInfinity() or object.StartDate() >= search.StartDate() ) and ( search.EndDate().IsMaxInfinity() or object.StartDate() <= search.EndDate() )'
+ FilterArguments: 'search:QMacroPlanner::FormOfflinePlanArchive.dhSearch'
+ FixedFilter: 'object.Filter( search )'
Source: 'InterfaceDataset'
Taborder: 0
Transformation: 'OfflinePlanArchiveVersion.Column'
@@ -96,6 +94,7 @@
]
Properties:
[
+ AllowMultipleAttributes: true
Columns: 'MatrixEditorColumnsTable'
ContextMenu: 'matrixeditorContextMenuTable'
Rows: 'MatrixEditorRowsTable'
--
Gitblit v1.9.3