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_FormCustomerDemandPPAIDS/Component_MatrixEditorTable.def | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_MatrixEditorTable.def b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_MatrixEditorTable.def
index f6b9390..d132cfb 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_MatrixEditorTable.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_MatrixEditorTable.def
@@ -18,8 +18,8 @@
Properties:
[
DataType: 'InterfaceDataset'
+ Description: 'object.Column().TimeUnit() = search.TimeUnit() and object.Column().StartDate() >= search.StartDate() and object.Column().StartDate() <= search.EndDate()'
FilterArguments: 'search:QMacroPlanner::FormCustomerDemandPPAIDS.dhSearch'
- FixedFilter: 'object.Column().TimeUnit() = search.TimeUnit() and object.Column().StartDate() >= search.StartDate() and object.Column().StartDate() <= search.EndDate()'
Source: 'InterfaceDataset'
Taborder: 0
Transformation: 'CustomerDemandIDS.Row.Cell'
@@ -47,9 +47,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::FormCustomerDemandPPAIDS.dhSearch'
- FixedFilter: "search.Product() = '<All>' or object.Name() = search.Product()"
+ FilterArguments: 'units:QLibMacroPlannerWebUI::ApplicationMacroPlanner.DataHolderUnit;products:QLibMacroPlannerWebUI::ApplicationMacroPlanner.DataHolderProduct'
+ FixedFilter: '( units.Size() = 0 or exists( units, Elements, unit, unit.ID() = object.Factory() ) ) and ( products.Size() = 0 or exists( products, Elements, product, product.ID() = object.Name() ) )'
Source: 'InterfaceDataset'
Taborder: 0
Transformation: 'CustomerDemandIDS.Row'
@@ -76,8 +75,9 @@
Properties:
[
DataType: 'InterfaceDataset'
+ Description: '( search.StartDate().IsMinInfinity() or object.StartDate() >= search.StartDate() ) and ( search.EndDate().IsMaxInfinity() or object.StartDate() <= search.EndDate() )'
FilterArguments: 'search:QMacroPlanner::FormCustomerDemandPPAIDS.dhSearch'
- FixedFilter: 'object.TimeUnit() = search.TimeUnit() and ( search.StartDate().IsMinInfinity() or object.StartDate() >= search.StartDate() ) and ( search.EndDate().IsMaxInfinity() or object.StartDate() <= search.EndDate() )'
+ FixedFilter: 'object.Filter( search )'
Source: 'InterfaceDataset'
Taborder: 0
Transformation: 'CustomerDemandIDS.Column'
--
Gitblit v1.9.3