From 0dc9f85a5442956570399722b5636387942ff827 Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期四, 17 十月 2024 13:15:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_PanelAnnualPlan.def |   27 ++++++++-------------------
 1 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_PanelAnnualPlan.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_PanelAnnualPlan.def
index d4eb82e..c74a165 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_PanelAnnualPlan.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_PanelAnnualPlan.def
@@ -5,16 +5,6 @@
   BaseType: 'WebPanel'
   Children:
   [
-    Component dhComparisonData
-    {
-      #keys: '[412672.1.106503683]'
-      BaseType: 'WebDataHolder'
-      Databinding: 'MP_Table'
-      Properties:
-      [
-        Taborder: 1
-      ]
-    }
     Component dhCheckedProduct
     {
       #keys: '[412672.1.106503684]'
@@ -37,7 +27,7 @@
       ]
       Properties:
       [
-        Taborder: 5
+        Taborder: 3
       ]
     }
     Component dhFinelProduct
@@ -47,7 +37,7 @@
       Databinding: 'structured[Product_MP]*'
       Properties:
       [
-        Taborder: 4
+        Taborder: 2
       ]
     }
     Component dhComparisonData854
@@ -57,19 +47,18 @@
       Databinding: 'LocalTable'
       Properties:
       [
-        Taborder: 3
+        Taborder: 1
       ]
     }
-    #child: MatrixEditor
     #child: MatrixEditor510_127
-    Component dhCheckedStockingPoint
+    Component dhCheckedEntitys
     {
       #keys: '[412672.1.107978890]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[Entity]*'
       Children:
       [
-        Component deCheckedStockingPoint
+        Component deCheckedEntitys
         {
           #keys: '[412672.1.107978891]'
           BaseType: 'WebDataExtractor'
@@ -84,17 +73,17 @@
       ]
       Properties:
       [
-        Taborder: 7
+        Taborder: 5
       ]
     }
-    Component dhFinelStockingPoint
+    Component dhFinelEntitys
     {
       #keys: '[412672.1.107978915]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[Entity]*'
       Properties:
       [
-        Taborder: 6
+        Taborder: 4
       ]
     }
   ]

--
Gitblit v1.9.3