From f8001ff6f7b5d06a87068c840fe5265ca1001923 Mon Sep 17 00:00:00 2001 From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com> Date: 星期二, 03 十二月 2024 15:51:00 +0800 Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev --- _Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSMS64/Method_OnOk.def | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSMS64/Method_OnOk.def b/_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSMS64/Method_OnOk.def index 2832269..28ea388 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSMS64/Method_OnOk.def +++ b/_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSMS64/Method_OnOk.def @@ -6,20 +6,18 @@ Body: [* Form.ApplyChanges(); - //componentmds := ApplicationScope.ComponentMDS(); - //mdsinstanceF := select( componentmds, ComponentMDSKinds.ComponentMDSInstances, m, m.MDSID().MDSKey() = ddlOriginMacroPlan.Data().DatasetMDSID() ); - //handleF := mdsinstanceF.GetMDSHandle() - //macroplanF := handleF.AsMacroPlan(); - // - //mdsinstanceT := select( componentmds, ComponentMDSKinds.ComponentMDSInstances, m, m.MDSID().MDSKey() = ddlDestinationMacroPlan.Data().DatasetMDSID() ); - //handleT := mdsinstanceT.GetMDSHandle() - //macroplanT := handleT.AsMacroPlan(); if( WebMessageBox::Question( this, '鏄惁纭鎺ㄩ��', 'OK|Cancel' ) = 0 ){ currentuser := QuintiqUser::CurrentUser().DisplayName(); - - msg := AOnlineAndMOfflinePlanMS64::GenerateData( InterfaceDataset, ddslFactory.Text(), dsStartDate.Date(), dsEndDate.Date(), efVersionFrom.Text(), efVersionTo.Text(), cbActiveVersion.Checked(), dhProducts.Data(), currentuser ); - WebMessageBox::Warning( ApplicationMacroPlanner, msg, 'Yes|No' ) + msg := ''; + loginfo := AOnlineAndMOfflinePlanMS64::GenerateData( InterfaceDataset, ddslFactory.Text(), dsStartDate.Date(), dsEndDate.Date(), efVersionFrom.Text(), efVersionTo.Text(), cbActiveVersion.Checked(), dhProducts.Data(), currentuser, msg ); + sucproduct := selectuniquevalues( loginfo, SAPResponseLoginfo, e, e.IsSuccess(), e.Msg() ); + // info( '--------------', sucproduct.Size(), loginfo.SAPResponseLoginfo( relsize ), sucproduct.Size() = loginfo.SAPResponseLoginfo( relsize ) ); + if( sucproduct.Size() = loginfo.SAPResponseLoginfo( relsize ) ){ + WebMessageBox::Success( ApplicationMacroPlanner, '鎺ㄩ�佹垚鍔�' ); + }else{ + WebMessageBox::Warning( ApplicationMacroPlanner, msg, 'Yes|No' ); + } } Form.Close(); *] -- Gitblit v1.9.3