From 4a3d9ec9b4d11f096fc24cfeee40246492dc08fd Mon Sep 17 00:00:00 2001
From: Administrator <renhui.hao@capgemini.com>
Date: 星期一, 25 九月 2023 22:43:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev'

---
 _Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/_ROOT_Component_FrmOrderForecast.def |   96 ++----------------------------------------------
 1 files changed, 4 insertions(+), 92 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/_ROOT_Component_FrmOrderForecast.def b/_Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/_ROOT_Component_FrmOrderForecast.def
index d6e1cad..3d07f93 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/_ROOT_Component_FrmOrderForecast.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/_ROOT_Component_FrmOrderForecast.def
@@ -7,100 +7,12 @@
   BaseType: 'WebForm'
   Children:
   [
-    #child: Panel849
-    #child: list_ForecastView_FOF
-    Component dh_FOF_Data
-    {
-      #keys: '[414724.0.86151860]'
-      BaseType: 'WebDataHolder'
-      Databinding: 'structured[SalesDemandBase]*'
-      Children:
-      [
-        Component de_dh_FOF_Data
-        {
-          #keys: '[414724.0.86151875]'
-          BaseType: 'WebDataExtractor'
-          Properties:
-          [
-            DataType: 'structured[SalesDemandBase]'
-            Source: 'dh_FOF_ChildrenData'
-            Taborder: 0
-            Transformation: 'Elements'
-          ]
-        }
-        Component DataExtractor819
-        {
-          #keys: '[414724.0.107645127]'
-          BaseType: 'WebDataExtractor'
-          Properties:
-          [
-            DataType: 'MacroPlan'
-            Source: 'MacroPlan'
-            Taborder: 1
-            Transformation: 'SalesDemand'
-          ]
-        }
-      ]
-      Properties:
-      [
-        Taborder: 4
-      ]
-    }
     #child: Panel961
-    Component dh_FOF_ChildrenData
-    {
-      #keys: '[414724.0.106541535]'
-      BaseType: 'WebDataHolder'
-      Databinding: 'structured[SalesDemandBase]*'
-      Children:
-      [
-        Component de_FOF_ChildrenData_0
-        {
-          #keys: '[414724.0.106541577]'
-          BaseType: 'WebDataExtractor'
-          Properties:
-          [
-            DataType: 'structured[Product_MP]'
-            Source: 'ApplicationMacroPlanner.DataHolderProduct'
-            Taborder: 0
-            Transformation: 'Elements.SalesDemand'
-          ]
-        }
-        Component de_FOF_ChildrenData_1
-        {
-          #keys: '[414724.0.106541594]'
-          BaseType: 'WebDataExtractor'
-          Properties:
-          [
-            DataType: 'structured[StockingPoint_MP]'
-            Source: 'ApplicationMacroPlanner.DataHolderStockingPoint'
-            Taborder: 1
-            Transformation: 'Elements.SalesDemand'
-          ]
-        }
-        Component de_FOF_ChildrenData_2
-        {
-          #keys: '[414724.0.106541611]'
-          BaseType: 'WebDataExtractor'
-          Properties:
-          [
-            DataType: 'structured[SalesSegment_MP]'
-            Source: 'ApplicationMacroPlanner.DataHolderSalesSegment'
-            Taborder: 2
-            Transformation: 'Elements.SalesDemand'
-          ]
-        }
-      ]
-      Properties:
-      [
-        Taborder: 3
-      ]
-    }
-    Component dh_FOF_H_Forecast
+    Component dh_FOF_H_OrderForecastRealQty
     {
       #keys: '[414724.0.109053093]'
       BaseType: 'WebDataHolder'
-      Databinding: 'structured[H_Forecast]*'
+      Databinding: 'structured[H_OrderForecastRealQty]*'
       Children:
       [
         Component de_dh_FOF_H_Foecast
@@ -112,13 +24,13 @@
             DataType: 'MacroPlan'
             Source: 'MacroPlan'
             Taborder: 0
-            Transformation: 'H_Forecast'
+            Transformation: 'H_OrderForecastRealQty'
           ]
         }
       ]
       Properties:
       [
-        Taborder: 6
+        Taborder: 2
       ]
     }
     #child: liH_Forecast

--
Gitblit v1.9.3