From 880f3c0257eeb8c37761d484258fdd102a369a19 Mon Sep 17 00:00:00 2001
From: 陈清红 <420599804@qq.com>
Date: 星期一, 14 四月 2025 16:46:36 +0800
Subject: [PATCH] BUG&优化项

---
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_MatrixEditor.def |   49 ++++++++++++++++++++++++-------------------------
 1 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_MatrixEditor.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_MatrixEditor.def
index aea0bf8..8e1d5d0 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_MatrixEditor.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_MatrixEditor.def
@@ -1,55 +1,55 @@
 Quintiq file version 2.0
 Component MatrixEditor
 {
-  #keys: '[412672.1.106503687]'
+  #keys: '[414996.1.230731119]'
   BaseType: 'WebMatrixEditor'
   Children:
   [
     Component MatrixEditorCell
     {
-      #keys: '[412672.1.106503688]'
+      #keys: '[414996.1.230731120]'
       BaseType: 'WebMatrixEditorCell'
       Children:
       [
         Component DataExtractorCells
         {
-          #keys: '[412672.1.106503689]'
+          #keys: '[414996.1.230731121]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
-            DataType: 'MP_Table'
-            Source: 'dhComparisonData'
+            DataType: 'LocalTable'
+            Source: 'dhAnnualPlanTable'
             Taborder: 0
-            Transformation: 'MP_Row.MP_Cell.astype(MP_Cell_AnnualPlanReport)'
+            Transformation: 'LocalRow.LocalCell.astype(LocalCell_Default)'
           ]
         }
       ]
       Properties:
       [
-        Attributes: 'NewSupply'
-        Column: 'MP_Column'
-        Row: 'MP_Row'
+        Attributes: 'RealValue'
+        Column: 'LocalColumn'
+        Row: 'LocalRow'
         Taborder: 0
       ]
     }
     Component MatrixEditorRows
     {
-      #keys: '[412672.1.106503690]'
+      #keys: '[414996.1.230731122]'
       BaseType: 'WebMatrixEditorHeaderLevel'
       Children:
       [
         Component DataExtractorRows
         {
-          #keys: '[412672.1.106503691]'
+          #keys: '[414996.1.230731123]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
-            DataType: 'MP_Table'
-            FilterArguments: 'checkedProduct:QMacroPlanner::FormAnnualPlanReport.dhFinelProduct;checkedStockingPoint:QMacroPlanner::FormAnnualPlanReport.dhFinelStockingPoint'
-            FixedFilter: 'exists( checkedProduct,Elements,entity,entity.ID() = object.ProductID()) and exists( checkedStockingPoint,Elements,entity,entity.DisplayName() = object.StockingPointID())'
-            Source: 'dhComparisonData'
+            DataType: 'LocalTable'
+            FilterArguments: 'checkedProducts:QMacroPlanner::FormAnnualPlanReport.dhFinelProducts;checkedEntitys:QMacroPlanner::FormAnnualPlanReport.dhFinelEntitys'
+            FixedFilter: 'exists( checkedProducts,Elements,entity,entity.ID() = object.ProductID()) and exists( checkedEntitys,Elements,entity,entity.DisplayName() = object.ProductionLine())'
+            Source: 'dhAnnualPlanTable'
             Taborder: 0
-            Transformation: 'MP_Row'
+            Transformation: 'LocalRow'
           ]
         }
       ]
@@ -62,28 +62,28 @@
     }
     Component MatrixEditorColumns
     {
-      #keys: '[412672.1.106503692]'
+      #keys: '[414996.1.230731124]'
       BaseType: 'WebMatrixEditorHeaderLevel'
       Children:
       [
         Component DataExtractorColumns
         {
-          #keys: '[412672.1.106503693]'
+          #keys: '[414996.1.230731125]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
-            DataType: 'MP_Table'
-            FilterArguments: 'startDate:QMacroPlanner::FormAnnualPlanReport.dhStartDate;endDate:QMacroPlanner::FormAnnualPlanReport.dhEndDate'
-            FixedFilter: 'not object.IsAttrbuteColumn() and startDate <= object.Date() and endDate > object.Date() '
-            Source: 'dhComparisonData'
+            DataType: 'LocalTable'
+            FilterArguments: 'startDate:QMacroPlanner::FormAnnualPlanReport.dhStartDate;endDate:QMacroPlanner::FormAnnualPlanReport.dhEndDate;timeUnit:QMacroPlanner::FormAnnualPlanReport.dhTimeUnit'
+            FixedFilter: 'not object.IsAttrbuteColumn() and startDate <= object.Date() and endDate > object.Date() and object.TimeUnit() = timeUnit'
+            Source: 'dhAnnualPlanTable'
             Taborder: 0
-            Transformation: 'MP_Column'
+            Transformation: 'LocalColumn'
           ]
         }
       ]
       Properties:
       [
-        Legend: 'Date'
+        Legend: 'DisplayDate'
         SortCriteria: 'Index'
         Taborder: 2
       ]
@@ -98,6 +98,5 @@
     ContextMenu: 'matrixeditorContextMenuDemandComparison'
     Rows: 'MatrixEditorRows'
     Taborder: 0
-    Visible: false
   ]
 }

--
Gitblit v1.9.3