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_FormOfflinePlanArchive/Component_MatrixEditorTable.def |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def
index 59c4aeb..d73afda 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def
@@ -28,7 +28,7 @@
       ]
       Properties:
       [
-        Attributes: 'Value'
+        Attributes: 'Quantity;ActualProductionQty'
         Column: 'Column'
         Row: 'Row'
         Taborder: 0
@@ -49,7 +49,7 @@
             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() )"
+            FixedFilter: "( search.Product() = '<All>' or object.ProductID() = search.Product() ) and ( search.ProductionLine() = '<All>' or object.ProductionLine() = search.ProductionLine() ) and ( search.Unit() = '<All>' or object.Unit() = search.Unit() )"
             Source: 'InterfaceDataset'
             Taborder: 0
             Transformation: 'OfflinePlanArchiveVersion.Row'
@@ -77,7 +77,7 @@
           [
             DataType: 'InterfaceDataset'
             FilterArguments: 'search:QMacroPlanner::FormAssemblyOnlinePlanVersion.dhSearch'
-            FixedFilter: 'object.TimeUnit() = search.TimeUnit() and object.StartDate() >= search.StartDate() and object.StartDate() <= search.EndDate()'
+            FixedFilter: 'object.TimeUnit() = search.TimeUnit() and  ( search.StartDate().IsMinInfinity() or object.StartDate() >= search.StartDate() )  and ( search.EndDate().IsMaxInfinity() or object.StartDate() <= search.EndDate() )'
             Source: 'InterfaceDataset'
             Taborder: 0
             Transformation: 'OfflinePlanArchiveVersion.Column'
@@ -96,6 +96,7 @@
   ]
   Properties:
   [
+    AllowMultipleAttributes: true
     Columns: 'MatrixEditorColumnsTable'
     ContextMenu: 'matrixeditorContextMenuTable'
     Rows: 'MatrixEditorRowsTable'

--
Gitblit v1.9.3