1.OA提交选别类别

南骏 池

2025-11-14 5d36a41354db20c7cd667762ca6df5fd3b8b505f

 service/QC/OaApi.cs

@@ -408,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_321_dt1",//测试：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()