Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_Kevin

Kevin Kok Khah Whey

2023-10-18 d5e46a7a9f2cb9123b9aafb39a20e14059faa2e4

 _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