From 42f46304bc28d9fb2bee770668b70204d877db93 Mon Sep 17 00:00:00 2001
From: yanweiyuan3 <yanweiyuan3@gmail.com>
Date: 星期五, 22 九月 2023 17:24:31 +0800
Subject: [PATCH] Merge branch 'dev_yy' into dev
---
_Main/UI/MacroPlannerWebApp/Views/OrderLock.vw | 451 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 325 insertions(+), 126 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Views/OrderLock.vw b/_Main/UI/MacroPlannerWebApp/Views/OrderLock.vw
index 0cae0ba..a309668 100644
--- a/_Main/UI/MacroPlannerWebApp/Views/OrderLock.vw
+++ b/_Main/UI/MacroPlannerWebApp/Views/OrderLock.vw
@@ -4,204 +4,403 @@
{
forms
{
- form_legacy_1
+ form_FormOrderLockLog
{
- title: 'Scenario manager'
+ title: 'QTIANMA_JITUAN::FormOrderLockLog'
shown: true
- componentID: 'FormScenarioManager'
+ componentID: 'QTIANMA_JITUAN::FormOrderLockLog'
layout
{
mode: 'open'
- rowPosition: 1
+ rowPosition: 14
rowSpan: 8
columnPosition: 1
- columnSpan: 5
+ columnSpan: 12
}
components
{
- FormScenarioManager_ListScenario
+ FormOrderLockLog_PanelOrderLockLog
+ {
+ sizeRatio: 1
+ }
+ FormOrderLockLog_ListOrderLockLog
{
}
- FormScenarioManager_DataSetLevelScenario
+ FormOrderLockLog_DataSetLevelOrderLockLog
{
groupDepth: -1
- column_All_constraints
+ sort: 'DESC:Notes'
+ column_OrderID
{
- columnId: 'All constraints'
- dataPath: 'All constraints'
+ columnId: 'OrderID'
+ dataPath: 'OrderID'
dataType: 'string'
- title: 'All constraints'
+ title: '璁㈠崟鍙�'
index: 0
subtotals: ''
- width: 90
+ width: 150
}
- column_Name
+ column_ProductID
{
- columnId: 'Name'
- dataPath: 'Name'
+ columnId: 'ProductID'
+ dataPath: 'ProductID'
dataType: 'string'
- title: '鍚嶇О'
+ title: '鐗╂枡鍙�'
index: 1
subtotals: ''
- width: 277
+ width: 150
}
- column_ChangedBy
+ column_SalesSegmentName
{
- columnId: 'ChangedBy'
- dataPath: 'ChangedBy'
+ columnId: 'SalesSegmentName'
+ dataPath: 'SalesSegmentName'
dataType: 'string'
- title: 'Changed by'
+ title: '閿�鍞儴闂�'
index: 2
subtotals: ''
- width: 106
+ width: 150
}
- column_ChangedOn
+ column_StockingPointID
{
- columnId: 'ChangedOn'
- dataPath: 'ChangedOn'
- dataType: 'datetime'
- title: 'Changed on'
- index: 3
- subtotals: ''
- width: 99
- }
- column_StorageMode
- {
- columnId: 'StorageMode'
- dataPath: 'StorageMode'
+ columnId: 'StockingPointID'
+ dataPath: 'StockingPointID'
dataType: 'string'
- title: 'StorageMode'
- index: 4
- subtotals: ''
- width: 40
- }
- }
- }
- }
- form_legacy_2
- {
- title: 'Assumptions'
- shown: true
- componentID: 'FormAssumptions'
- layout
- {
- mode: 'open'
- rowPosition: 9
- rowSpan: 8
- columnPosition: 1
- columnSpan: 5
- }
- components
- {
- FormAssumptions_ListAssumptions
- {
- }
- FormAssumptions_DataSetLevelAssumptions
- {
- groupDepth: -1
- column_All_constraints
- {
- columnId: 'All constraints'
- dataPath: 'All constraints'
- dataType: 'string'
- title: 'All constraints'
- index: 0
- subtotals: ''
- width: 32
- }
- column_Category
- {
- columnId: 'Category'
- dataPath: 'Category'
- dataType: 'string'
- title: '绫诲埆'
- index: 1
- subtotals: ''
- width: 108
- }
- column_Importance
- {
- columnId: 'Importance'
- dataPath: 'Importance'
- dataType: 'string'
- title: '閲嶈鎬�'
- index: 2
- subtotals: ''
- width: 110
- }
- column_Title
- {
- columnId: 'Title'
- dataPath: 'Title'
- dataType: 'string'
- title: '鏍囬'
+ title: '搴撳瓨鐐�'
index: 3
subtotals: ''
width: 150
}
- column_ChangedBy
+ column_CustomerName
{
- columnId: 'ChangedBy'
- dataPath: 'ChangedBy'
+ columnId: 'CustomerName'
+ dataPath: 'CustomerName'
dataType: 'string'
- title: 'Changed by'
+ title: '瀹㈡埛鍚嶇О'
index: 4
subtotals: ''
width: 150
}
- column_CreatedOn
+ column_Quantity
{
- columnId: 'CreatedOn'
- dataPath: 'CreatedOn'
- dataType: 'datetime'
- title: 'Created on'
+ columnId: 'Quantity'
+ dataPath: 'Quantity'
+ dataType: 'real'
index: 5
subtotals: ''
width: 150
}
+ column_UnitOfMeasureName
+ {
+ columnId: 'UnitOfMeasureName'
+ dataPath: 'UnitOfMeasureName'
+ dataType: 'string'
+ title: '鍗曚綅'
+ index: 6
+ subtotals: ''
+ width: 150
+ }
+ column_Price
+ {
+ columnId: 'Price'
+ dataPath: 'Price'
+ dataType: 'real'
+ title: '閿�鍞'
+ index: 7
+ subtotals: ''
+ width: 150
+ }
+ column_EndDate
+ {
+ columnId: 'EndDate'
+ dataPath: 'EndDate'
+ dataType: 'date'
+ title: '瀹㈡埛闇�姹傛椂闂�'
+ index: 8
+ subtotals: ''
+ width: 150
+ }
+ column_IsLocked
+ {
+ columnId: 'IsLocked'
+ dataPath: 'IsLocked'
+ dataType: 'boolean'
+ title: '鐘舵��'
+ index: 9
+ subtotals: ''
+ width: 150
+ }
+ column_End
+ {
+ columnId: 'End'
+ dataPath: 'End'
+ dataType: 'date'
+ title: '璁″垝浜や粯鏃堕棿'
+ index: 10
+ subtotals: ''
+ width: 150
+ }
+ column_LastModify
+ {
+ columnId: 'LastModify'
+ dataPath: 'LastModify'
+ dataType: 'string'
+ title: '鏈�鍚庢搷浣滀汉'
+ index: 11
+ subtotals: ''
+ width: 150
+ }
+ column_LastModifyTime
+ {
+ columnId: 'LastModifyTime'
+ dataPath: 'LastModifyTime'
+ dataType: 'datetime'
+ title: '鏈�鍚庢搷浣滄椂闂�'
+ index: 12
+ subtotals: ''
+ width: 145
+ }
+ column_Notes
+ {
+ columnId: 'Notes'
+ dataPath: 'Notes'
+ dataType: 'string'
+ title: '鎿嶄綔璇︽儏'
+ index: 13
+ subtotals: ''
+ width: 150
+ }
}
}
}
- form_FormScenariosKPIsComparison
+ form_FormOrderLock
{
- title: 'QLibMacroPlannerWebUI::FormScenariosKPIsComparison'
+ title: 'QTIANMA_JITUAN::FormOrderLock'
shown: true
- componentID: 'QLibMacroPlannerWebUI::FormScenariosKPIsComparison'
+ componentID: 'QTIANMA_JITUAN::FormOrderLock'
layout
{
mode: 'open'
rowPosition: 1
- rowSpan: 16
- columnPosition: 6
- columnSpan: 7
+ rowSpan: 13
+ columnPosition: 1
+ columnSpan: 12
}
components
{
- FormScenariosKPIsComparison_MatrixEditorFinancialKPIs
+ FormOrderLock_PanelOrderLock
+ {
+ sizeRatio: 1
+ }
+ FormOrderLock_PanelOrderLockHeader
+ {
+ sizeRatio: 1
+ }
+ FormOrderLock_PanelOrderLockOrder
+ {
+ sizeRatio: 1
+ }
+ FormOrderLock_ListOrderLock
+ {
+ }
+ FormOrderLock_DataSetLevelOrderLock
+ {
+ groupDepth: -1
+ sort: 'StartDate'
+ column_OrderID
+ {
+ columnId: 'OrderID'
+ dataPath: 'OrderID'
+ dataType: 'string'
+ title: '璁㈠崟鍙�'
+ index: 0
+ subtotals: ''
+ width: 150
+ }
+ column_ProductID
+ {
+ columnId: 'ProductID'
+ dataPath: 'ProductID'
+ dataType: 'string'
+ title: '鐗╂枡鍙�'
+ index: 1
+ subtotals: ''
+ width: 150
+ }
+ column_SalesSegmentName
+ {
+ columnId: 'SalesSegmentName'
+ dataPath: 'SalesSegmentName'
+ dataType: 'string'
+ title: '閿�鍞儴闂�'
+ index: 2
+ subtotals: ''
+ width: 150
+ }
+ column_StockingPointID
+ {
+ columnId: 'StockingPointID'
+ dataPath: 'StockingPointID'
+ dataType: 'string'
+ title: '搴撳瓨鐐�'
+ index: 3
+ subtotals: ''
+ width: 150
+ }
+ column_CustomerName
+ {
+ columnId: 'CustomerName'
+ dataPath: 'CustomerName'
+ dataType: 'string'
+ title: '瀹㈡埛鍚嶇О'
+ 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'
+ title: '鍗曚綅'
+ index: 6
+ subtotals: ''
+ width: 150
+ }
+ column_Price
+ {
+ columnId: 'Price'
+ dataPath: 'Price'
+ dataType: 'real'
+ title: '閿�鍞'
+ index: 7
+ subtotals: ''
+ width: 150
+ }
+ column_StartDate
+ {
+ columnId: 'StartDate'
+ dataPath: 'StartDate'
+ dataType: 'date'
+ title: '瀹㈡埛闇�姹傛椂闂�'
+ index: 8
+ subtotals: ''
+ width: 150
+ }
+ column_IsLocked
+ {
+ columnId: 'IsLocked'
+ dataPath: 'IsLocked'
+ dataType: 'boolean'
+ title: '鐘舵��'
+ index: 9
+ subtotals: ''
+ width: 150
+ }
+ column_First_AsPlanningBaseSalesDemandInPeriod_End
+ {
+ columnId: 'First.AsPlanningBaseSalesDemandInPeriod.End'
+ dataPath: 'First.AsPlanningBaseSalesDemandInPeriod.End'
+ dataType: 'datetime'
+ title: '璁″垝浜や粯鏃堕棿'
+ index: 10
+ subtotals: ''
+ width: 150
+ }
+ column_LastModify
+ {
+ columnId: 'LastModify'
+ dataPath: 'LastModify'
+ dataType: 'string'
+ title: '鏈�鍚庢搷浣滀汉'
+ index: 11
+ subtotals: ''
+ width: 150
+ }
+ column_LastModifyTime
+ {
+ columnId: 'LastModifyTime'
+ dataPath: 'LastModifyTime'
+ dataType: 'datetime'
+ title: '鏈�鍚庢搷浣滄椂闂�'
+ index: 12
+ subtotals: ''
+ width: 150
+ }
+ }
+ FormOrderLock_PanelOrderLockPlanning
+ {
+ sizeRatio: 1
+ }
+ FormOrderLock_PanelMatrix
+ {
+ sizeRatio: 1
+ }
+ FormOrderLock_MatrixEditorProductPlanning
{
gridColor: '#c4c4c4'
- totalHeaderWidth: 200
- attributeHeaderWidthRatio: 0.6
- nameHeaderWidthRatio: 0.4
+ totalHeaderWidth: 427
+ attributeHeaderWidthRatio: 0.325989701966572
+ nameHeaderWidthRatio: 0.674010298033429
columnWidth: 100
horizontalGrid: true
verticalGrid: true
backendState
{
- componentId: 'QLibMacroPlannerWebUI::FormScenariosKPIsComparison.MatrixEditorFinancialKPIs'
+ componentId: 'QTIANMA_JITUAN::FormOrderLock.MatrixEditorProductPlanning'
state
{
cells
{
attributes
{
- attribute_DisplayValue
+ attribute_DisplaySupplyQuantity
{
type: 'MatrixEditorWebApiCellDataModelInterest'
index: 0
rowsubtotal: ''
columnsubtotal: ''
- attribute: 'DisplayValue'
+ attribute: 'DisplaySupplyQuantity'
+ }
+ attribute_DependentDemandAndSalesDemandQuantity
+ {
+ type: 'MatrixEditorWebApiCellDataModelInterest'
+ index: 1
+ rowsubtotal: ''
+ columnsubtotal: ''
+ attribute: 'DependentDemandAndSalesDemandQuantity'
+ }
+ attribute_TargetInventoryLevel
+ {
+ type: 'MatrixEditorWebApiCellDataModelInterest'
+ index: 2
+ rowsubtotal: ''
+ columnsubtotal: ''
+ attribute: 'TargetInventoryLevel'
+ }
+ attribute_InventoryLevelEnd
+ {
+ type: 'MatrixEditorWebApiCellDataModelInterest'
+ index: 3
+ rowsubtotal: ''
+ columnsubtotal: ''
+ attribute: 'InventoryLevelEnd'
+ }
+ attribute_StockLevelInDays
+ {
+ type: 'MatrixEditorWebApiCellDataModelInterest'
+ index: 4
+ rowsubtotal: ''
+ columnsubtotal: ''
+ attribute: 'StockLevelInDays'
}
}
}
@@ -209,14 +408,14 @@
{
sorting
{
- criteria: ''
+ criteria: "datamember:'Start'"
}
}
rows
{
sorting
{
- criteria: "datamember:'KPISetting.DisplayIndex'"
+ criteria: "datamember:'Product_MP.DisplayIndex';datamember:'Name'"
}
}
}
@@ -337,10 +536,10 @@
userconfigurableinformation
{
}
- index: 2
- image: 'DOCUMENT_LOCK'
page: 'applicationDevelopmentActionBarPageDef'
group: ''
+ index: 2
+ image: 'DOCUMENT_LOCK'
description: ''
}
formatversion: 2
--
Gitblit v1.9.3