From d901b1ab0ee0b690f5ac211b9cdb1db3a58bca86 Mon Sep 17 00:00:00 2001
From: yanweiyuan3 <yanweiyuan3@gmail.com>
Date: 星期二, 10 十月 2023 17:45:58 +0800
Subject: [PATCH] Merge branch 'dev' into dev_yy

---
 _Main/UI/MacroPlannerWebApp/Component_FrmMaterial/_ROOT_Component_FrmMaterial.def |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FrmMaterial/_ROOT_Component_FrmMaterial.def b/_Main/UI/MacroPlannerWebApp/Component_FrmMaterial/_ROOT_Component_FrmMaterial.def
index 899892b..d1b24d6 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FrmMaterial/_ROOT_Component_FrmMaterial.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FrmMaterial/_ROOT_Component_FrmMaterial.def
@@ -14,7 +14,7 @@
     {
       #keys: '[414724.0.53475285]'
       BaseType: 'WebDataHolder'
-      Databinding: 'structured[Product_MP]*'
+      Databinding: 'structured[H_MaterialInfo]*'
       Children:
       [
         Component de_dh_FM_ProductMP
@@ -26,7 +26,7 @@
             DataType: 'MacroPlan'
             Source: 'MacroPlan'
             Taborder: 0
-            Transformation: 'Product_MP'
+            Transformation: 'H_MaterialInfo'
           ]
         }
       ]
@@ -35,10 +35,26 @@
         Taborder: 2
       ]
     }
+    Component txtSaveForecastData_FM
+    {
+      #keys: '[414724.0.143737386]'
+      BaseType: 'WebEditField'
+      Properties:
+      [
+        Description: '瀛樺偍鎵�閫夌墿鏂欎俊鎭�'
+        Enabled: false
+        ReadOnly: true
+        Taborder: 4
+        Visible: false
+      ]
+    }
   ]
   Properties:
   [
     Description: '鍘熸枡鍒楄〃椤�'
+    Image: 'NAV_REDO_LIGHT_BLUE'
+    MinimumColumns: 80
+    MinimumRows: 40
     Title: '鍘熸枡鍒楄〃椤�'
   ]
 }

--
Gitblit v1.9.3