From 7e31442f0e9b07764e9c6a9680d3d4aeba5fe1de Mon Sep 17 00:00:00 2001
From: admin <admin@admin.com>
Date: 星期三, 22 一月 2025 12:20:44 +0800
Subject: [PATCH] Merge branch 'master' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Method_OnOK.def | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Method_OnOK.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Method_OnOK.def
index 2e5f44c..c7c19c6 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Method_OnOK.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Method_OnOK.def
@@ -18,15 +18,19 @@
}
if( cbOfflinePlan.Checked() ){
dlplannames.Add( lblOfflinePlan.Label() );
+ ArchiveCell_ScheduleSummary::Create( MacroPlan,Archive );
}
if( cbOfflinePlanCC.Checked() ){
ccplannames.Add( lblOfflinePlanCC.Label() );
+ ArchiveCell_ScheduleSummary::Create( MacroPlan,Archive );
}
if( cbShiftPlan.Checked() ){
dlplannames.Add( lblShiftPlan.Label() );
+ ArchiveCell_ScheduleSummary::Create( MacroPlan,Archive );
}
if( cbShiftPlanCC.Checked() ){
ccplannames.Add( lblShiftPlanCC.Label() );
+ ArchiveCell_ScheduleSummary::Create( MacroPlan,Archive );
}
if( cbAssembleOnlinePlan.Checked() ){
dlplannames.Add( lblAssembleOnlinePlan.Label() );
@@ -49,10 +53,10 @@
if( ccplannames.Size() > 0 ){
showlabel := showlabel.Concat( ccshowname.Concat( ccplannames.Concatenate( "銆�" ) ) ).Concat( "锛�");
}
- showlabel := showlabel.Concat( '銆�' );
+ showlabel := showlabel.Replace( showlabel.Length() - 1, 1, '銆�' );
currentuser := QuintiqUser::CurrentUser().DisplayName();
if( WebMessageBox::Question( this, showlabel, 'OK|Cancel' ) = 0 ){
- InterfaceDataset.PublishPlanReportData( MacroPlan, cbCustomDemand.Checked()
+ InterfaceDataset.PublishPlanReportData( MacroPlan,Archive, cbCustomDemand.Checked()
, cbCustomDemandCC.Checked()
, cbOfflinePlan.Checked()
, cbOfflinePlanCC.Checked()
--
Gitblit v1.9.3