OA联调

YLErpDAL/Modules/TradeModule/TradeOAService.cs

@@ -1,3 +1,4 @@
+using BaseOUDAL;
 using Qdp.Foundation.Utilities;
 using YLErp.DBModels;
 using YLErp.DBModels.Consts;
@@ -110,7 +111,11 @@ namespace YLErp.Modules.TradeModule
                 // 获取OA配置
                 var oaConfigSection = AppManager.GetConfiguration().GetSection("oa_confg");
                 var baseUrl = oaConfigSection["BaseUrl"];
-                var loginName = UserInfo.OaAccount;
+                var loginName = string.Empty;
+                using (var adminDb = new ErpBaseContext()) {
+                    var userInfo=adminDb.SystemUsers.FirstOrDefault(x=>x.Id==UserInfo.UserId);
+                    loginName= userInfo?.OaAccount;
+                }
                 var systemKey = oaConfigSection["SystemKey"];
                 var objectClass = oaConfigSection["ObjectClass"];
                 var urgent = int.Parse(oaConfigSection["Urgent"] ?? "1");
@@ -239,7 +244,7 @@ namespace YLErp.Modules.TradeModule
                 logger.Info($"OA接口参数:{JsonHelper.Serialize(oaRequest)}");
                 // 调用OA接口
                 var httpClient = new HttpClientWrap(baseUrl);
-                var response = httpClient.PostJson("/fileDraft", oaRequest, null);
+                var response = httpClient.PostJson("/ZSZQ/fileDraft", oaRequest, null);// fileDraft
                 logger.Info($"OA接口返回:{response}");
                 // 解析响应
                 var responseObj = JsonHelper.Deserialize<OAResponse>(response);

YLErpWeb/appsettings.local.json

@@ -80,6 +80,6 @@
         "SystemKey": "M001", //OA系统key
         "ObjectClass": "ZSZQ_ZDNX", //OA文件类别
         "Urgent": 1, //紧急程度，1一般 2紧急 3加急
-        "Issend": 1 //流程是否自动发送，0不发送，1自动发送下一步
+        "Issend": 0 //流程是否自动发送，0不发送，1自动发送下一步
     }
 }

YLErpWeb/appsettings.uat.json

@@ -73,5 +73,12 @@
     "Schema": "YILIAN"
   },
   "SendKafakaCron": "10 0 * * *",
-  "MaxThreadPercent": 0.6 //占系统资源最多60%的线程数量
+  "MaxThreadPercent": 0.6, //占系统资源最多60%的线程数量
+  "oa_confg": {
+    "BaseUrl": "http://10.52.130.11",
+    "SystemKey": "fF2U9HXs7dm6Hjz5X", //OA系统key
+    "ObjectClass": "ZSZQ_CWYSPJYQRSDZWF", //OA文件类别
+    "Urgent": 1, //紧急程度，1一般 2紧急 3加急
+    "Issend": 0 //流程是否自动发送，0不发送，1自动发送下一步
+  }
 }