From 7e31442f0e9b07764e9c6a9680d3d4aeba5fe1de Mon Sep 17 00:00:00 2001
From: admin <admin@admin.com>
Date: 星期三, 22 一月 2025 12:20:44 +0800
Subject: [PATCH] Merge branch 'master' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/UI/MacroPlannerWebApp/Views/Machine_stock_data.vw | 34 ++++++++--------------------------
1 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Views/Machine_stock_data.vw b/_Main/UI/MacroPlannerWebApp/Views/Machine_stock_data.vw
index 0c37faa..186a0ac 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
+ index: 1
subtotals: ''
width: 150
}
- column_FacName
+ column_Lgort
{
- columnId: 'FacName'
- dataPath: 'FacName'
+ columnId: 'Lgort'
+ dataPath: 'Lgort'
dataType: 'string'
- index: 3
+ 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