From 20bac026b51b5d6572a6107ef09397288bbc6dd8 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期三, 06 十一月 2024 15:38:32 +0800
Subject: [PATCH] 发送报表数据

---
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_MatrixEditor.def |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_MatrixEditor.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_MatrixEditor.def
index d565641..87f6de9 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_MatrixEditor.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_MatrixEditor.def
@@ -45,8 +45,8 @@
           Properties:
           [
             DataType: 'LocalTable'
-            FilterArguments: 'checkedProduct:QMacroPlanner::FormOfflinePlanChanges.dhFinelProduct'
-            FixedFilter: 'exists( checkedProduct,Elements,product,product.ID() = object.Name() )'
+            FilterArguments: 'checkedProducts:QMacroPlanner::FormOfflinePlanChanges.dhFinelProducts;checkedUnits:QMacroPlanner::FormOfflinePlanChanges.dhFinalUnits'
+            FixedFilter: 'exists( checkedProducts,Elements,product,product.ID() = object.ProductID()) and exists( checkedUnits,Elements,unit,unit.DisplayName() = object.ProductionLine())'
             Source: 'dhTable'
             Taborder: 0
             Transformation: 'LocalRow'
@@ -73,8 +73,8 @@
           Properties:
           [
             DataType: 'LocalTable'
-            FilterArguments: 'startDate:QMacroPlanner::FormOfflinePlanChanges.dhStartDate;endDate:QMacroPlanner::FormOfflinePlanChanges.dhEndDate'
-            FixedFilter: 'not object.IsAttrbuteColumn() and startDate <= object.Date() and endDate > object.Date() '
+            FilterArguments: 'startDate:QMacroPlanner::FormOfflinePlanChanges.dhStartDate;endDate:QMacroPlanner::FormOfflinePlanChanges.dhEndDate;timeUnit:QMacroPlanner::FormOfflinePlanChanges.dhTimeUnit'
+            FixedFilter: 'not object.IsAttrbuteColumn() and startDate <= object.Date() and endDate > object.Date() and object.TimeUnit() = timeUnit'
             Source: 'dhTable'
             Taborder: 0
             Transformation: 'LocalColumn'
@@ -83,7 +83,7 @@
       ]
       Properties:
       [
-        Legend: 'Date'
+        Legend: 'DisplayDate'
         SortCriteria: 'Index'
         Taborder: 2
       ]

--
Gitblit v1.9.3