From 30c02e0c981b16be0918483543f4b812956c45d4 Mon Sep 17 00:00:00 2001
From: Lai,Risheng <risheng.lai@capgemini.com>
Date: 星期四, 02 十一月 2023 10:50:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev'

---
 _Main/UI/MacroPlannerWebApp/Component_FormMaterialLabelingAndPlanningStrategy/Component_PanelMaterialExportAndImport#136.def |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormMaterialLabelingAndPlanningStrategy/Component_PanelMaterialExportAndImport\043136.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormMaterialLabelingAndPlanningStrategy/Component_PanelMaterialExportAndImport\043136.def"
index eb69dc7..7519c89 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormMaterialLabelingAndPlanningStrategy/Component_PanelMaterialExportAndImport\043136.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormMaterialLabelingAndPlanningStrategy/Component_PanelMaterialExportAndImport\043136.def"
@@ -13,7 +13,7 @@
       [
         Image: 'EXPORT1'
         Label: '鏁版嵁瀵煎嚭'
-        Taborder: 1
+        Taborder: 2
       ]
     }
     Component ButtonMaterialExportAndImport
@@ -24,7 +24,7 @@
       [
         Image: 'IMPORT1'
         Label: '鏁版嵁瀵煎叆'
-        Taborder: 2
+        Taborder: 3
       ]
     }
     Component ButtonSynchronizeInventoryTargets
@@ -38,6 +38,17 @@
         Taborder: 0
       ]
     }
+    Component ButtonPullData
+    {
+      #keys: '[414702.0.199743004]'
+      BaseType: 'WebButton'
+      Properties:
+      [
+        Image: 'TRACTOR'
+        Label: '鎷夊彇鏁版嵁'
+        Taborder: 1
+      ]
+    }
   ]
   Properties:
   [

--
Gitblit v1.9.3