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_FormMachineLogisticsCostReport/Response_pHeader_bExport_OnClick.def |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormMachineLogisticsCostReport/Response_pHeader_bExport_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormMachineLogisticsCostReport/Response_pHeader_bExport_OnClick.def
index d6dce97..87d85f4 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormMachineLogisticsCostReport/Response_pHeader_bExport_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormMachineLogisticsCostReport/Response_pHeader_bExport_OnClick.def
@@ -13,9 +13,11 @@
   {
     Body:
     [*
-      mlcrrs := selectset( MacroPlan, MachineLogisticsCostReportRow, tempMLCRR, true );
+      mlcrrs := selectset( MacroPlan, MachineLogisticsCostReportRow, tempMLCRR, tempMLCRR.Factory() = ddslFactory.Text() );
       
-      MachineLogisticsCostReportCell::Export( mlcrrs );
+      binaryValue := MachineLogisticsCostReportCell::Export( MacroPlan, mlcrrs );
+      
+      Application.Download( ddslFactory.Text() + "_鏈哄姞鐗╂祦鎴愭湰鎶ヨ〃.xlsx", binaryValue.AsBinaryData() );
     *]
     GroupServerCalls: false
   }

--
Gitblit v1.9.3