From 331f46d96ef1e2140042d3c2f7938fe0d9635c27 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期一, 11 十一月 2024 23:26:08 +0800
Subject: [PATCH] 修复一些bug,调整页面布局

---
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_870_bExport_OnClick.def |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_870_bExport_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_870_bExport_OnClick.def
index 702601f..a04ce7f 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_870_bExport_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_870_bExport_OnClick.def
@@ -9,8 +9,8 @@
   {
     Body:
     [*
-      rows := selectset( dhComparisonData.Data(),LocalRow,row,exists( dhFinelProducts.Data(),Elements,entity,entity.ID() = row.ProductID()) and exists( dhFinelEntitys.Data(),Elements,entity,entity.DisplayName() = row.ProductionLine())); 
-      columns := selectset( dhComparisonData.Data(),LocalColumn,column,dhStartDate.Data() <= column.Date() and dhEndDate.Data() > column.Date() and column.TimeUnit() = dhTimeUnit.Data());
+      rows := selectset( dhAnnualPlanTable.Data(),LocalRow,row,exists( dhFinelProducts.Data(),Elements,entity,entity.ID() = row.ProductID()) and exists( dhFinelEntitys.Data(),Elements,entity,entity.DisplayName() = row.ProductionLine())); 
+      columns := selectset( dhAnnualPlanTable.Data(),LocalColumn,column,dhStartDate.Data() <= column.Date() and dhEndDate.Data() > column.Date() and column.TimeUnit() = dhTimeUnit.Data());
       LocalCell_Default::AsyncExport( RecycleBin,rows,columns );
       //Application.Download( "浜у嚭瀵煎叆妯℃澘.xlsx",data.AsBinaryData() );
     *]

--
Gitblit v1.9.3