From e058d61744a6c881597aa3ff5034ce37450d5e59 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期四, 12 九月 2024 13:51:21 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/BL/Type_InventoryInterfaceData/Method_Filter.qbl | 9 +
_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Response_listContextMenuInventoryInterfaceData_1_mTest_OnClick.def | 6
_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Component_pHeader.def | 47 +++++++++
_Main/UI/MacroPlannerWebApp/Views/LogisticsCostParameterSetting.vw | 2
_Main/BL/Type_MacroPlan/Attribute_A_Inventory.qbl | 7 +
_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Component_listContextMenuInventoryInterfaceData#1.def | 8
_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Component_pContent.def | 14 ++
_Main/UI/MacroPlannerWebApp/Component_FormLogisticsCostTransport/Component_ListLogisticsCostTransport.def | 2
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_dhEndDate_OnCreated.def | 16 +++
_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Component_listActionBarPageInventoryInterfaceData#1.def | 10 ++
/dev/null | 10 --
_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Component_ListInventoryInterfaceData#360.def | 14 +-
_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Response_pHeader_bFilter_OnClick.def | 17 +++
_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Response_listContextMenuInventoryInterfaceData_1_MenuSynchronizeInventory_On.def | 6
_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Response_pHeader_dsStart_OnCreated.def | 20 ++++
_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/_ROOT_Component_FormInventoryInterfaceData.def | 3
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def | 20 ++++
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_dhStartDate_OnCreated.def | 16 +++
_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Response_pHeader_dsEnd_OnCreated.def | 20 ++++
19 files changed, 218 insertions(+), 29 deletions(-)
diff --git a/_Main/BL/Type_InventoryInterfaceData/Method_Filter.qbl b/_Main/BL/Type_InventoryInterfaceData/Method_Filter.qbl
new file mode 100644
index 0000000..d75183e
--- /dev/null
+++ b/_Main/BL/Type_InventoryInterfaceData/Method_Filter.qbl
@@ -0,0 +1,9 @@
+Quintiq file version 2.0
+#parent: #root
+Method Filter (
+ String startDate,
+ String endDate
+) declarative remote as Boolean
+{
+ TextBody: 'return guard( [Number]this.Date().Format( "YM2D2" ) >= [Number]startDate and [Number]this.Date().Format( "YM2D2" ) <= [Number]endDate, true );'
+}
diff --git a/_Main/BL/Type_MacroPlan/Attribute_A_Inventory.qbl b/_Main/BL/Type_MacroPlan/Attribute_A_Inventory.qbl
new file mode 100644
index 0000000..50e2d2a
--- /dev/null
+++ b/_Main/BL/Type_MacroPlan/Attribute_A_Inventory.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute A_Inventory
+{
+ #keys: '3[415754.0.238171488][415754.0.238171487][415754.0.238171489]'
+ ValueType: String
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_dhEndDate_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_dhEndDate_OnCreated.def
new file mode 100644
index 0000000..d686a5f
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_dhEndDate_OnCreated.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: dhEndDate
+Response OnCreated () id:Response_MacroPlanner_ApplicationMacroPlanner_dhEndDate_OnCreated
+{
+ #keys: '[415754.0.240181498]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebComponent_OnCreated'
+ QuillAction
+ {
+ Body:
+ [*
+ this.Data( Date::ActualDate().Format( "YM2D2" ) );
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_dhStartDate_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_dhStartDate_OnCreated.def
new file mode 100644
index 0000000..225bcaf
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_dhStartDate_OnCreated.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: dhStartDate
+Response OnCreated () id:Response_MacroPlanner_ApplicationMacroPlanner_dhStartDate_OnCreated
+{
+ #keys: '[415754.0.240181363]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebComponent_OnCreated'
+ QuillAction
+ {
+ Body:
+ [*
+ this.Data( Date::ActualDate().Format( "YM2D2" ) );
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def
index ec25220..fb261de 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def
@@ -192,5 +192,25 @@
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
+ ]
+ }
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Component_ListInventoryInterfaceData.def "b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Component_ListInventoryInterfaceData\043360.def"
similarity index 67%
rename from _Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Component_ListInventoryInterfaceData.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Component_ListInventoryInterfaceData\043360.def"
index dff510e..bba6934 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Component_ListInventoryInterfaceData.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Component_ListInventoryInterfaceData\043360.def"
@@ -1,30 +1,32 @@
Quintiq file version 2.0
-Component ListInventoryInterfaceData
+Component ListInventoryInterfaceData id:ListInventoryInterfaceData_360
{
- #keys: '[413988.0.1227911672]'
+ #keys: '[415754.0.239549510]'
BaseType: 'WebList'
Children:
[
Component DataExtractorInventoryInterfaceData
{
- #keys: '[413988.0.1227911673]'
+ #keys: '[415754.0.239549511]'
BaseType: 'WebDataExtractor'
Properties:
[
DataType: 'InterfaceDataset'
+ FilterArguments: 'startDate:QLibMacroPlannerWebUI::ApplicationMacroPlanner.dhStartDate;endDate:QLibMacroPlannerWebUI::ApplicationMacroPlanner.dhEndDate'
+ FixedFilter: 'object.Filter( startDate, endDate )'
Source: 'InterfaceDataset'
Taborder: 0
Transformation: 'InventoryInterfaceData'
]
}
- #child: listActionBarPageInventoryInterfaceData
+ #child: listActionBarPageInventoryInterfaceData_1
Component DataSetLevelInventoryInterfaceData
{
- #keys: '[413988.0.1227911678]'
+ #keys: '[415754.0.239549513]'
BaseType: 'WebDataSetLevel'
Children:
[
- #child: listContextMenuInventoryInterfaceData
+ #child: listContextMenuInventoryInterfaceData_1
]
Properties:
[
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Component_listActionBarPageInventoryInterfaceData\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Component_listActionBarPageInventoryInterfaceData\0431.def"
new file mode 100644
index 0000000..d7b96c7
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Component_listActionBarPageInventoryInterfaceData\0431.def"
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listActionBarPageInventoryInterfaceData id:listActionBarPageInventoryInterfaceData_1
+{
+ #keys: '[415754.0.239549512]'
+ BaseType: 'listActionBarPage'
+ Properties:
+ [
+ Taborder: 1
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Component_listActionBarPageInventoryInterfaceData.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Component_listActionBarPageInventoryInterfaceData.def
deleted file mode 100644
index 31272d1..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Component_listActionBarPageInventoryInterfaceData.def
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component listActionBarPageInventoryInterfaceData
-{
- #keys: '[413988.0.1227911675]'
- BaseType: 'listActionBarPage'
- Properties:
- [
- Taborder: 1
- ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Component_listContextMenuInventoryInterfaceData.def "b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Component_listContextMenuInventoryInterfaceData\0431.def"
similarity index 71%
rename from _Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Component_listContextMenuInventoryInterfaceData.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Component_listContextMenuInventoryInterfaceData\0431.def"
index 0c89602..3dedc11 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Component_listContextMenuInventoryInterfaceData.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Component_listContextMenuInventoryInterfaceData\0431.def"
@@ -1,13 +1,13 @@
Quintiq file version 2.0
-Component listContextMenuInventoryInterfaceData
+Component listContextMenuInventoryInterfaceData id:listContextMenuInventoryInterfaceData_1
{
- #keys: '[413988.0.1227911680]'
+ #keys: '[415754.0.239549514]'
BaseType: 'listContextMenu'
Children:
[
Component mTest
{
- #keys: '[413988.0.1229020405]'
+ #keys: '[415754.0.239549515]'
BaseType: 'WebMenu'
Properties:
[
@@ -18,7 +18,7 @@
}
Component MenuSynchronizeInventory
{
- #keys: '[415136.0.952610516]'
+ #keys: '[415754.0.239549516]'
BaseType: 'WebMenu'
Properties:
[
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Component_pContent.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Component_pContent.def
new file mode 100644
index 0000000..8630748
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Component_pContent.def
@@ -0,0 +1,14 @@
+Quintiq file version 2.0
+Component pContent
+{
+ #keys: '[415754.0.239549326]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ #child: ListInventoryInterfaceData_360
+ ]
+ Properties:
+ [
+ Taborder: 1
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Component_pHeader.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Component_pHeader.def
new file mode 100644
index 0000000..a3266c0
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Component_pHeader.def
@@ -0,0 +1,47 @@
+Quintiq file version 2.0
+Component pHeader
+{
+ #keys: '[415754.0.239549307]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ Component bFilter
+ {
+ #keys: '[415754.0.239549531]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ Image: 'FILTER_AND_SORT'
+ Label: 'Filter'
+ Taborder: 2
+ ]
+ }
+ Component dsStart
+ {
+ #keys: '[415754.0.239549545]'
+ BaseType: 'WebDateSelector'
+ Properties:
+ [
+ Label: 'Start'
+ Taborder: 0
+ ]
+ }
+ Component dsEnd
+ {
+ #keys: '[415754.0.239549557]'
+ BaseType: 'WebDateSelector'
+ Properties:
+ [
+ Label: 'End'
+ Taborder: 1
+ ]
+ }
+ ]
+ Properties:
+ [
+ Border: true
+ FixedSize: true
+ Orientation: 'horizontal'
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Response_listContextMenuInventoryInterfaceData_MenuSynchronizeInventory_OnCl.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Response_listContextMenuInventoryInterfaceData_1_MenuSynchronizeInventory_On.def
similarity index 68%
rename from _Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Response_listContextMenuInventoryInterfaceData_MenuSynchronizeInventory_OnCl.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Response_listContextMenuInventoryInterfaceData_1_MenuSynchronizeInventory_On.def
index d34a5fc..77ad035 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Response_listContextMenuInventoryInterfaceData_MenuSynchronizeInventory_OnCl.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Response_listContextMenuInventoryInterfaceData_1_MenuSynchronizeInventory_On.def
@@ -1,8 +1,8 @@
Quintiq file version 2.0
-#parent: listContextMenuInventoryInterfaceData/MenuSynchronizeInventory
-Response OnClick () id:Response_listContextMenuInventoryInterfaceData_MenuSynchronizeInventory_OnClick
+#parent: listContextMenuInventoryInterfaceData_1/MenuSynchronizeInventory
+Response OnClick () id:Response_listContextMenuInventoryInterfaceData_1_MenuSynchronizeInventory_OnClick
{
- #keys: '[415136.0.953720206]'
+ #keys: '[415754.0.239549508]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebMenu_OnClick'
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Response_listContextMenuInventoryInterfaceData_mTest_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Response_listContextMenuInventoryInterfaceData_1_mTest_OnClick.def
similarity index 72%
rename from _Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Response_listContextMenuInventoryInterfaceData_mTest_OnClick.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Response_listContextMenuInventoryInterfaceData_1_mTest_OnClick.def
index b54517e..fdcf461 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Response_listContextMenuInventoryInterfaceData_mTest_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Response_listContextMenuInventoryInterfaceData_1_mTest_OnClick.def
@@ -1,8 +1,8 @@
Quintiq file version 2.0
-#parent: listContextMenuInventoryInterfaceData/mTest
-Response OnClick () id:Response_listContextMenuInventoryInterfaceData_mTest_OnClick
+#parent: listContextMenuInventoryInterfaceData_1/mTest
+Response OnClick () id:Response_listContextMenuInventoryInterfaceData_1_mTest_OnClick
{
- #keys: '[413988.0.1227950665]'
+ #keys: '[415754.0.239549509]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebMenu_OnClick'
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Response_pHeader_bFilter_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Response_pHeader_bFilter_OnClick.def
new file mode 100644
index 0000000..a36cf44
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Response_pHeader_bFilter_OnClick.def
@@ -0,0 +1,17 @@
+Quintiq file version 2.0
+#parent: pHeader/bFilter
+Response OnClick () id:Response_pHeader_bFilter_OnClick
+{
+ #keys: '[415754.0.240306536]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebButton_OnClick'
+ QuillAction
+ {
+ Body:
+ [*
+ dhStartDate.Data( dsStart.Date().Format( "YM2D2" ) )
+ dhEndDate.Data( dsEnd.Date().Format( "YM2D2" ) );
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Response_pHeader_dsEnd_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Response_pHeader_dsEnd_OnCreated.def
new file mode 100644
index 0000000..1a4f475
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Response_pHeader_dsEnd_OnCreated.def
@@ -0,0 +1,20 @@
+Quintiq file version 2.0
+#parent: pHeader/dsEnd
+Response OnCreated () id:Response_pHeader_dsEnd_OnCreated
+{
+ #keys: '[415754.0.239779515]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebComponent_OnCreated'
+ QuillAction
+ {
+ Body:
+ [*
+ cnv2 := StringToDate::StandardConverter();
+ cnv2.SetCustomConversion();
+ cnv2.CustomFormatString( 'yyyyMMdd' );
+
+ this.Date( cnv2.Convert( dhEndDate.Data() ) );
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Response_pHeader_dsStart_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Response_pHeader_dsStart_OnCreated.def
new file mode 100644
index 0000000..0cb4cdb
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/Response_pHeader_dsStart_OnCreated.def
@@ -0,0 +1,20 @@
+Quintiq file version 2.0
+#parent: pHeader/dsStart
+Response OnCreated () id:Response_pHeader_dsStart_OnCreated
+{
+ #keys: '[415754.0.239779425]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebComponent_OnCreated'
+ QuillAction
+ {
+ Body:
+ [*
+ cnv2 := StringToDate::StandardConverter();
+ cnv2.SetCustomConversion();
+ cnv2.CustomFormatString( 'yyyyMMdd' );
+
+ this.Date( cnv2.Convert( dhStartDate.Data() ) );
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/_ROOT_Component_FormInventoryInterfaceData.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/_ROOT_Component_FormInventoryInterfaceData.def
index cb2cd09..c862195 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/_ROOT_Component_FormInventoryInterfaceData.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceData/_ROOT_Component_FormInventoryInterfaceData.def
@@ -7,7 +7,8 @@
BaseType: 'WebForm'
Children:
[
- #child: ListInventoryInterfaceData
+ #child: pContent
+ #child: pHeader
]
Properties:
[
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormLogisticsCostTransport/Component_ListLogisticsCostTransport.def b/_Main/UI/MacroPlannerWebApp/Component_FormLogisticsCostTransport/Component_ListLogisticsCostTransport.def
index e0c134d..5b301f4 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormLogisticsCostTransport/Component_ListLogisticsCostTransport.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormLogisticsCostTransport/Component_ListLogisticsCostTransport.def
@@ -28,7 +28,7 @@
]
Properties:
[
- Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Product","title":"浜у搧","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Product"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Origin","title":"璧峰鍦�","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Origin"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Destination","title":"鐩殑鍦�","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Destination"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"LoadingCapacity","title":"瑁呰浇瀹归噺","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"LoadingCapacity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"TransportPrice","title":"杩愯緭鍗曚环(RMB/杞�)","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"TransportPrice"}}]'
+ Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Product","title":"浜у搧","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Product"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Origin","title":"璧峰鍦�","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Origin"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Destination","title":"鐩殑鍦�","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Destination"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"LoadingCapacity","title":"瑁呰浇瀹归噺(鎵�/杞�)","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"LoadingCapacity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"TransportPrice","title":"杩愯緭浠锋牸(RMB/杞�)","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"TransportPrice"}}]'
ContextMenu: 'listContextMenuLogisticsCostTransport'
Taborder: 2
]
diff --git a/_Main/UI/MacroPlannerWebApp/Views/LogisticsCostParameterSetting.vw b/_Main/UI/MacroPlannerWebApp/Views/LogisticsCostParameterSetting.vw
index 3835185..c01f8e1 100644
--- a/_Main/UI/MacroPlannerWebApp/Views/LogisticsCostParameterSetting.vw
+++ b/_Main/UI/MacroPlannerWebApp/Views/LogisticsCostParameterSetting.vw
@@ -155,7 +155,7 @@
dataType: 'number'
index: 3
subtotals: ''
- width: 81
+ width: 109
}
column_TransportPrice
{
--
Gitblit v1.9.3