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/InvnetoryUpdate.vw |   54 +++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Views/InvnetoryUpdate.vw b/_Main/UI/MacroPlannerWebApp/Views/InvnetoryUpdate.vw
index 1d0a1f8..003f129 100644
--- a/_Main/UI/MacroPlannerWebApp/Views/InvnetoryUpdate.vw
+++ b/_Main/UI/MacroPlannerWebApp/Views/InvnetoryUpdate.vw
@@ -25,7 +25,7 @@
           FormInventoryInterfaceDataDetail_DataSetLevelInventoryInterfaceDataDetail
           {
             groupDepth: -1
-            sort: 'DESC:Date,DESC:Quantity'
+            sort: 'InventoryPoint'
             column_Date
             {
               columnId: 'Date'
@@ -53,14 +53,32 @@
               subtotals: ''
               width: 177
             }
+            column_Fac
+            {
+              columnId: 'Fac'
+              dataPath: 'Fac'
+              dataType: 'string'
+              index: 3
+              subtotals: ''
+              width: 150
+            }
             column_Quantity
             {
               columnId: 'Quantity'
               dataPath: 'Quantity'
               dataType: 'real'
-              index: 3
+              index: 4
               subtotals: ''
               width: 155
+            }
+            column_Dtype
+            {
+              columnId: 'Dtype'
+              dataPath: 'Dtype'
+              dataType: 'string'
+              index: 5
+              subtotals: ''
+              width: 150
             }
           }
         }
@@ -80,6 +98,14 @@
         }
         components
         {
+          FormInventoryInterfaceData_pHeader
+          {
+            sizeRatio: 1
+          }
+          FormInventoryInterfaceData_pContent
+          {
+            sizeRatio: 1
+          }
           FormInventoryInterfaceData_ListInventoryInterfaceData
           {
           }
@@ -129,7 +155,7 @@
           FormInventoryPointSelection_DataSetLevelInventoryPointSelection
           {
             groupDepth: -1
-            sort: 'InventoryPoint'
+            sort: 'DESC:Fac'
             column_ImgIsIncluded
             {
               columnId: 'ImgIsIncluded'
@@ -155,17 +181,35 @@
               dataType: 'string'
               index: 2
               subtotals: ''
-              width: 150
+              width: 114
+            }
+            column_Dtype
+            {
+              columnId: 'Dtype'
+              dataPath: 'Dtype'
+              dataType: 'string'
+              index: 3
+              subtotals: ''
+              width: 81
             }
             column_StockpoingPoint
             {
               columnId: 'StockpoingPoint'
               dataPath: 'StockpoingPoint'
               dataType: 'string'
-              index: 3
+              index: 4
               subtotals: ''
               width: 150
             }
+            column_Fac
+            {
+              columnId: 'Fac'
+              dataPath: 'Fac'
+              dataType: 'string'
+              index: 5
+              subtotals: ''
+              width: 89
+            }
           }
         }
       }

--
Gitblit v1.9.3