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 | 82 +++++++++++++++++++++++++++-------------
1 files changed, 55 insertions(+), 27 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Method_OnOK.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Method_OnOK.def
index 9969228..c7c19c6 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Method_OnOK.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Method_OnOK.def
@@ -7,39 +7,67 @@
[*
this.ApplyChanges();
- showlabel := '鏄惁鍙戦��';
- plannames := construct( Strings );
- if( cbCustomDemand.Checked() ){
- plannames.Add( lblCustomDemand.Label() );
- }
- if( cbOfflinePlan.Checked() ){
- plannames.Add( lblOfflinePlan.Label() );
-
- ArchiveCell_AnnualPlanReport::Create( MacroPlan,Archive );
- }
- if( cbShiftPlan.Checked() ){
- plannames.Add( lblShiftPlan.Label() );
-
- ArchiveCell_ScheduleSummary::Create( MacroPlan,Archive );
- }
- if( cbAssembleOnlinePlan.Checked() ){
- plannames.Add( lblAssembleOnlinePlan.Label() );
- }
- if( cbInventoryPlan.Checked() ){
- plannames.Add( lblInventoryPlan.Label() );
- }
+ showlabel := '鏄惁鍙戦��';
+ dlplannames := construct( Strings );
+ ccplannames := construct( Strings );
+ if( cbCustomDemand.Checked() ){
+ dlplannames.Add( lblCustomDemand.Label() );
+ }
+ if( cbCustomDemandCC.Checked() ){
+ ccplannames.Add( lblCustomDemandCC.Label() );
+ }
+ 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() );
+ }
+ if( cbAssembleOnlinePlanCC.Checked() ){
+ ccplannames.Add( lblAssembleOnlinePlanCC.Label() );
+ }
+ if( cbInventoryPlan.Checked() ){
+ dlplannames.Add( lblInventoryPlan.Label() );
+ }
+ if( cbInventoryPlanCC.Checked() ){
+ ccplannames.Add( lblInventoryPlanCC.Label() );
+ }
- showlabel := showlabel.Concat( plannames.Concatenate( "銆�" ) ).Concat( '锛�' );
- currentuser := QuintiqUser::CurrentUser().DisplayName();
- if( WebMessageBox::Question( this, showlabel, 'OK|Cancel' ) = 0 ){
- InterfaceDataset.PublishPlanReportData( MacroPlan, cbCustomDemand.Checked()
+ dlshowname := '澶ц繛宸ュ巶鐨�';
+ if( dlplannames.Size() > 0 ){
+ showlabel := showlabel.Concat( dlshowname.Concat( dlplannames.Concatenate( "銆�" ) ) ).Concat( "锛�");
+ }
+ ccshowname := '闀挎槬宸ュ巶鐨�';
+ if( ccplannames.Size() > 0 ){
+ showlabel := showlabel.Concat( ccshowname.Concat( ccplannames.Concatenate( "銆�" ) ) ).Concat( "锛�");
+ }
+ showlabel := showlabel.Replace( showlabel.Length() - 1, 1, '銆�' );
+ currentuser := QuintiqUser::CurrentUser().DisplayName();
+ if( WebMessageBox::Question( this, showlabel, 'OK|Cancel' ) = 0 ){
+ InterfaceDataset.PublishPlanReportData( MacroPlan,Archive, cbCustomDemand.Checked()
+ , cbCustomDemandCC.Checked()
, cbOfflinePlan.Checked()
+ , cbOfflinePlanCC.Checked()
, cbShiftPlan.Checked()
+ , cbShiftPlanCC.Checked()
, cbAssembleOnlinePlan.Checked()
+ , cbAssembleOnlinePlanCC.Checked()
, cbInventoryPlan.Checked()
+ , cbInventoryPlanCC.Checked()
, currentuser );
- }
-
+ }
this.Close();
*]
--
Gitblit v1.9.3