From 462215553c754d26acde8edab81b4a73f774e21e Mon Sep 17 00:00:00 2001
From: renhao <renhui.hao@capgemini.com>
Date: 星期五, 13 十月 2023 11:20:48 +0800
Subject: [PATCH] Merge branch 'dev'

---
 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_cmTestAttempt.def |   47 +++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_cmTestAttempt.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_cmTestAttempt.def
index 884eba9..9dd6fd4 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_cmTestAttempt.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_cmTestAttempt.def
@@ -13,7 +13,7 @@
       [
         Image: 'WATER_FISH'
         Taborder: 0
-        Title: '浜ц兘鍒嗛厤&濉骇'
+        Title: '浜ц兘鍒嗛厤'
       ]
     }
     Component mnAnnualProductionAndSalesReview
@@ -23,10 +23,53 @@
       Properties:
       [
         Image: 'PIG'
-        Taborder: 1
+        Taborder: 5
         Title: '骞村害浜ч攢澶嶇洏'
       ]
     }
+    Component mnPanelPullingMaterialOperationsOfEachBusinessUnit
+    {
+      #keys: '[414702.1.5481991]'
+      BaseType: 'WebMenu'
+      Properties:
+      [
+        Image: 'BANANA'
+        Taborder: 1
+        Title: '闈㈡澘鎷夋枡_浜嬩笟閮ㄦ搷浣�'
+      ]
+    }
+    Component mnPanelPullingMaterialGroupOperations
+    {
+      #keys: '[414702.1.5522564]'
+      BaseType: 'WebMenu'
+      Properties:
+      [
+        Image: 'CLIENT_NETWORK'
+        Taborder: 2
+        Title: '闈㈡澘鎷夋枡_闆嗗洟鎿嶄綔'
+      ]
+    }
+    Component mn224
+    {
+      #keys: '[414702.1.5593849]'
+      BaseType: 'WebMenu'
+      Properties:
+      [
+        Separator: true
+        Taborder: 4
+      ]
+    }
+    Component mnDockingERPForPRRelease
+    {
+      #keys: '[414702.1.5920760]'
+      BaseType: 'WebMenu'
+      Properties:
+      [
+        Image: 'BEER_GLASS'
+        Taborder: 3
+        Title: '瀵规帴ERP杩涜PR閲婃斁'
+      ]
+    }
   ]
   Properties:
   [

--
Gitblit v1.9.3