From bc05ba97955c569e0c2887c51d6c3e054dbcdf63 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期一, 09 十二月 2024 00:08:55 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev

---
 _Main/UI/MacroPlannerWebApp/Component_FormLogisticsCostMachining/Component_ListLogisticsCostMachining.def |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormLogisticsCostMachining/Component_ListLogisticsCostMachining.def b/_Main/UI/MacroPlannerWebApp/Component_FormLogisticsCostMachining/Component_ListLogisticsCostMachining.def
index bb53ad9..04369af 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormLogisticsCostMachining/Component_ListLogisticsCostMachining.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormLogisticsCostMachining/Component_ListLogisticsCostMachining.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":"Factory","title":"宸ュ巶","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Factory"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StartDate","title":"寮�濮嬫椂闂�","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StartDate"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"EndDate","title":"缁撴潫鏃堕棿","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"EndDate"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"PackagingCapacity","title":"鍖呰瀹归噺","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"PackagingCapacity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"WarehousingPrice","title":"鍏ュ簱鍗曚环(RMB/鎵�)","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"WarehousingPrice"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"OutboundPrice","title":"鍑哄簱鍗曚环(RMB/鎵�)","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"OutboundPrice"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"PackagePrice","title":"鍖呰鍗曚环(RMB/pcs)","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"PackagePrice"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"UnpackingPrice","title":"鎷嗗寘鍗曚环(RMB/pcs)","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"UnpackingPrice"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"BufferPaperPrice","title":"缂撳啿绾稿崟浠�(RMB/鎵�)","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"BufferPaperPrice"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StoragePrice","title":"浠撳偍鍗曚环(RMB/鎵�)","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StoragePrice"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"WoodenCratePrice","title":"鏈ㄧ鍗曚环","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"WoodenCratePrice"}}]'
+        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Product","title":"浜у搧","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Product"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Factory","title":"宸ュ巶","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Factory"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StartDate","title":"寮�濮嬫椂闂�","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StartDate"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"EndDate","title":"缁撴潫鏃堕棿","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"EndDate"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"PackagingCapacity","title":"鍖呰瀹归噺","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"PackagingCapacity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"WarehousingPrice","title":"鍏ュ簱鍗曚环(RMB/鎵�)","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"WarehousingPrice"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"OutboundPrice","title":"鍑哄簱鍗曚环(RMB/鎵�)","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"OutboundPrice"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"PackagePrice","title":"鍖呰鍗曚环(RMB/pcs)","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"PackagePrice"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"UnpackingPrice","title":"鎷嗗寘鍗曚环(RMB/pcs)","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"UnpackingPrice"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"BufferPaperPrice","title":"缂撳啿绾稿崟浠�(RMB/pcs)","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"BufferPaperPrice"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StoragePrice","title":"浠撳偍鍗曚环(RMB/鎵�)","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StoragePrice"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"WoodenCratePrice","title":"鏈ㄧ鍗曚环","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"WoodenCratePrice"}}]'
         ContextMenu: 'listContextMenuLogisticsCostMachining'
         Taborder: 2
       ]

--
Gitblit v1.9.3