From 7e31442f0e9b07764e9c6a9680d3d4aeba5fe1de Mon Sep 17 00:00:00 2001
From: admin <admin@admin.com>
Date: 星期三, 22 一月 2025 12:20:44 +0800
Subject: [PATCH] Merge branch 'master' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 3 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def
index 3e7a868..25b159e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def
@@ -12,6 +12,15 @@
#child: ActionBarPageData
#child: ActionBarPageSales
#child: applicationConfigureActionBarPageDef
+ #child: ActionBarPageInventory
+ #child: ActionBarPageRestraint
+ #child: ActionBarPageScenarioSelection
+ #child: applicationFixedPageActionBarPageDef
+ #child: applicationDevelopmentActionBarPageDef_1
+ #child: abpAlgorithmPostProcessing
+ #child: ActionBarPagePlan
+ #child: ActionBarPageReport
+ #child: ActionBarPageArchivePublish
]
}
Component dhBinaryDataPR id:dhBinaryDataPR_688
@@ -174,15 +183,57 @@
Taborder: 51
]
}
- Component dhCalendarUse
+ Component dhSelectedShiftDay
{
- #keys: '[415136.0.667561067]'
+ #keys: '[413988.0.1371211822]'
BaseType: 'WebDataHolder'
- Databinding: 'LibCal_Calendar'
+ Databinding: 'ShiftDay'
Properties:
[
Taborder: 56
]
}
+ Component dhStartDate
+ {
+ #keys: '[415754.0.240181339]'
+ BaseType: 'WebDataHolder'
+ Databinding: 'String*'
+ Properties:
+ [
+ Taborder: 57
+ ]
+ }
+ Component dhEndDate
+ {
+ #keys: '[415754.0.240181500]'
+ BaseType: 'WebDataHolder'
+ Databinding: 'String*'
+ Properties:
+ [
+ Taborder: 58
+ ]
+ }
+ Component dhSelectedFactory
+ {
+ #keys: '[415754.0.350439827]'
+ BaseType: 'WebDataHolder'
+ Databinding: 'String*'
+ Properties:
+ [
+ Description: '鍖呰璁″垝鎵�閫夊伐鍘�'
+ Taborder: 59
+ ]
+ }
+ Component dhSelectedFactoryMCRR
+ {
+ #keys: '[415754.0.434272020]'
+ BaseType: 'WebDataHolder'
+ Databinding: 'String*'
+ Properties:
+ [
+ Description: '鏈哄姞鐗╂祦鎴愭湰鎶ヨ〃宸ュ巶鍙傛暟'
+ Taborder: 60
+ ]
+ }
]
}
--
Gitblit v1.9.3