From 86d2018efcbee0e9a6d0c33ae93f4fc423242973 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期五, 29 十一月 2024 14:35:02 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev

---
 _Main/BL/Type_InterfaceLoginfo/StaticMethod_CallInterfaceForSAPGet.qbl |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/_Main/BL/Type_InterfaceLoginfo/StaticMethod_CallInterfaceForSAPGet.qbl b/_Main/BL/Type_InterfaceLoginfo/StaticMethod_CallInterfaceForSAPGet.qbl
index abf4b39..666d191 100644
--- a/_Main/BL/Type_InterfaceLoginfo/StaticMethod_CallInterfaceForSAPGet.qbl
+++ b/_Main/BL/Type_InterfaceLoginfo/StaticMethod_CallInterfaceForSAPGet.qbl
@@ -3,14 +3,14 @@
 StaticMethod CallInterfaceForSAPGet (
   InterfaceDataset owner,
   InterfaceLoginfo loginfo
-) as owning InterfaceSAPResponseLoginfos
+) as String
 {
   Description: '璋冪敤鏁版嵁涓彴鎺ュ彛'
   TextBody:
   [*
     // 鐢勫叞楦� Jul-22-2024 (created)
     address           := Translations::InterfaceDataset_SAP_Address(); 
-    httpinterface     := HTTPInterface::Create( address,80);
+    httpinterface     := HTTPInterface::Create( address,8080);
     httpinterface.PostMethod( true ); ; 
     httpinterface.MediaType( Translations::InterfaceDataset_ContentType() );
     try{
@@ -31,7 +31,8 @@
     //鍚庣画鍏叡澶勭悊
     loginfo.FinishTime( DateTime::ActualTime() );
     data             := JSON::Null().Build();
-    saploginfos      := construct( InterfaceSAPResponseLoginfos );
+    sapresponse      := construct( InterfaceSAPResponseLoginfos );
+    feedback         := '';
     if( loginfo.Success() ){
       resultJson     := JSON::Parse( loginfo.Response() );
       code           := resultJson.Get( "code" ).GetNumber();
@@ -47,10 +48,22 @@
       }
       for( i := 0; i < data.Size(); i++ ){
         item := data.Get( i );
-        saploginfos.Add( InterfaceSAPResponseLoginfo::GenerateData( loginfo, item ) );
+        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( '锛�' );
+      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() );
+        if( failmsg.FindString( '*', 0  ) > -1 ){
+          feedback   := feedback.Concat( failmsg.ReplaceAll( '*', failproduct.Concatenate( '銆�' ) ) ).Concat( '锛�' );
+        }else{
+          feedback   := feedback.Concat( '浜у搧' ).Concat( failproduct.Concatenate( '銆�' ) ).Concat( '鍥犱负' ).Concat( failmsg ).Concat( '鎺ㄩ�佸け璐�' ).Concat( '锛�' );
+        }
+      }
+      feedback       := feedback.Replace( feedback.Length() - 1, 1, '銆�' );
     }
     
-    return &saploginfos;
+    return feedback;
   *]
 }

--
Gitblit v1.9.3