From a746b44994e729613737baa922796383027fc54c Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期四, 14 十一月 2024 16:59:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_pRibbonDown_478_bImportOutput_OnClick.def | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_pRibbonDown_478_bImportOutput_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_pRibbonDown_478_bImportOutput_OnClick.def
index 6aa27cf..324cfd2 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_pRibbonDown_478_bImportOutput_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_pRibbonDown_478_bImportOutput_OnClick.def
@@ -27,7 +27,7 @@
generalExcelImportAndExportDataSource := GeneralExcelImportAndExportDataSource::Upload( RecycleBin, webFileBinaryData, fileName );
generalExcelImportAndExportDataSource.ReadStructure();
- MP_Cell_ScheduleSummary::ImportOutput( Archive,generalExcelImportAndExportDataSource);
+ ArchiveCell_ScheduleSummary::ImportOutput( Archive,generalExcelImportAndExportDataSource);
// 鍚庣画鍒犻櫎
generalExcelImportAndExportDataSource.Delete();
@@ -39,7 +39,7 @@
}
macroPlans := ApplicationMacroPlanner.GetLoadedMacroPlans();
- table := MP_Cell_ScheduleSummary::CreateFullTable( macroPlans,RecycleBin ,Archive, MacroPlan );
+ table := ArchiveCell_ScheduleSummary::CreateFullTable( Archive ,RecycleBin, MacroPlan );
dhScheduleSummaryTable.Data( table );
*]
--
Gitblit v1.9.3