1.PDA条码重打

南骏 池

4 天以前 38748f8fbe700cc65721fc2d9b74306ca5590e01

 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)}
        };
@@ -199,11 +235,15 @@
        // 字段映射配置（字段名 -> 数据库列名）
        var fieldMappings = new Dictionary<string, (string Field, string Default)>
        {
            ["sqr"] = ("sqr", "0"),       // 默认值改为数字
            ["sqrq"] = ("sqrq", ""),       // 空字符串用于日期格式化
            ["szbm"] = ("szbm", "0"),      // 默认值改为数字
            ["szdw"] = ("szdw", "0"),      // 默认值改为数字
            ["ycczdh"] = ("ycczdh", "N/A"),
            ["wlbm"] = ("wlbm", "N/A"),
            ["lh"] = ("lh", "N/A"),
            ["khgys"] = ("khgys", "N/A"),
            ["jzmcwlmc"] = ("jzmcwlmc", "N/A"),
            ["dhdhmes"] = ("dhdhmes", "N/A"),
            ["dhdhtxt"] = ("dhdhtxt", "N/A"),
            ["bhgpqxms"] = ("bhgpqxms", "无缺陷描述")
        };

@@ -211,7 +251,16 @@
        var result = new JArray();
        foreach (var mapping in fieldMappings)
        {
            var value = GetDynamicValue(firstRecord, mapping.Value.Field, mapping.Value.Default);
            var value = mapping.Key switch
            {
                "sqr" or "szbm" or "szdw" => 
                    int.TryParse(GetDynamicValue(firstRecord, mapping.Value.Field, mapping.Value.Default), out int num) 
                        ? num : 0,
                "sqrq" => DateTime.TryParse(GetDynamicValue(firstRecord, mapping.Value.Field, ""), out DateTime date) 
                    ? date.ToString("yyyy-MM-dd") 
                    : DateTime.Now.ToString("yyyy-MM-dd"),
                _ => GetDynamicValue(firstRecord, mapping.Value.Field, mapping.Value.Default)
            };
            result.Add(new JObject
            {
                ["fieldName"] = mapping.Key,
@@ -230,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
@@ -406,7 +455,7 @@
        {
            new JObject
            {
                ["tableDBName"] = "formtable_main_33_dt1",
                ["tableDBName"] = "formtable_main_321_dt1",//测试：formtable_main_33_dt1
                ["workflowRequestTableRecords"] = tableRecords
            }
        };