From 916984c1eb182dbdabf8f40007cdc1648bcd460e Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期二, 09 七月 2024 13:19:32 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_bExport_OnClick#723.def | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_bExport_OnClick\043723.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_bExport_OnClick\043723.def"
index 585ba3c..7d10d9a 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_bExport_OnClick\043723.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_bExport_OnClick\043723.def"
@@ -9,9 +9,9 @@
{
Body:
[*
- rows := selectset( dhComparisonData.Data(),LocalRow,row,true );
- columns := selectset( dhComparisonData.Data( ),LocalColumn,column,true );
- LocalCell_DemandComparison::AsyncExport( RecycleBin, rows, columns );
+ rows := selectset( dhComparisonData.Data(),LocalRow,row,exists( dhFinelProduct.Data(),Elements,product,product.ID() = row.Name() ) );
+ columns := selectset( dhComparisonData.Data( ),LocalColumn,column,not column.IsAttrbuteColumn() and dhStartDate.Data() <= column.Date() and dhEndDate.Data() > column.Date() );
+ LocalCell_DemandComparison::AsyncExport( RecycleBin, rows, columns ,MacroPlan );
*]
GroupServerCalls: false
}
--
Gitblit v1.9.3