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_FormDispatchShiftSchedulingInformation/Response_PanelDispatchShiftSchedulingInformation_bDispatch_OnClick.def | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 edcb05d..4645ca5 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDispatchShiftSchedulingInformation/Response_PanelDispatchShiftSchedulingInformation_bDispatch_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDispatchShiftSchedulingInformation/Response_PanelDispatchShiftSchedulingInformation_bDispatch_OnClick.def
@@ -27,12 +27,24 @@
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,Translations::MessageBox_OK() );
+ }
}
WebMessageBox::Success( "涓嬪彂鎴愬姛" );
}else{
--
Gitblit v1.9.3