From 8eb6a6c8fe153acdf6452faef6aad1f083b16bc5 Mon Sep 17 00:00:00 2001
From: chaiyunying <chaiyunying>
Date: 星期一, 30 十月 2023 14:50:22 +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