From 4f426fd0938d68df759fff7570ad6ec2e62bac96 Mon Sep 17 00:00:00 2001
From: renhao <renhui.hao@capgemini.com>
Date: 星期三, 18 十月 2023 09:08:32 +0800
Subject: [PATCH] Merge branch 'dev'

---
 _Main/UI/MacroPlannerWebApp/Views/Test.vw |  323 +++--------------------------------------------------
 1 files changed, 21 insertions(+), 302 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Views/Test.vw b/_Main/UI/MacroPlannerWebApp/Views/Test.vw
index 808d3e8..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
             }
@@ -60,6 +42,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: ''
@@ -159,300 +159,19 @@
           }
         }
       }
-      form_FormCustomerAndForecastOrder
-      {
-        title: 'QTIANMA_JITUAN::FormCustomerAndForecastOrder'
-        shown: true
-        componentID: 'QTIANMA_JITUAN::FormCustomerAndForecastOrder'
-        layout
-        {
-          mode: 'open'
-          rowPosition: 16
-          rowSpan: 16
-          columnPosition: 1
-          columnSpan: 4
-        }
-        components
-        {
-          FormCustomerAndForecastOrder_PanelButton
-          {
-            sizeRatio: 1
-          }
-          FormCustomerAndForecastOrder_ListCustomerAndFillingCapacityOrder
-          {
-          }
-          FormCustomerAndForecastOrder_DataSetLevelCustomerAndFillingCapacityOrder
-          {
-            groupDepth: -1
-            column_VerNo
-            {
-              columnId: 'VerNo'
-              dataPath: 'VerNo'
-              dataType: 'string'
-              index: 0
-              subtotals: ''
-              width: 150
-            }
-            column_OrderID
-            {
-              columnId: 'OrderID'
-              dataPath: 'OrderID'
-              dataType: 'string'
-              index: 1
-              subtotals: ''
-              width: 150
-            }
-            column_ProductID
-            {
-              columnId: 'ProductID'
-              dataPath: 'ProductID'
-              dataType: 'string'
-              index: 2
-              subtotals: ''
-              width: 150
-            }
-            column_BusinessType
-            {
-              columnId: 'BusinessType'
-              dataPath: 'BusinessType'
-              dataType: 'string'
-              index: 3
-              subtotals: ''
-              width: 150
-            }
-            column_Customer
-            {
-              columnId: 'Customer'
-              dataPath: 'Customer'
-              dataType: 'string'
-              index: 4
-              subtotals: ''
-              width: 150
-            }
-            column_ServiceType
-            {
-              columnId: 'ServiceType'
-              dataPath: 'ServiceType'
-              dataType: 'string'
-              index: 5
-              subtotals: ''
-              width: 150
-            }
-            column_Quantity
-            {
-              columnId: 'Quantity'
-              dataPath: 'Quantity'
-              dataType: 'real'
-              index: 6
-              subtotals: ''
-              width: 150
-            }
-            column_UnitOfMeasureName
-            {
-              columnId: 'UnitOfMeasureName'
-              dataPath: 'UnitOfMeasureName'
-              dataType: 'string'
-              index: 7
-              subtotals: ''
-              width: 150
-            }
-            column_PanelBigSheetQuantity
-            {
-              columnId: 'PanelBigSheetQuantity'
-              dataPath: 'PanelBigSheetQuantity'
-              dataType: 'real'
-              index: 8
-              subtotals: ''
-              width: 150
-            }
-            column_SalesAmount
-            {
-              columnId: 'SalesAmount'
-              dataPath: 'SalesAmount'
-              dataType: 'number'
-              index: 9
-              subtotals: ''
-              width: 150
-            }
-            column_ForecastDemandDate
-            {
-              columnId: 'ForecastDemandDate'
-              dataPath: 'ForecastDemandDate'
-              dataType: 'date'
-              index: 10
-              subtotals: ''
-              width: 150
-            }
-            column_DemandDate
-            {
-              columnId: 'DemandDate'
-              dataPath: 'DemandDate'
-              dataType: 'date'
-              index: 11
-              subtotals: ''
-              width: 150
-            }
-          }
-        }
-      }
-      form_FormFillingCapacityOrder
-      {
-        title: 'QTIANMA_JITUAN::FormFillingCapacityOrder'
-        shown: true
-        componentID: 'QTIANMA_JITUAN::FormFillingCapacityOrder'
-        layout
-        {
-          mode: 'open'
-          rowPosition: 16
-          rowSpan: 16
-          columnPosition: 5
-          columnSpan: 8
-        }
-        components
-        {
-          FormFillingCapacityOrder_PanelFillingCapacityOrder
-          {
-            sizeRatio: 1
-          }
-          FormFillingCapacityOrder_ListFillingCapacityOrder
-          {
-          }
-          FormFillingCapacityOrder_DataSetLevelFillingCapacityOrder
-          {
-            groupDepth: -1
-            column_VerNo
-            {
-              columnId: 'VerNo'
-              dataPath: 'VerNo'
-              dataType: 'string'
-              index: 0
-              subtotals: ''
-              width: 150
-            }
-            column_ProductID
-            {
-              columnId: 'ProductID'
-              dataPath: 'ProductID'
-              dataType: 'string'
-              index: 1
-              subtotals: ''
-              width: 150
-            }
-            column_BusinessType
-            {
-              columnId: 'BusinessType'
-              dataPath: 'BusinessType'
-              dataType: 'string'
-              index: 2
-              subtotals: ''
-              width: 150
-            }
-            column_SalesSegmentName
-            {
-              columnId: 'SalesSegmentName'
-              dataPath: 'SalesSegmentName'
-              dataType: 'string'
-              index: 3
-              subtotals: ''
-              width: 150
-            }
-            column_StockingPointID
-            {
-              columnId: 'StockingPointID'
-              dataPath: 'StockingPointID'
-              dataType: 'string'
-              index: 4
-              subtotals: ''
-              width: 150
-            }
-            column_Customer
-            {
-              columnId: 'Customer'
-              dataPath: 'Customer'
-              dataType: 'string'
-              index: 5
-              subtotals: ''
-              width: 150
-            }
-            column_Quantity
-            {
-              columnId: 'Quantity'
-              dataPath: 'Quantity'
-              dataType: 'real'
-              index: 6
-              subtotals: ''
-              width: 150
-            }
-            column_UnitOfMeasureName
-            {
-              columnId: 'UnitOfMeasureName'
-              dataPath: 'UnitOfMeasureName'
-              dataType: 'string'
-              index: 7
-              subtotals: ''
-              width: 150
-            }
-            column_PanelBigSheetQuantity
-            {
-              columnId: 'PanelBigSheetQuantity'
-              dataPath: 'PanelBigSheetQuantity'
-              dataType: 'real'
-              index: 8
-              subtotals: ''
-              width: 150
-            }
-            column_SalesAmount
-            {
-              columnId: 'SalesAmount'
-              dataPath: 'SalesAmount'
-              dataType: 'number'
-              index: 9
-              subtotals: ''
-              width: 150
-            }
-            column_ForecastDemandDate
-            {
-              columnId: 'ForecastDemandDate'
-              dataPath: 'ForecastDemandDate'
-              dataType: 'date'
-              index: 10
-              subtotals: ''
-              width: 150
-            }
-            column_DemandDate
-            {
-              columnId: 'DemandDate'
-              dataPath: 'DemandDate'
-              dataType: 'date'
-              index: 11
-              subtotals: ''
-              width: 150
-            }
-            column_OrderType
-            {
-              columnId: 'OrderType'
-              dataPath: 'OrderType'
-              dataType: 'string'
-              index: 12
-              subtotals: ''
-              width: 150
-            }
-          }
-        }
-      }
     }
     userconfigurableinformation
     {
     }
+    image: 'BEAR'
     page: ''
     group: ''
     index: 0
-    image: 'BEAR'
     description: ''
   }
   formatversion: 2
   id: 'Test'
-  name: '浜ц兘鍒嗛厤_濉骇'
+  name: '浜ц兘鍒嗛厤'
   isglobal: false
   isroot: true
 }

--
Gitblit v1.9.3