From 88827771d34fd1018449fc68bd8c183fa7b5f4fb Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期四, 31 十月 2024 18:28:24 +0800
Subject: [PATCH] 机加库存添加库存点列

---
 _Main/UI/MacroPlannerWebApp/Views/Machine_stock_data.vw                                       |   44 +++++++++++++-------------------------------
 _Main/UI/MacroPlannerWebApp/Component_FormMachineStockData/Component_ListMachineStockData.def |    2 +-
 2 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormMachineStockData/Component_ListMachineStockData.def b/_Main/UI/MacroPlannerWebApp/Component_FormMachineStockData/Component_ListMachineStockData.def
index f9f1e69..9797cac 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormMachineStockData/Component_ListMachineStockData.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormMachineStockData/Component_ListMachineStockData.def
@@ -28,7 +28,7 @@
       ]
       Properties:
       [
-        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MaterialNo","title":"MaterialNo","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MaterialNo"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MaterialName","title":"MaterialName","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MaterialName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Fac","title":"Fac","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Fac"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"FacName","title":"FacName","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"FacName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"LineType","title":"LineType","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"LineType"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"DDay","title":"DDay","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"DDay"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Total","title":"Total","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Total"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"AllTotal","title":"AllTotal","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"AllTotal"}}]'
+        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MaterialNo","title":"MaterialNo","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MaterialNo"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"FacName","title":"FacName","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"FacName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"LineType","title":"LineType","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"LineType"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"DDay","title":"DDay","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"DDay"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Total","title":"Total","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Total"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Lgort","title":"Lgort","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Lgort"}}]'
         ContextMenu: 'listContextMenuMachineStockData'
         SortCriteria: 'desc:DDay'
         Taborder: 2
diff --git a/_Main/UI/MacroPlannerWebApp/Views/Machine_stock_data.vw b/_Main/UI/MacroPlannerWebApp/Views/Machine_stock_data.vw
index 0c37faa..10c0a00 100644
--- a/_Main/UI/MacroPlannerWebApp/Views/Machine_stock_data.vw
+++ b/_Main/UI/MacroPlannerWebApp/Views/Machine_stock_data.vw
@@ -35,30 +35,21 @@
               subtotals: ''
               width: 150
             }
-            column_MaterialName
-            {
-              columnId: 'MaterialName'
-              dataPath: 'MaterialName'
-              dataType: 'string'
-              index: 1
-              subtotals: ''
-              width: 150
-            }
-            column_Fac
-            {
-              columnId: 'Fac'
-              dataPath: 'Fac'
-              dataType: 'string'
-              index: 2
-              subtotals: ''
-              width: 150
-            }
             column_FacName
             {
               columnId: 'FacName'
               dataPath: 'FacName'
               dataType: 'string'
-              index: 3
+              index: 1
+              subtotals: ''
+              width: 150
+            }
+            column_Lgort
+            {
+              columnId: 'Lgort'
+              dataPath: 'Lgort'
+              dataType: 'string'
+              index: 2
               subtotals: ''
               width: 150
             }
@@ -67,7 +58,7 @@
               columnId: 'LineType'
               dataPath: 'LineType'
               dataType: 'string'
-              index: 4
+              index: 3
               subtotals: ''
               width: 150
             }
@@ -76,7 +67,7 @@
               columnId: 'DDay'
               dataPath: 'DDay'
               dataType: 'date'
-              index: 5
+              index: 4
               subtotals: ''
               width: 150
             }
@@ -85,16 +76,7 @@
               columnId: 'Total'
               dataPath: 'Total'
               dataType: 'real'
-              index: 6
-              subtotals: ''
-              width: 150
-            }
-            column_AllTotal
-            {
-              columnId: 'AllTotal'
-              dataPath: 'AllTotal'
-              dataType: 'real'
-              index: 7
+              index: 5
               subtotals: ''
               width: 150
             }

--
Gitblit v1.9.3