1.标准版更新（20251125）

南骏 池

2025-11-25 770f02888443c1be46549f164abfd3be78a3dbd3

 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
@@ -372,57 +408,82 @@

    private JArray BuildDetailData(dynamic queryObj)
    {
        // 使用参数化查询获取明细数据
        const string mainSql = @"select ROW_NUMBER() over (ORDER BY Jy_Date) AS xh,releaseNo AS jydh, Jy_Date AS jydrq, batchQty as sjsl,
               chouQty AS cys, badQty AS bls, badProb AS bll,C.USER_NAME AS jyr
            from Mes_QC_Exceptional_Detail A
            LEFT JOIN MES_QA_ITEMS_DETECT_01 B ON A.releaseNo = B.release_no
            LEFT JOIN SYS_USER C ON C.ACCOUNT = B.fcheck_by
            WHERE pGuid = @guid";
    
        var details = Db.Ado.SqlQuery<dynamic>(mainSql, new { guid = queryObj.qcczdGuid });
    
        var tableRecords = new JArray();
        
        // 遍历每条明细数据
        foreach (var record in details ?? Enumerable.Empty<dynamic>())
        // 将直接SQL查询替换为存储过程调用
        var parameters = new[]
        {
            // 修正字段类型转换（数值类型去除字符串包裹）
            var fields = new JArray
            {
                //new JObject { ["fieldName"] = "xh", ["fieldValue"] = record.xh?.ToString() ?? "" },
                new JObject { ["fieldName"] = "jydh", ["fieldValue"] = record.jydh?.ToString() ?? "" },
                 new JObject { ["fieldName"] = "jyr", ["fieldValue"] = record.jyr?.ToString() ?? "" },
                new JObject { 
                    ["fieldName"] = "jydrq", 
                    // 格式化为"yyyy-MM-dd"字符串
                    ["fieldValue"] = (record.jydrq != null 
                        ? Convert.ToDateTime(record.jydrq).ToString("yyyy-MM-dd ") 
                        : DateTime.Now.ToString("yyyy-MM-dd"))
                },
                // 数值字段保持数字类型而非字符串
                // 修正数值类型转换方式
                new JObject { ["fieldName"] = "sjsl", ["fieldValue"] = (float)(record.sjsl ?? 0m) },
                new JObject { ["fieldName"] = "cys", ["fieldValue"] = (float)(record.cys ?? 0) },
                new JObject { ["fieldName"] = "bls", ["fieldValue"] = (float)(record.bls ?? 0) },
                new JObject { ["fieldName"] = "bll", ["fieldValue"] = 1, }
            };
    
            tableRecords.Add(new JObject
            {
                ["recordOrder"] = 0,  // 实际业务中可能需要根据行号设置
                ["workflowRequestTableFields"] = fields
            });
        }
    
        return new JArray
        {
            new JObject
            {
                ["tableDBName"] = "formtable_main_33_dt1",
                ["workflowRequestTableRecords"] = tableRecords
            }
            new SugarParameter("@pi_guid", queryObj.qcczdGuid),
            new SugarParameter("@inP1", null),
            new SugarParameter("@inP2", null),
            new SugarParameter("@inP3", null),
            new SugarParameter("@inP4", null)
        };

        try
        {
            var details = Db.Ado.SqlQuery<dynamic>(
                "EXEC select_oa_BuildDetailData @pi_guid,@inP1,@inP2,@inP3,@inP4", 
                parameters);


            var tableRecords = new JArray();
        
            // 遍历每条明细数据
            foreach (var record in details ?? Enumerable.Empty<dynamic>())
            {
                // 修正字段类型转换（数值类型去除字符串包裹）
                var fields = new JArray
                {
                    //new JObject { ["fieldName"] = "xh", ["fieldValue"] = record.xh?.ToString() ?? "" },
                    new JObject { ["fieldName"] = "jydh", ["fieldValue"] = record.jydh?.ToString() ?? "" },
                    new JObject { ["fieldName"] = "jyr", ["fieldValue"] = record.jyr?.ToString() ?? "" },
                    new JObject { ["fieldName"] = "xblb", ["fieldValue"] = record.xblb?.ToString() ?? "" },
                    new JObject { 
                        ["fieldName"] = "jydrq", 
                        // 格式化为"yyyy-MM-dd"字符串
                        ["fieldValue"] = (record.jydrq != null 
                            ? Convert.ToDateTime(record.jydrq).ToString("yyyy-MM-dd ") 
                            : DateTime.Now.ToString("yyyy-MM-dd"))
                    },
                    // 数值字段保持数字类型而非字符串
                    // 修正数值类型转换方式
                    new JObject { ["fieldName"] = "sjsl", ["fieldValue"] = (float)(record.sjsl ?? 0m) },
                    new JObject { ["fieldName"] = "cys", ["fieldValue"] = (float)(record.cys ?? 0) },
                    new JObject { ["fieldName"] = "bls", ["fieldValue"] = (float)(record.bls ?? 0) },
                    new JObject { ["fieldName"] = "bll", ["fieldValue"] = 1, }
                };
        
                tableRecords.Add(new JObject
                {
                    ["recordOrder"] = 0,  // 实际业务中可能需要根据行号设置
                    ["workflowRequestTableFields"] = fields
                });
            }
        
            return new JArray
            {
                new JObject
                {
                    ["tableDBName"] = "formtable_main_321_dt1",//测试：formtable_main_33_dt1
                    ["workflowRequestTableRecords"] = tableRecords
                }
            };
        }
        catch (Exception ex)
        {
            throw new Exception($"查询异常明细失败: {ex.Message}");
        }

        // // 使用参数化查询获取明细数据
        // const string mainSql = @"select ROW_NUMBER() over (ORDER BY Jy_Date) AS xh,releaseNo AS jydh, Jy_Date AS jydrq, batchQty as sjsl,
        //        chouQty AS cys, badQty AS bls, badProb AS bll,C.USER_NAME AS jyr
        //     from Mes_QC_Exceptional_Detail A
        //     LEFT JOIN MES_QA_ITEMS_DETECT_01 B ON A.releaseNo = B.release_no
        //     LEFT JOIN SYS_USER C ON C.ACCOUNT = B.fcheck_by
        //     WHERE pGuid = @guid";
    
        // var details = Db.Ado.SqlQuery<dynamic>(mainSql, new { guid = queryObj.qcczdGuid });
    
        
    }

    private JObject BuildOtherParams()