From 191fc5cc2e5eeaff377b749dfa7e497fe503506b Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期一, 27 五月 2024 20:56:50 +0800
Subject: [PATCH] PR,PP,Budget 功能

---
 _Main/BL/Type_Archive/StaticMethod_HandlePR.qbl |   36 ++++++++++++++----------------------
 1 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/_Main/BL/Type_Archive/StaticMethod_HandlePR.qbl b/_Main/BL/Type_Archive/StaticMethod_HandlePR.qbl
index 4744b67..24d0b71 100644
--- a/_Main/BL/Type_Archive/StaticMethod_HandlePR.qbl
+++ b/_Main/BL/Type_Archive/StaticMethod_HandlePR.qbl
@@ -7,29 +7,26 @@
   String prFileName,
   BinaryValue prBinaryValue,
   Boolean isPRArchive,
-  String filePath
-)
+  String filePath,
+  Boolean isOverwriteFile
+) as stream[JSON]
 {
   TextBody:
   [*
     // 璇锋眰鍙傛暟
-    pathPR    := filePath + prFileName;
-    isArchive := ifexpr( isPRArchive, "true", "false" );
-    minorKey  := [String]macroPlan.MDSID().MinorKey();
-    json      := JSON::Object()
-                 .Add( "pathPR", pathPR )
-                 .Add( "isArchive", isArchive )
-                 .Add( "minorKey", minorKey ).Build().AsString();
+    pathPR     := filePath + prFileName;
+    isArchive  := ifexpr( isPRArchive, "true", "false" );
+    isOverride := ifexpr( isOverwriteFile, "true", "false" );
+    minorKey   := [String]macroPlan.MDSID().MinorKey();
+    json       := JSON::Object()
+                  .Add( "pathPR", pathPR )
+                  .Add( "isArchive", isArchive )
+                  .Add( "isOverride", isOverride )
+                  .Add( "minorKey", minorKey ).Build().AsString();
     
     // 鍐欏叆涓存椂鏂囦欢
     Archive::WriteTempFile( pathPR, prBinaryValue );
     
-    info( json );
-    for ( i := 0; i < 10000; i++ ) {
-      for ( j := 0; j < 20000; j++ ) {
-        info( i + j ); 
-      } 
-    }
     // 璋冪敤鎺ュ彛
     url := "/PR/Import";
     
@@ -37,19 +34,14 @@
     i.URL( url );
     i.PostMethod( true );
     i.MediaType( "application/json" );
+    i.TimeOut( Duration::Minutes( 5 ) );
     
     i.Call( json );
       
     htmlresult := i.Result();
       
     respJSON   := JSON::Parse( htmlresult );
-    code       := respJSON.Get( "code" ).GetNumber();
-    message    := respJSON.Get( "message" ).GetString();
-      
-    if ( code = 200 ) {
     
-    } else {
-      error( message );
-    }
+    return emit( respJSON );
   *]
 }

--
Gitblit v1.9.3