From 7e31442f0e9b07764e9c6a9680d3d4aeba5fe1de Mon Sep 17 00:00:00 2001
From: admin <admin@admin.com>
Date: 星期三, 22 一月 2025 12:20:44 +0800
Subject: [PATCH] Merge branch 'master' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def | 35 ++++++++++++++++-------------------
1 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def
index 59c4aeb..459c315 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def
+++ b/_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: 'structured[OfflinePlanArchiveRow]'
+ Source: 'dhRows'
Taborder: 0
- Transformation: 'OfflinePlanArchiveVersion.Row.Cell'
+ Transformation: 'Elements.Cell'
]
}
]
Properties:
[
- Attributes: 'Value'
+ Attributes: 'Order;Quantity;ActualProductionQty'
Column: 'Column'
Row: 'Row'
Taborder: 0
@@ -46,20 +44,17 @@
BaseType: 'WebDataExtractor'
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() )"
- Source: 'InterfaceDataset'
+ DataType: 'structured[OfflinePlanArchiveRow]'
+ Source: 'dhRows'
Taborder: 0
- Transformation: 'OfflinePlanArchiveVersion.Row'
+ Transformation: 'Elements'
]
}
]
Properties:
[
- Legend: 'ProductID'
- SortCriteria: 'ProductID'
+ Legend: 'ShowName'
+ SortCriteria: 'Name'
Taborder: 1
]
}
@@ -75,12 +70,13 @@
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: 'structured[OfflinePlanArchiveRow]'
+ 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: 'dhRows'
Taborder: 0
- Transformation: 'OfflinePlanArchiveVersion.Column'
+ Transformation: 'Elements.Cell.Column'
]
}
]
@@ -96,6 +92,7 @@
]
Properties:
[
+ AllowMultipleAttributes: true
Columns: 'MatrixEditorColumnsTable'
ContextMenu: 'matrixeditorContextMenuTable'
Rows: 'MatrixEditorRowsTable'
--
Gitblit v1.9.3