From e8619d825e5f09daf129b4847bf2bf4e660d40c5 Mon Sep 17 00:00:00 2001 From: yunchai <yunying.chai@capgemini.com> Date: 星期四, 12 十月 2023 09:29:21 +0800 Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev' --- _Main/UI/MacroPlannerWebApp/Views/Test.vw | 525 --------------------------------------------------------- 1 files changed, 6 insertions(+), 519 deletions(-) diff --git a/_Main/UI/MacroPlannerWebApp/Views/Test.vw b/_Main/UI/MacroPlannerWebApp/Views/Test.vw index 36dff5d..808d3e8 100644 --- a/_Main/UI/MacroPlannerWebApp/Views/Test.vw +++ b/_Main/UI/MacroPlannerWebApp/Views/Test.vw @@ -310,6 +310,10 @@ } components { + FormFillingCapacityOrder_PanelFillingCapacityOrder + { + sizeRatio: 1 + } FormFillingCapacityOrder_ListFillingCapacityOrder { } @@ -436,536 +440,19 @@ } } } - form_FormPriorityPolicy - { - title: 'QTIANMA_JITUAN::FormPriorityPolicy' - shown: true - componentID: 'QTIANMA_JITUAN::FormPriorityPolicy' - layout - { - mode: 'open' - rowPosition: 32 - rowSpan: 13 - columnPosition: 5 - columnSpan: 8 - } - components - { - FormPriorityPolicy_ListPriorityPolicy - { - } - FormPriorityPolicy_DataSetLevelPriorityPolicy - { - groupDepth: -1 - column_Name - { - columnId: 'Name' - dataPath: 'Name' - dataType: 'string' - index: 0 - subtotals: '' - width: 150 - } - column_Formula - { - columnId: 'Formula' - dataPath: 'Formula' - dataType: 'string' - index: 1 - subtotals: '' - width: 150 - } - column_CalculateValue - { - columnId: 'CalculateValue' - dataPath: 'CalculateValue' - dataType: 'string' - index: 2 - subtotals: '' - width: 150 - } - column_Desc - { - columnId: 'Desc' - dataPath: 'Desc' - dataType: 'string' - index: 3 - subtotals: '' - width: 150 - } - } - FormPriorityPolicy_PanelPriorityPolicyOperation - { - sizeRatio: 1 - } - FormPriorityPolicy_PanelPriorityPolicyOperationButton - { - sizeRatio: 1 - } - FormPriorityPolicy_PanelPriorityPolicyCoefficient - { - sizeRatio: 1 - } - } - } - form_FormPriorityResult - { - title: 'QTIANMA_JITUAN::FormPriorityResult' - shown: true - componentID: 'QTIANMA_JITUAN::FormPriorityResult' - layout - { - mode: 'open' - rowPosition: 45 - rowSpan: 17 - columnPosition: 1 - columnSpan: 12 - } - components - { - FormPriorityResult_PanelPriorityResult - { - sizeRatio: 1 - } - FormPriorityResult_ListPriorityResult - { - } - FormPriorityResult_DataSetLevelPriorityResult - { - groupDepth: -1 - column_SalesSegmentName - { - columnId: 'SalesSegmentName' - dataPath: 'SalesSegmentName' - dataType: 'string' - index: 0 - subtotals: '' - width: 150 - } - column_ProductID - { - columnId: 'ProductID' - dataPath: 'ProductID' - dataType: 'string' - index: 1 - subtotals: '' - width: 150 - } - column_StockingPointID - { - columnId: 'StockingPointID' - dataPath: 'StockingPointID' - dataType: 'string' - index: 2 - subtotals: '' - width: 150 - } - column_Customer - { - columnId: 'Customer' - dataPath: 'Customer' - dataType: 'string' - index: 3 - subtotals: '' - width: 150 - } - column_BusinessType - { - columnId: 'BusinessType' - dataPath: 'BusinessType' - dataType: 'string' - index: 4 - subtotals: '' - width: 150 - } - column_Quantity - { - columnId: 'Quantity' - dataPath: 'Quantity' - dataType: 'real' - index: 5 - subtotals: '' - width: 150 - } - column_UnitOfMeasureName - { - columnId: 'UnitOfMeasureName' - dataPath: 'UnitOfMeasureName' - dataType: 'string' - index: 6 - subtotals: '' - width: 150 - } - column_DemandDate - { - columnId: 'DemandDate' - dataPath: 'DemandDate' - dataType: 'date' - index: 7 - subtotals: '' - width: 150 - } - column_PriorityResultScore - { - columnId: 'PriorityResultScore' - dataPath: 'PriorityResultScore' - dataType: 'real' - index: 8 - subtotals: '' - width: 150 - } - } - FormPriorityResult_PanelPriorityResultDetails - { - sizeRatio: 1 - } - FormPriorityResult_ListPriorityResultBusinessTypeDetails - { - } - FormPriorityResult_DataSetLevelPriorityResultDetails - { - groupDepth: -1 - column_SalesSegmentName - { - columnId: 'SalesSegmentName' - dataPath: 'SalesSegmentName' - dataType: 'string' - index: 0 - subtotals: '' - width: 150 - } - column_StockingPointID - { - columnId: 'StockingPointID' - dataPath: 'StockingPointID' - dataType: 'string' - index: 1 - subtotals: '' - width: 150 - } - column_Customer - { - columnId: 'Customer' - dataPath: 'Customer' - dataType: 'string' - index: 2 - subtotals: '' - width: 150 - } - column_BusinessType - { - columnId: 'BusinessType' - dataPath: 'BusinessType' - dataType: 'string' - index: 3 - subtotals: '' - width: 150 - } - column_Quantity - { - columnId: 'Quantity' - dataPath: 'Quantity' - dataType: 'real' - index: 4 - subtotals: '' - width: 150 - } - column_UnitOfMeasureName - { - columnId: 'UnitOfMeasureName' - dataPath: 'UnitOfMeasureName' - dataType: 'string' - index: 5 - subtotals: '' - width: 150 - } - column_DemandDate - { - columnId: 'DemandDate' - dataPath: 'DemandDate' - dataType: 'date' - index: 6 - subtotals: '' - width: 150 - } - column_PriorityResultScore - { - columnId: 'PriorityResultScore' - dataPath: 'PriorityResultScore' - dataType: 'real' - index: 7 - subtotals: '' - width: 150 - } - column_PriorityPolicyName - { - columnId: 'PriorityPolicyName' - dataPath: 'PriorityPolicyName' - dataType: 'string' - index: 8 - subtotals: '' - width: 150 - } - column_PriorityFactorName - { - columnId: 'PriorityFactorName' - dataPath: 'PriorityFactorName' - dataType: 'string' - index: 9 - subtotals: '' - width: 150 - } - column_PriorityFactorGradingName - { - columnId: 'PriorityFactorGradingName' - dataPath: 'PriorityFactorGradingName' - dataType: 'string' - index: 10 - subtotals: '' - width: 150 - } - column_PriorityTotalScore - { - columnId: 'PriorityTotalScore' - dataPath: 'PriorityTotalScore' - dataType: 'real' - index: 11 - subtotals: '' - width: 150 - } - } - FormPriorityResult_ListPriorityResultGroupDetails - { - } - FormPriorityResult_DataSetLevelPriorityResultDetails872 - { - groupDepth: -1 - column_SalesSegmentName - { - columnId: 'SalesSegmentName' - dataPath: 'SalesSegmentName' - dataType: 'string' - index: 0 - subtotals: '' - width: 150 - } - column_StockingPointID - { - columnId: 'StockingPointID' - dataPath: 'StockingPointID' - dataType: 'string' - index: 1 - subtotals: '' - width: 150 - } - column_Customer - { - columnId: 'Customer' - dataPath: 'Customer' - dataType: 'string' - index: 2 - subtotals: '' - width: 150 - } - column_BusinessType - { - columnId: 'BusinessType' - dataPath: 'BusinessType' - dataType: 'string' - index: 3 - subtotals: '' - width: 150 - } - column_Quantity - { - columnId: 'Quantity' - dataPath: 'Quantity' - dataType: 'real' - index: 4 - subtotals: '' - width: 150 - } - column_UnitOfMeasureName - { - columnId: 'UnitOfMeasureName' - dataPath: 'UnitOfMeasureName' - dataType: 'string' - index: 5 - subtotals: '' - width: 150 - } - column_DemandDate - { - columnId: 'DemandDate' - dataPath: 'DemandDate' - dataType: 'date' - index: 6 - subtotals: '' - width: 150 - } - column_PriorityResultScore - { - columnId: 'PriorityResultScore' - dataPath: 'PriorityResultScore' - dataType: 'real' - index: 7 - subtotals: '' - width: 150 - } - column_PriorityPolicyName - { - columnId: 'PriorityPolicyName' - dataPath: 'PriorityPolicyName' - dataType: 'string' - index: 8 - subtotals: '' - width: 150 - } - column_PriorityFactorName - { - columnId: 'PriorityFactorName' - dataPath: 'PriorityFactorName' - dataType: 'string' - index: 9 - subtotals: '' - width: 150 - } - column_PriorityFactorGradingName - { - columnId: 'PriorityFactorGradingName' - dataPath: 'PriorityFactorGradingName' - dataType: 'string' - index: 10 - subtotals: '' - width: 150 - } - column_PriorityTotalScore - { - columnId: 'PriorityTotalScore' - dataPath: 'PriorityTotalScore' - dataType: 'real' - index: 11 - subtotals: '' - width: 150 - } - } - } - } - form_FormPriorityFactor - { - title: 'QTIANMA_JITUAN::FormPriorityFactor' - shown: true - componentID: 'QTIANMA_JITUAN::FormPriorityFactor' - layout - { - mode: 'open' - rowPosition: 37 - rowSpan: 8 - columnPosition: 1 - columnSpan: 4 - } - components - { - FormPriorityFactor_ListPriorityFactor - { - } - FormPriorityFactor_DataSetLevelPriorityFactor - { - groupDepth: -1 - column_Name - { - columnId: 'Name' - dataPath: 'Name' - dataType: 'string' - index: 0 - subtotals: '' - width: 150 - } - column_Coefficient - { - columnId: 'Coefficient' - dataPath: 'Coefficient' - dataType: 'real' - index: 1 - subtotals: '' - width: 150 - } - column_Desc - { - columnId: 'Desc' - dataPath: 'Desc' - dataType: 'string' - index: 2 - subtotals: '' - width: 150 - } - } - } - } - form_FormPriorityFactorGrading - { - title: 'QTIANMA_JITUAN::FormPriorityFactorGrading' - shown: true - componentID: 'QTIANMA_JITUAN::FormPriorityFactorGrading' - layout - { - mode: 'open' - rowPosition: 32 - rowSpan: 5 - columnPosition: 1 - columnSpan: 4 - } - components - { - FormPriorityFactorGrading_ListPriorityFactorGrading - { - } - FormPriorityFactorGrading_DataSetLevelPriorityFactorGrading - { - groupDepth: -1 - column_GradingName - { - columnId: 'GradingName' - dataPath: 'GradingName' - dataType: 'string' - index: 0 - subtotals: '' - width: 150 - } - column_GradeValueStr - { - columnId: 'GradeValueStr' - dataPath: 'GradeValueStr' - dataType: 'string' - index: 1 - subtotals: '' - width: 150 - } - column_GradeDesc - { - columnId: 'GradeDesc' - dataPath: 'GradeDesc' - dataType: 'string' - index: 2 - subtotals: '' - width: 150 - } - } - } - } } userconfigurableinformation { } - image: 'BEAR' page: '' group: '' index: 0 + image: 'BEAR' description: '' } formatversion: 2 id: 'Test' - name: 'Test' + name: '浜ц兘鍒嗛厤_濉骇' isglobal: false isroot: true } -- Gitblit v1.9.3