From 03585593dac6796b26e7c87dec60c453c5d5cb73 Mon Sep 17 00:00:00 2001
From: hongji.li <hongji.a.li@capgemini.com>
Date: 星期三, 08 十一月 2023 10:02:58 +0800
Subject: [PATCH] 模组和面板关系配置
---
_Main/UI/MacroPlannerWebApp/Component_FormModulePanelCorrespondence/Response_PanelModule116_bDeleteModule_OnClick#462.def | 3 +
_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/StaticMethod_PullDataLakeGenerateRule.qbl | 8 ++++
/dev/null | 16 --------
_var/_Main/ProjSettings/MacroPlanner/Views/X_分析视图_[414702.1.50321581].vw | 2
_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_PanelImportAndExport_bPullDataLakeGenerateRule_OnClick.def | 16 ++++++++
_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Component_PanelImportAndExport.def | 6 +-
_Main/UI/MacroPlannerWebApp/Views/模组_面板关系.vw | 61 ++++++------------------------
_Main/UI/MacroPlannerWebApp/Component_FormModulePanelCorrespondence/Component_PanelModule116.def | 4 +-
_Main/UI/MacroPlannerWebApp/Component_FormModulePanelCorrespondence/Component_Panel655.def | 1
9 files changed, 46 insertions(+), 71 deletions(-)
diff --git a/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/StaticMethod_PullDataLakeGenerateRule.qbl b/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/StaticMethod_PullDataLakeGenerateRule.qbl
new file mode 100644
index 0000000..cc555de
--- /dev/null
+++ b/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/StaticMethod_PullDataLakeGenerateRule.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod PullDataLakeGenerateRule (
+ const GlobalOTDTable globalOTDTable,
+ GlobalOTDSOP globalOTDSOP
+)
+{
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Component_PanelImportAndExport.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Component_PanelImportAndExport.def
index 654b259..7dc70a9 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Component_PanelImportAndExport.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Component_PanelImportAndExport.def
@@ -11,6 +11,7 @@
BaseType: 'WebButton'
Properties:
[
+ ButtonSize: 'compact'
Image: 'IMPORT1'
Label: '瀵煎叆'
Taborder: 0
@@ -27,16 +28,15 @@
Taborder: 1
]
}
- Component AutomaticallyGenerate
+ Component bPullDataLakeGenerateRule
{
#keys: '[414702.1.14342122]'
BaseType: 'WebButton'
Properties:
[
Image: 'CAR_CYAN'
- Label: '鑷姩鐢熸垚瑙勫垯'
+ Label: '鏍规嵁鏁版嵁婀栫敓鎴�'
Taborder: 2
- Visible: false
]
}
]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_PanelImportAndExport_AutomaticallyGenerate_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_PanelImportAndExport_AutomaticallyGenerate_OnClick.def
deleted file mode 100644
index b8a5c2e..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_PanelImportAndExport_AutomaticallyGenerate_OnClick.def
+++ /dev/null
@@ -1,16 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelImportAndExport/AutomaticallyGenerate
-Response OnClick () id:Response_PanelImportAndExport_AutomaticallyGenerate_OnClick
-{
- #keys: '[414702.1.14304989]'
- CanBindMultiple: false
- DefinitionID: 'Responsedef_WebButton_OnClick'
- GroupServerCalls: true
- QuillAction
- {
- Body:
- [*
- CapacityAllocationResultsRuleConfiguration::AutomaticallyGenerateCapacityAllocationResults( GlobalOTDTable, MacroPlan );
- *]
- }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_PanelImportAndExport_bPullDataLakeGenerateRule_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_PanelImportAndExport_bPullDataLakeGenerateRule_OnClick.def
new file mode 100644
index 0000000..e5dd72a
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_PanelImportAndExport_bPullDataLakeGenerateRule_OnClick.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: PanelImportAndExport/bPullDataLakeGenerateRule
+Response OnClick () id:Response_PanelImportAndExport_bPullDataLakeGenerateRule_OnClick
+{
+ #keys: '[414702.1.14304989]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebButton_OnClick'
+ QuillAction
+ {
+ Body:
+ [*
+ CapacityAllocationResultsRuleConfiguration::PullDataLakeGenerateRule( GlobalOTDTable, GlobalOTDSOP );
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormModulePanelCorrespondence/Component_Panel655.def b/_Main/UI/MacroPlannerWebApp/Component_FormModulePanelCorrespondence/Component_Panel655.def
index ffda6f0..28bba2f 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormModulePanelCorrespondence/Component_Panel655.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormModulePanelCorrespondence/Component_Panel655.def
@@ -25,6 +25,7 @@
Image: 'DELETE2'
Label: '鍒犻櫎妯＄粍'
Taborder: 1
+ Visible: false
]
}
]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormModulePanelCorrespondence/Component_PanelModule116.def b/_Main/UI/MacroPlannerWebApp/Component_FormModulePanelCorrespondence/Component_PanelModule116.def
index 5bb5674..f603415 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormModulePanelCorrespondence/Component_PanelModule116.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormModulePanelCorrespondence/Component_PanelModule116.def
@@ -12,7 +12,7 @@
Properties:
[
Image: 'ADD'
- Label: '娣诲姞妯＄粍'
+ Label: '娣诲姞鍏崇郴'
Taborder: 0
]
}
@@ -23,7 +23,7 @@
Properties:
[
Image: 'DELETE2'
- Label: '鍒犻櫎妯＄粍'
+ Label: '娓呯┖鍏崇郴'
Taborder: 1
]
}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormModulePanelCorrespondence/Response_PanelModule116_bDeleteModule_OnClick\043462.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormModulePanelCorrespondence/Response_PanelModule116_bDeleteModule_OnClick\043462.def"
index f4ae16b..143ebd0 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormModulePanelCorrespondence/Response_PanelModule116_bDeleteModule_OnClick\043462.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormModulePanelCorrespondence/Response_PanelModule116_bDeleteModule_OnClick\043462.def"
@@ -9,7 +9,8 @@
{
Body:
[*
- ModulePanelCorrespondence::DeleteModule( GlobalOTDSOP, DataHolderSelectedProductInStocking_MP.Data() );
+ GlobalOTDSOP.ModulePanelCorrespondence( relflush );
+ //ModulePanelCorrespondence::DeleteModule( GlobalOTDSOP, DataHolderSelectedProductInStocking_MP.Data() );
*]
GroupServerCalls: false
}
diff --git "a/_Main/UI/MacroPlannerWebApp/Views/\346\250\241\347\273\204_\351\235\242\346\235\277\345\205\263\347\263\273.vw" "b/_Main/UI/MacroPlannerWebApp/Views/\346\250\241\347\273\204_\351\235\242\346\235\277\345\205\263\347\263\273.vw"
index 002540c..e60a4c3 100644
--- "a/_Main/UI/MacroPlannerWebApp/Views/\346\250\241\347\273\204_\351\235\242\346\235\277\345\205\263\347\263\273.vw"
+++ "b/_Main/UI/MacroPlannerWebApp/Views/\346\250\241\347\273\204_\351\235\242\346\235\277\345\205\263\347\263\273.vw"
@@ -13,7 +13,7 @@
{
mode: 'open'
rowPosition: 1
- rowSpan: 6
+ rowSpan: 13
columnPosition: 1
columnSpan: 3
}
@@ -29,7 +29,7 @@
FormProducts_DataSetLevelRootProduct
{
groupDepth: -1
- sort: 'Name'
+ sort: 'DESC:Name'
column_Name
{
columnId: 'Name'
@@ -38,12 +38,13 @@
title: '鍚嶇О'
index: 0
subtotals: ''
- width: 271
+ width: 185
}
}
FormProducts_DataSetLevelChildProduct
{
groupDepth: -1
+ sort: 'Name'
column_Name
{
columnId: 'Name'
@@ -57,50 +58,6 @@
}
}
}
- form_FormProductInStockingPoints_1
- {
- title: 'Assigned to stocking points'
- shown: true
- componentID: 'FormProductInStockingPoints'
- layout
- {
- mode: 'open'
- rowPosition: 7
- rowSpan: 6
- columnPosition: 1
- columnSpan: 3
- }
- components
- {
- FormProductInStockingPoints_ListProductInStockingPointsForProductsView
- {
- }
- FormProductInStockingPoints_ListProductInStockingPointsForProductsView_DataSetLevelProductInStockingPoints
- {
- groupDepth: -1
- column_Product_MP_Name
- {
- columnId: 'Product_MP.Name'
- dataPath: 'Product_MP.Name'
- dataType: 'string'
- title: 'Product name'
- index: 0
- subtotals: ''
- width: 134
- }
- column_StockingPoint_MP_Name
- {
- columnId: 'StockingPoint_MP.Name'
- dataPath: 'StockingPoint_MP.Name'
- dataType: 'string'
- title: 'Stocking point name'
- index: 1
- subtotals: ''
- width: 150
- }
- }
- }
- }
form_FormModulePanelCorrespondence
{
title: 'QTIANMA_JITUAN::FormModulePanelCorrespondence'
@@ -110,13 +67,17 @@
{
mode: 'open'
rowPosition: 1
- rowSpan: 12
+ rowSpan: 13
columnPosition: 4
columnSpan: 9
}
components
{
FormModulePanelCorrespondence_PanelModule
+ {
+ sizeRatio: 1
+ }
+ FormModulePanelCorrespondence_PanelModule116
{
sizeRatio: 1
}
@@ -149,6 +110,10 @@
{
sizeRatio: 1
}
+ FormModulePanelCorrespondence_Panel655
+ {
+ sizeRatio: 1
+ }
FormModulePanelCorrespondence_ListModuleCorrespondence
{
}
diff --git "a/_var/_Main/ProjSettings/MacroPlanner/Views/X_\345\210\206\346\236\220\350\247\206\345\233\276_\133414702.1.50321581\135.vw" "b/_var/_Main/ProjSettings/MacroPlanner/Views/X_\345\210\206\346\236\220\350\247\206\345\233\276_\133414702.1.50321581\135.vw"
index 450a6cd..3da570a 100644
--- "a/_var/_Main/ProjSettings/MacroPlanner/Views/X_\345\210\206\346\236\220\350\247\206\345\233\276_\133414702.1.50321581\135.vw"
+++ "b/_var/_Main/ProjSettings/MacroPlanner/Views/X_\345\210\206\346\236\220\350\247\206\345\233\276_\133414702.1.50321581\135.vw"
@@ -16,7 +16,7 @@
CREATIONUSER 'quintiq/hongjli'
UPDATEDATETIME '2023-11-01T11:42:14'
UPDATEUSER 'quintiq/hongjli'
- LASTACCESSDATE '2023-11-06'
+ LASTACCESSDATE '2023-11-07'
VIEWSCOPE 0
}
AUTHORIZATIONS
--
Gitblit v1.9.3