From e7c56c4676e153f0af05083b1f5ab0ed73d4b2c3 Mon Sep 17 00:00:00 2001
From: Kevin Kok Khah Whey <khahwhey.kok@3ds.com>
Date: 星期四, 12 十月 2023 19:19:53 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_Kevin

---
 _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