From 69296cb82cbac409959d82417ad0eddf07f51bbb Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期二, 29 十月 2024 17:41:51 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/UI/MacroPlannerWebApp/Component_DialogReportArchiveConfirm/Method_OnOK.def | 38 +++++++++++++++-----------------------
1 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogReportArchiveConfirm/Method_OnOK.def b/_Main/UI/MacroPlannerWebApp/Component_DialogReportArchiveConfirm/Method_OnOK.def
index 0a4ead9..46f7baf 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogReportArchiveConfirm/Method_OnOK.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogReportArchiveConfirm/Method_OnOK.def
@@ -6,23 +6,16 @@
Body:
[*
this.ApplyChanges();
- info( '------------------',cbCustomDemand.Checked()
- ,cbOfflinePlan.Checked()
- ,cbShiftPlan.Checked()
- ,cbAssembleOnlinePlan.Checked()
- ,cbInventoryPlan.Checked()
- ,cbTRCDemand.Checked()
- ,cbTransferPlan.Checked()
- ,cbPackagePlan.Checked() );
- showlabel := '鏄惁瀛樻。';
- if( cbCustomDemand.Checked()
- or cbOfflinePlan.Checked()
- or cbShiftPlan.Checked()
- or cbAssembleOnlinePlan.Checked()
- or cbInventoryPlan.Checked()
- or cbTRCDemand.Checked()
- or cbTransferPlan.Checked()
- or cbPackagePlan.Checked() ){
+
+ //showlabel := '鏄惁瀛樻。';
+ //if( cbCustomDemand.Checked()
+ // or cbOfflinePlan.Checked()
+ // or cbShiftPlan.Checked()
+ // or cbAssembleOnlinePlan.Checked()
+ // or cbInventoryPlan.Checked()
+ // or cbTRCDemand.Checked()
+ // or cbTransferPlan.Checked()
+ // or cbPackagePlan.Checked() ){
showlabel := '鏄惁瀛樻。';
plannames := construct( Strings );
if( cbCustomDemand.Checked() ){
@@ -50,14 +43,13 @@
plannames.Add( lblPackagePlan.Label() );
}
showlabel := showlabel.Concat( plannames.Concatenate( "銆�" ) ).Concat( '锛�' );
- info( '*****************************' );
+ // info( '*****************************' );
if( WebMessageBox::Question( this, showlabel, 'OK|Cancel' ) = 0 ){
}
- }else{
- info( '************###########*****************' );
- WebMessageBox::Information( this, '鏈�夋嫨浠讳綍璁″垝杩涜瀛樻。' )
- }
-
+ //}else{
+ // info( '************###########*****************' );
+ // WebMessageBox::Information( this, '鏈�夋嫨浠讳綍璁″垝杩涜瀛樻。' )
+ //}
this.Close();
*]
}
--
Gitblit v1.9.3