From 4bb71bc32df6a2ce847b5dc1853dea732e2d0253 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期三, 23 十月 2024 17:53:19 +0800
Subject: [PATCH] 财务产量报表/销量报表导入bug

---
 _Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_PanelOperation_ButtonProductionImport660_OnClick.def |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_PanelOperation_ButtonProductionImport660_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_PanelOperation_ButtonProductionImport660_OnClick.def
index 3fed469..bcfb3b7 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_PanelOperation_ButtonProductionImport660_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_PanelOperation_ButtonProductionImport660_OnClick.def
@@ -29,9 +29,15 @@
           
           if( not source.IsExistFutureMonthData() or 
               ( source.IsExistFutureMonthData() and WebMessageBox::Question( this, Translations::MP_FinancialProductionReport_Question(), 'Yes|No' ) = 0 ) ){
-             FinancialSalesSource::InitializeNew( MacroPlan );
+             FinancialProductionSource::Initialize( MacroPlan );
              source.AfterImport();
-             DataHolderTable.Data( FinancialProductionSource::InitiateSearch( MacroPlan ) );
+             productids              := selectuniquevalues( DataHolderProduct.Data(), Elements, product, exists( dhGenerations.Data(), Elements, e, e.Generation() = product.Generation() )
+                                                       and exists( dhMQBMLBs.Data(), Elements, e, e.MLBMQB() = product.MQBMLB() )
+                                                       and exists( dhPowers.Data(), Elements, e, e.Power() = product.Power() ), product.ID() );
+        
+             table                   := selectobject( MacroPlan, FinancialProductionSource.FinancialProductionReport, table, table.IsShow() );
+             table.Generate( dhSearch.Data(), dhFactorys.Data(), productids );
+             DataHolderTable.Data( table );
           }
           
           WebMessageBox::Success( Translations::A_VWED_Success() );

--
Gitblit v1.9.3