From 2f42eb72901f3f18aee8e51295af3280dca3d839 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期三, 26 十一月 2025 09:37:44 +0800
Subject: [PATCH] 采购入库返回值修正
---
service/QC/OaApi.cs | 50 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 43 insertions(+), 7 deletions(-)
diff --git a/service/QC/OaApi.cs b/service/QC/OaApi.cs
index 98bba9c..632f099 100644
--- a/service/QC/OaApi.cs
+++ b/service/QC/OaApi.cs
@@ -23,9 +23,13 @@
public class OaApiService : Repository<dynamic>
{
private readonly HttpClient _httpClient;
- private const string AppId = "303233EF-AC39-40C1-8364-AC989C6258A5";
- private const string BaseUrl = "http://192.168.1.149:8099/api/ec/dev/auth/";
- private const string WorkflowUrl = "http://192.168.1.149:8099/api/workflow/paService/doCreateRequest";
+ //private const string AppId = "303233EF-AC39-40C1-8364-AC989C6258A5";
+ //private const string BaseUrl = "http://192.168.1.149:8099/api/ec/dev/auth/";
+ //private const string WorkflowUrl = "http://192.168.1.149:8099/api/workflow/paService/doCreateRequest";
+
+ private const string AppId = "AB7F0461-89C3-4EAD-B5B5-B7D540617921";
+ private const string BaseUrl = "http://192.168.1.20:80/api/ec/dev/auth/";
+ private const string WorkflowUrl = "http://192.168.1.20:80/api/workflow/paService/doCreateRequest";
public OaApiService()
{
@@ -54,15 +58,47 @@
// 2. 鑾峰彇璁块棶浠ょ墝
var tokenResult = ApplyTokenAsync(secret, spk);
var token = tokenResult["token"].ToString();
+ string oaUserId = "";
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ {
+ using (var cmd = new SqlCommand("select_oa_userid", conn))
+ {
+
+ try
+ {
+ conn.Open();
+ cmd.CommandType = CommandType.StoredProcedure;
+ cmd.Parameters.Add(new SqlParameter("@guid", SqlDbType.VarChar, 100) { Value = queryObj.qcczdGuid.ToString() });
+
+ using (var reader = cmd.ExecuteReader())
+ {
+ if (reader.Read())
+ {
+ oaUserId = reader["result"]?.ToString();
+ }
+ }
+ }
+ catch (Exception logEx)
+ {
+ Console.WriteLine($"鑾峰彇OA鐢ㄦ埛ID澶辫触: {logEx.Message}");
+ }
+ finally
+ {
+ conn.Close();
+ }
+ }
+ }
// 3. 鍑嗗璇锋眰澶达紙绉婚櫎Content-Type璁剧疆锛�
_httpClient.DefaultRequestHeaders.Clear();
_httpClient.DefaultRequestHeaders.Add("token", token);
_httpClient.DefaultRequestHeaders.Add("appid", AppId);
- _httpClient.DefaultRequestHeaders.Add("userid", RSAEncrypt("1268", spk));
+ _httpClient.DefaultRequestHeaders.Add("userid", RSAEncrypt(oaUserId, spk));
// 4. 鏋勫缓璇锋眰浣�
var requestData = BuildRequestData(queryObj);
+
+ //var A = JObject.FromObject(requestData).ToString();
// 5. 鍙戦�佽姹�
var response = PostForm(WorkflowUrl, requestData);
@@ -160,7 +196,7 @@
{
{"mainData", BuildMainData(queryObj)},
{"requestName", $"IQC寮傚父澶勭疆鍗曟祦绋�-{DateTime.Now:yyyyMMddHHmmss}"},
- {"workflowId", "379"},
+ {"workflowId", "602"},//娴嬭瘯锛�379 姝ｅ紡锛�600->602
//{"otherParams", BuildOtherParams()},
{"detailData", BuildDetailData(queryObj)}
};
@@ -243,7 +279,7 @@
WHERE pGuid = @guid";
var fileData = Db.Ado.SqlQuery<dynamic>(fileSql, new { guid = queryObj.qcczdGuid });
- var files = CreateFileData(fileData);
+ var files = fileData.Count > 0 ? CreateFileData(fileData) : null; // 鏂板
// 娣诲姞鏂囦欢瀛楁
result.Add(new JObject
@@ -419,7 +455,7 @@
{
new JObject
{
- ["tableDBName"] = "formtable_main_33_dt1",
+ ["tableDBName"] = "formtable_main_321_dt1",//娴嬭瘯锛歠ormtable_main_33_dt1
["workflowRequestTableRecords"] = tableRecords
}
};
--
Gitblit v1.9.3