From d5e46a7a9f2cb9123b9aafb39a20e14059faa2e4 Mon Sep 17 00:00:00 2001
From: Kevin Kok Khah Whey <khahwhey.kok@3ds.com>
Date: 星期三, 18 十月 2023 10:55:59 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_Kevin

---
 _Main/UI/MacroPlannerWebApp/Views/Test.vw |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Views/Test.vw b/_Main/UI/MacroPlannerWebApp/Views/Test.vw
index f59a1db..c5e2f28 100644
--- a/_Main/UI/MacroPlannerWebApp/Views/Test.vw
+++ b/_Main/UI/MacroPlannerWebApp/Views/Test.vw
@@ -29,30 +29,12 @@
           FormCapacityAllocationResultsRuleConfiguration_DataSetLevelCapacityAllocationResultsRuleConfiguration
           {
             groupDepth: -1
-            column_PanelMaterialCode
-            {
-              columnId: 'PanelMaterialCode'
-              dataPath: 'PanelMaterialCode'
-              dataType: 'string'
-              index: 0
-              subtotals: ''
-              width: 150
-            }
             column_ModuleMaterialCode
             {
               columnId: 'ModuleMaterialCode'
               dataPath: 'ModuleMaterialCode'
               dataType: 'string'
-              index: 1
-              subtotals: ''
-              width: 150
-            }
-            column_Division
-            {
-              columnId: 'Division'
-              dataPath: 'Division'
-              dataType: 'string'
-              index: 2
+              index: 0
               subtotals: ''
               width: 150
             }
@@ -61,6 +43,24 @@
               columnId: 'StockingPointID'
               dataPath: 'StockingPointID'
               dataType: 'string'
+              index: 1
+              subtotals: ''
+              width: 117
+            }
+            column_PanelMaterialCode
+            {
+              columnId: 'PanelMaterialCode'
+              dataPath: 'PanelMaterialCode'
+              dataType: 'string'
+              index: 2
+              subtotals: ''
+              width: 129
+            }
+            column_Division
+            {
+              columnId: 'Division'
+              dataPath: 'Division'
+              dataType: 'string'
               index: 3
               subtotals: ''
               width: 150

--
Gitblit v1.9.3