From 6d9968b5e3de0f425bef89103b9d4eec06a897f6 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期五, 18 十月 2024 12:00:58 +0800
Subject: [PATCH] 修复产量对比报表日期筛选导出不生效的bug

---
 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgRequirementPreprocessing.def |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgRequirementPreprocessing.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgRequirementPreprocessing.def
index 75c409e..ba77e78 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgRequirementPreprocessing.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgRequirementPreprocessing.def
@@ -27,7 +27,7 @@
       Properties:
       [
         Image: 'FLASH'
-        Label: 'Requirement upload'
+        Label: 'Demand upload'
         Taborder: 1
       ]
     }
@@ -44,10 +44,10 @@
           BaseType: 'WebDataExtractor'
           Properties:
           [
-            DataType: 'Archive'
+            DataType: 'ArchiveExecutionStatus'
             FilterArguments: 'userName:QLibMacroPlannerWebUI::ApplicationMacroPlanner.ActionBarMacroPlanner.dhUserName'
-            FixedFilter: 'object.ExecutionUserName() = userName'
-            Source: 'Archive'
+            FixedFilter: 'object.Filter( userName )'
+            Source: 'ArchiveExecutionStatus'
             Taborder: 0
             Transformation: 'RequirementImportExecutionStatus'
           ]
@@ -55,17 +55,28 @@
       ]
       Properties:
       [
+        Taborder: 3
+      ]
+    }
+    Component bBESIWarning
+    {
+      #keys: '[414996.0.413910939]'
+      BaseType: 'WebButton'
+      Properties:
+      [
+        Image: 'WARNING'
+        Label: 'BESI warning'
         Taborder: 2
       ]
     }
     Component dhUserName
     {
-      #keys: '[414996.0.387620508]'
+      #keys: '[413988.0.1522010283]'
       BaseType: 'WebDataHolder'
       Databinding: 'String*'
       Properties:
       [
-        Taborder: 3
+        Taborder: 4
       ]
     }
   ]

--
Gitblit v1.9.3