From b343b593893e2f3278f2695d1411f3aacaeedfc8 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期五, 13 九月 2024 16:33:50 +0800
Subject: [PATCH] 客户需求报表数据调整
---
_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_MatrixEditorTable.def | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_MatrixEditorTable.def b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_MatrixEditorTable.def
index ba95322..e2c57d0 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_MatrixEditorTable.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_MatrixEditorTable.def
@@ -17,10 +17,10 @@
BaseType: 'WebDataExtractor'
Properties:
[
- DataType: 'MacroPlan'
+ DataType: 'InterfaceDataset'
FilterArguments: 'search:QMacroPlanner::FormCustomerDemandPPAIDS.dhSearch'
- FixedFilter: 'object.Column().TimeUnit() = search.TimeUnit()'
- Source: 'MacroPlan'
+ 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'
]
@@ -46,10 +46,11 @@
BaseType: 'WebDataExtractor'
Properties:
[
- DataType: 'MacroPlan'
+ 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.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() )"
- Source: 'MacroPlan'
+ FixedFilter: "search.Product() = '<All>' or object.Name() = search.Product()"
+ Source: 'InterfaceDataset'
Taborder: 0
Transformation: 'CustomerDemandIDS.Row'
]
@@ -74,10 +75,10 @@
BaseType: 'WebDataExtractor'
Properties:
[
- DataType: 'MacroPlan'
+ DataType: 'InterfaceDataset'
FilterArguments: 'search:QMacroPlanner::FormCustomerDemandPPAIDS.dhSearch'
- FixedFilter: 'object.TimeUnit() = search.TimeUnit()'
- Source: 'MacroPlan'
+ FixedFilter: 'object.TimeUnit() = search.TimeUnit() and object.StartDate() >= search.StartDate() and object.StartDate() <= search.EndDate()'
+ Source: 'InterfaceDataset'
Taborder: 0
Transformation: 'CustomerDemandIDS.Column'
]
--
Gitblit v1.9.3