From d2d1e174b5f85497c38ec1a02e8dc78421aa3c71 Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期五, 15 十一月 2024 17:44:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
_Main/UI/MacroPlannerWebApp/Component_FormDispatchShiftSchedulingInformation/Response_PanelDispatchShiftSchedulingInformation_bDispatch_OnClick.def | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDispatchShiftSchedulingInformation/Response_PanelDispatchShiftSchedulingInformation_bDispatch_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormDispatchShiftSchedulingInformation/Response_PanelDispatchShiftSchedulingInformation_bDispatch_OnClick.def
index 837ac98..87cac3a 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDispatchShiftSchedulingInformation/Response_PanelDispatchShiftSchedulingInformation_bDispatch_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDispatchShiftSchedulingInformation/Response_PanelDispatchShiftSchedulingInformation_bDispatch_OnClick.def
@@ -23,17 +23,33 @@
factoryNameChinese := factoryNameChinese.Concat( "澶ц繛宸ュ巶;" );
factoryNameEnglish := factoryNameEnglish.Concat( "DL;" );
}
+ factoryNameChinese := factoryNameChinese.SubString( 0,factoryNameChinese.Length() - 1 );
+ factoryNameEnglish := factoryNameEnglish.SubString( 0,factoryNameEnglish.Length() - 1 );
if( WebMessageBox::Question( Translations::RecycleBin_DispatchShiftSchedulingDispatchCheck( factoryNameChinese,factoryNameEnglish ),Translations::MessageBox_YesNo() ) = 0 ){
if( cbCC.Checked() ){
- message := DispatchShiftSchedulingLine::DispatchCC( RecycleBin );
- WebMessageBox::Information( message );
+ respJSON := DispatchShiftSchedulingLine::DispatchCC( RecycleBin );
+ result := respJSON.Get( "State" ).AsString();
+ message := respJSON.Get( "Message" ).AsString();
+ if( result = "Error" ){
+ WebMessageBox::Error( "杩滅▼鏈嶅姟鍣ㄨ繑鍥炰簡涓�涓敊璇細" + message );
+ }else{
+ WebMessageBox::Information( message );
+ }
}
if( cbDL.Checked() ){
- message := DispatchShiftSchedulingLine::DispatchDL( RecycleBin );
- WebMessageBox::Information( message );
+ respJSON := DispatchShiftSchedulingLine::DispatchDL( RecycleBin );
+ result := respJSON.Get( "State" ).AsString();
+ message := respJSON.Get( "Message" ).AsString();
+ if( result = "Error" ){
+ WebMessageBox::Error( "杩滅▼鏈嶅姟鍣ㄨ繑鍥炰簡涓�涓敊璇細" + message );
+ }else{
+ WebMessageBox::Information( message );
+ }
}
+ WebMessageBox::Success( "涓嬪彂鎴愬姛" );
+ }else{
+ WebMessageBox::Success( "Cancel" );
}
- WebMessageBox::Success( "涓嬪彂鎴愬姛" );
*]
GroupServerCalls: false
}
--
Gitblit v1.9.3