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/BL/Type_InterfaceLoginfo/StaticMethod_CallInterfaceForSAPGet.qbl |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

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{

--
Gitblit v1.9.3