From 5e5a0d4eb60f70b969ece9c6c4cc90d28c2edf55 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期四, 31 十月 2024 16:31:33 +0800
Subject: [PATCH] 修复下发时候无法显示error的问题

---
 _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..87cac3a 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 );
+          }
         }
         WebMessageBox::Success( "涓嬪彂鎴愬姛" );
       }else{

--
Gitblit v1.9.3