From f4eb204cdaa3d7bb3e6a0cca6c2152038c49358c Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期五, 29 十一月 2024 17:49:54 +0800
Subject: [PATCH] sap接口提示消息
---
_Main/BL/Type_AOnlineAndMOfflinePlanMS64/StaticMethod_GenerateData.qbl | 8 ++-
_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/Component_pnlContent.def | 2 +
_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/Response_pnlActions_btnOk_OnClick.def | 5 +-
_Main/BL/Type_InterfaceLoginfo/StaticMethod_CallInterfaceForSAPGet.qbl | 11 +++--
_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSMS64/Method_OnOk.def | 20 ++++-----
_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl | 8 ++-
_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSPIR/Method_OnOk.def | 10 ++++-
7 files changed, 38 insertions(+), 26 deletions(-)
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/StaticMethod_GenerateData.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/StaticMethod_GenerateData.qbl
index 92fef6f..9c1fd0a 100644
--- a/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/StaticMethod_GenerateData.qbl
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/StaticMethod_GenerateData.qbl
@@ -9,8 +9,9 @@
String versionto,
Boolean versionflag,
const Product_MPs products,
- String executor
-) as String
+ String executor,
+ String feedback
+) as InterfaceLoginfo
{
TextBody:
[*
@@ -49,7 +50,8 @@
}
loginfo.TotalRow( ms64.MS64Data( relsize ) );
- return AOnlineAndMOfflinePlanMS64::Publish( owner, loginfo );
+ feedback := AOnlineAndMOfflinePlanMS64::Publish( owner, loginfo );
+ return loginfo;
//InterfaceLoginfo::CallInterfaceForSAPGet( owner, loginfo );
*]
}
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl
index b6203e2..e9f1a0f 100644
--- a/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl
@@ -6,8 +6,9 @@
String version,
Date startdate,
Date enddate,
- String executor
-) as String
+ String executor,
+ String feedback
+) as InterfaceLoginfo
{
TextBody:
[*
@@ -80,6 +81,7 @@
}
}
loginfo.TotalRow( pir.PIRData( relsize ) );
- return AOnlineAndMOfflinePlanPIR::Publish( owner, loginfo );
+ feedback := AOnlineAndMOfflinePlanPIR::Publish( owner, loginfo );
+ return loginfo;
*]
}
diff --git a/_Main/BL/Type_InterfaceLoginfo/StaticMethod_CallInterfaceForSAPGet.qbl b/_Main/BL/Type_InterfaceLoginfo/StaticMethod_CallInterfaceForSAPGet.qbl
index 666d191..c338a06 100644
--- a/_Main/BL/Type_InterfaceLoginfo/StaticMethod_CallInterfaceForSAPGet.qbl
+++ b/_Main/BL/Type_InterfaceLoginfo/StaticMethod_CallInterfaceForSAPGet.qbl
@@ -50,11 +50,14 @@
item := data.Get( i );
sapresponse.Add( InterfaceSAPResponseLoginfo::GenerateData( loginfo, item ) );
}
- sucproduct := selectuniquevalues( sapresponse, Elements, e, e.IsSuccess(), e.Msg_v1() );
- failmssages := selectuniquevalues( sapresponse, Elements, e, not e.IsSuccess(), ifexpr( e.Msg().FindString( e.Msg_v1(), 0 ) > -1, e.Msg().ReplaceAll( e.Msg_v1(), '*' ), e.Msg() ) );
- feedback := feedback.Concat( '浜у搧' ).Concat( sucproduct.Concatenate( "銆�" ) ).Concat( '鎺ㄩ�佹垚鍔�' ).Concat( '锛�' );
+ Transaction::Transaction().Propagate( attribute( InterfaceSAPResponseLoginfo, IsSuccess ) );
+ // sucproduct := selectuniquevalues( sapresponse, Elements, e, e.IsSuccess(), e.Msg_v1() );
+ failmssages := selectuniquevalues( sapresponse, Elements, e, not e.IsSuccess(), ifexpr( e.Msg().FindString( e.Msg_v1(), 0 ) > -1, e.Msg().ReplaceAll( e.Msg_v1(), '*' ), e.Msg_v2() ) );
+ // if( sucproduct.Size() > 0 ){
+ // feedback := feedback.Concat( '浜у搧' ).Concat( sucproduct.Concatenate( "銆�" ) ).Concat( '鎺ㄩ�佹垚鍔�' ).Concat( '锛�' );
+ // }
traverse( failmssages, Elements, failmsg ){
- failproduct := selectuniquevalues( sapresponse, Elements, e, not e.IsSuccess() and ( failmsg = e.Msg() or failmsg = e.Msg().ReplaceAll( e.Msg_v1(), '*' ) ), e.Msg_v1() );
+ failproduct := selectuniquevalues( sapresponse, Elements, e, not e.IsSuccess() and ( failmsg = e.Msg_v2() or failmsg = e.Msg().ReplaceAll( e.Msg_v1(), '*' ) ), e.Msg_v1() );
if( failmsg.FindString( '*', 0 ) > -1 ){
feedback := feedback.Concat( failmsg.ReplaceAll( '*', failproduct.Concatenate( '銆�' ) ) ).Concat( '锛�' );
}else{
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/Component_pnlContent.def
index a6b3254..68dd132 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/Component_pnlContent.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/Component_pnlContent.def
@@ -11,6 +11,8 @@
BaseType: 'WebEditField'
Properties:
[
+ DataBinding: 'dhDialogData.Data.Quantity'
+ Label: 'Quantity'
Mask: 'REAL'
Taborder: 0
]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/Response_pnlActions_btnOk_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/Response_pnlActions_btnOk_OnClick.def
index 05d32be..1a02b69 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/Response_pnlActions_btnOk_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/Response_pnlActions_btnOk_OnClick.def
@@ -4,13 +4,12 @@
{
#keys: '[415136.0.1345221306]'
DefinitionID: 'Responsedef_WebButton_OnClick'
- GroupServerCalls: true
QuillAction
{
Body:
[*
- Form.ApplyChanges();
- Form.Close();
+ Form.OnOK();
*]
+ GroupServerCalls: false
}
}
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();
*]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSPIR/Method_OnOk.def b/_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSPIR/Method_OnOk.def
index 1b03263..e65ea3c 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSPIR/Method_OnOk.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSPIR/Method_OnOk.def
@@ -7,8 +7,14 @@
[*
Form.ApplyChanges();
if( WebMessageBox::Question( this, '鏄惁纭鎺ㄩ��', 'OK|Cancel' ) = 0 ){
- msg := AOnlineAndMOfflinePlanPIR::GenerateData( InterfaceDataset, ddslFactory.Text(), efVersion.Text(), dsStartDate.Date(), dsEndDate.Date(), QuintiqUser::CurrentUser().DisplayName() );
- WebMessageBox::Warning( ApplicationMacroPlanner, msg, 'Yes|No' )
+ msg := '';
+ loginfo := AOnlineAndMOfflinePlanPIR::GenerateData( InterfaceDataset, ddslFactory.Text(), efVersion.Text(), dsStartDate.Date(), dsEndDate.Date(), QuintiqUser::CurrentUser().DisplayName(), msg );
+ sucproduct := selectuniquevalues( loginfo, SAPResponseLoginfo, e, e.IsSuccess(), e.Msg_v1() );
+ if( sucproduct.Size() = loginfo.SAPResponseLoginfo( relsize ) ){
+ WebMessageBox::Success( ApplicationMacroPlanner, '鎺ㄩ�佹垚鍔�' );
+ }else{
+ WebMessageBox::Warning( ApplicationMacroPlanner, msg, 'Yes|No' );
+ }
}
Form.Close();
*]
--
Gitblit v1.9.3