From ccfadb626ee9918181f935cd9ef7668a5357dacf Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期四, 02 一月 2025 20:11:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
_Main/UI/MacroPlannerWebApp/Component_FormDLEngineLogisticsCostReport/Response_PanelExport_bRefresh_OnClick#57.def | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDLEngineLogisticsCostReport/Response_PanelExport_bRefresh_OnClick\04357.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormDLEngineLogisticsCostReport/Response_PanelExport_bRefresh_OnClick\04357.def"
index 109cc6d..fec6f4c 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormDLEngineLogisticsCostReport/Response_PanelExport_bRefresh_OnClick\04357.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormDLEngineLogisticsCostReport/Response_PanelExport_bRefresh_OnClick\04357.def"
@@ -15,6 +15,11 @@
[*
DLEngineLogisticsCostReport::InitializeNew( MacroPlan );
+ if( not isnull( MacroPlan.DLEngineLogisticsCostExcel() ) ){
+ DLEngineLogisticsCostReport::Import( MacroPlan, RecycleBin, MacroPlan.DLEngineLogisticsCostExcel().FileBinaryValue() );
+ }else{
+ DLEngineLogisticsCostReport::InitiateSearch( MacroPlan );
+ }
table := selectobject( MacroPlan, DLEngineLogisticsCostReport, table, table.IsShow() );
DataHolderTable.Data( table );
--
Gitblit v1.9.3