1.MES->OA主表+图片推送成功。

南骏 池

2025-04-29 7a40849a91c3f4cc7bb12aacb7473018e26c6f85

1.MES->OA主表+图片推送成功。

 Controllers/QC/OAJyController.cs

@@ -15,7 +15,7 @@
    OaApiService m = new OaApiService();

    [HttpPost("SumbitIQCToOA")]
    public ResponseResult SumbitIQCToOA([FromBody] dynamic queryObj)
    public ResponseResult SumbitIQCToOA(dynamic queryObj)
    {
        try
        {

 service/QC/OaApi.cs

@@ -7,12 +7,18 @@
using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;
using NewPdaSqlServer.entity.Base;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Org.BouncyCastle.Crypto.Parameters;
using Org.BouncyCastle.Security;
using NewPdaSqlServer.DB;
using SqlSugar;
using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
using NewPdaSqlServer.entity;
using System.Linq;

public class OaApiService : IDisposable
public class OaApiService : Repository<dynamic>
{
    private readonly HttpClient _httpClient;
    private const string AppId = "303233EF-AC39-40C1-8364-AC989C6258A5";
@@ -27,16 +33,14 @@

    public async Task<dynamic> SubmitIQCToOA(dynamic queryObj)
    {

        //if (unity.userName.IsNullOrEmpty()) throw new Exception("用户名不允许为空");
        //if (unity.sectionCode.IsNullOrEmpty()) throw new Exception("库位编号不允许为空");
        //if (unity.barcode.IsNullOrEmpty()) throw new Exception("条码不允许为空");
        //if (unity.billNo.IsNullOrEmpty()) throw new Exception("申请单号不允许为空");
        // 修改参数验证字段名
        //if (queryObj.userId.IsNullOrEmpty()) throw new Exception("用户id不允许为空");
        //if (queryObj.qcczdGuid.IsNullOrEmpty()) throw new Exception("异常处置单id不能为空"); // 原参数名为 qcczdGuid

        try
        {
            // 解析请求参数
            var query = queryObj;
            //var query = queryObj;
            //var query = JObject.FromObject(queryObj);

            // 1. 注册获取凭证
@@ -55,7 +59,7 @@
            _httpClient.DefaultRequestHeaders.Add("userid", RSAEncrypt("1268", spk));

            // 4. 构建请求体
            var requestData = BuildRequestData();
            var requestData = BuildRequestData(queryObj);

            // 5. 发送请求
            var response = await PostFormAsync(WorkflowUrl, requestData);
@@ -70,46 +74,201 @@
        }
    }

    private Dictionary<string, object> BuildRequestData()
    private Dictionary<string, object> BuildRequestData(dynamic queryObj)
    {
        // 从query参数中获取实际业务数据
        return new Dictionary<string, object>
        {
            {"mainData", BuildMainData()},
            {"requestName", $"IQC流程-{DateTime.Now:yyyyMMddHHmmss}"},
            {"mainData", BuildMainData(queryObj)},
            {"requestName", $"IQC异常处置单流程-{DateTime.Now:yyyyMMddHHmmss}"},
            {"workflowId", "379"},
            //{"otherParams", BuildOtherParams()},
            //{"detailData", BuildDetailData(query)}
            //{"detailData", BuildDetailData(queryObj)}
        };
    }
    
    private JArray createbhgpqxmszp(dynamic files)
    {
        var attachments = new JArray();
        
        foreach (var file in files ?? Enumerable.Empty<dynamic>())
        {
            attachments.Add(new JObject
            {
                // 修正字段名称匹配标准格式
                ["filePath"] = file.url?.ToString() ?? string.Empty,
                ["fileName"] = file.FileName?.ToString() ?? "未命名文件"
            });
        }
        
        return attachments;
    }
    private JArray BuildMainData(dynamic queryObj)
    {
        // 使用参数化查询防止SQL注入
        const string mainSql = @"
SELECT TOP 1 
    C.item_no   AS wlbm,
    C.item_name AS jzmcwlmc,
    D.supp_name AS khgys,
    B.bill_no   AS dhdhmes,
    B.remark    AS bhgpqxms
FROM Mes_QC_Exceptional A
LEFT JOIN MES_INV_ITEM_ARN B ON A.aboutGuid = b.guid
LEFT JOIN MES_ITEMS C ON A.itemId = c.item_id
LEFT JOIN MES_SUPPLIER D ON B.supp_id = D.id
WHERE a.guid = @guid";

        var mainData = Db.Ado.SqlQuery<dynamic>(mainSql, new { guid = queryObj.qcczdGuid });

        // 更精确的数据存在性检查
        if (mainData == null || !mainData.Any())
        {
            throw new Exception($"未找到异常处置单[{queryObj.qcczdGuid}]相关数据");
        }
        var firstRecord = mainData.First();

        // 字段映射配置（字段名 -> 数据库列名）
        var fieldMappings = new Dictionary<string, (string Field, string Default)>
        {
            ["wlbm"] = ("wlbm", "N/A"),
            ["khgys"] = ("khgys", "N/A"),
            ["jzmcwlmc"] = ("jzmcwlmc", "N/A"),
            ["dhdhmes"] = ("dhdhmes", "N/A"),
            ["bhgpqxms"] = ("bhgpqxms", "无缺陷描述")
        };

        // 动态生成字段集合
        var result = new JArray();
        foreach (var mapping in fieldMappings)
        {
            var value = GetDynamicValue(firstRecord, mapping.Value.Field, mapping.Value.Default);
            result.Add(new JObject
            {
                ["fieldName"] = mapping.Key,
                ["fieldValue"] = value
            });
        }

        // 处理文件数据
        const string fileSql = @"
SELECT 
    release_no+'-图片'+CAST(row_number() over (order by release_no) AS VARCHAR(20)) AS FileName, 
    'http://192.168.1.145:81/upload/'+url_Path as url
FROM [Mes_QC_Exceptional_Detail] A
LEFT JOIN MES_QA_ITEMS_DETECT_01 B ON A.releaseNo = B.release_no
LEFT JOIN MES_FILE C ON C.parent_Guid = B.guid
WHERE pGuid = @guid";

        var fileData = Db.Ado.SqlQuery<dynamic>(fileSql, new { guid = queryObj.qcczdGuid });
        var files = CreateFileData(fileData);

        // 添加文件字段
        result.Add(new JObject
        {
            ["fieldName"] = "bhgpqxmszp",
            ["fieldValue"] = files
        });

        return result;
    }

    private JArray BuildMainData()
    // 辅助方法：安全获取dynamic对象值
    private static string GetDynamicValue(dynamic record, string field, string defaultValue)
    {
        // 示例字段，根据实际业务需求调整
        return new JArray
        try
        {
            new JObject
            {
                ["fieldName"] = "wlbm",
                ["fieldValue"] = "1.01.01.001"
            },
            new JObject
            {
                ["fieldName"] = "khgys",
                ["fieldValue"] = "陈雪年"
            },
            new JObject
            {
                ["fieldName"] = "bhgpqxms",
                ["fieldValue"] = "外观不合格，尺寸不合格，颜色不符合"
            },
            new JObject
            {
                ["fieldName"] = "dhdhmes",
                ["fieldValue"] = "MES001"
            }
        };
            return ((IDictionary<string, object>)record)[field]?.ToString() ?? defaultValue;
        }
        catch
        {
            return defaultValue;
        }
    }

    // 文件数据生成方法（示例保持原逻辑）
    private JArray CreateFileData(IEnumerable<dynamic> fileData)
    {
        // 假设这是原createbhgpqxmszp方法的实现
        return new JArray(fileData.Select(f => new JObject
        {
            ["fileName"] = f.FileName,
            ["filePath"] = f.url
        }));
    }

    //    // 修改BuildMainData中的字段赋值
    //    private JArray BuildMainData(dynamic queryObj)
    //    {
    //        var sql = string.Format(@"select TOP 1 C.item_no   AS wlbm,
    //       C.item_name AS jzmcwlmc,
    //       D.supp_name AS khgys,
    //       B.bill_no   AS dhdhmes,
    //       B.remark    AS bhgpqxms
    //from Mes_QC_Exceptional A
    //         LEFT JOIN MES_INV_ITEM_ARN B
    //                   ON A.aboutGuid = b.guid
    //         LEFT JOIN MES_ITEMS C ON A.itemId = c.item_id
    //         LEFT JOIN MES_SUPPLIER D ON B.supp_id = D.id
    //WHERE a.guid = '{0}'", queryObj.qcczdGuid);

    //        var tBiqcczd = Db.Ado.SqlQuery<dynamic>(sql);

    //        // 修正数据获取逻辑
    //        if (tBiqcczd == null)
    //        {
    //            throw new Exception($"未找到异常处置单[{queryObj.qcczdGuid}]相关数据");
    //        }
    //        var data = tBiqcczd; // 转换为字典访问

    //        var wlbm = data[0]["wlbm"];

    //        var sql1 = string.Format(@"select release_no+'-图片'+CAST(row_number() over (order by release_no) AS VARCHAR(20)) AS FileName, 'http://192.168.1.145:81/upload/'+url_Path as url
    //from [Mes_QC_Exceptional_Detail] A
    //         LEFT JOIN MES_QA_ITEMS_DETECT_01 B ON A.releaseNo = B.release_no
    //         LEFT JOIN MES_FILE C ON C.parent_Guid = B.guid
    //WHERE pGuid = '{0}'", queryObj.qcczdGuid);

    //        var tBdataFile = Db.Ado.SqlQuery<dynamic>(sql1);

    //        var data_file = createbhgpqxmszp(tBdataFile);


    //        return new JArray
    //        {
    //            // 修改所有字段访问方式（以wlbm为例）
    //            new JObject
    //            {
    //                ["fieldName"] = "wlbm",
    //                ["fieldValue"] = data?["wlbm"]?.ToString() ?? "N/A"  // 使用字典方式访问
    //            },
    //            new JObject
    //            {
    //                ["fieldName"] = "khgys",
    //                ["fieldValue"] = data?["khgys"]?.ToString() ?? "N/A"  // 统一字典访问
    //            },
    //            new JObject
    //            {
    //                ["fieldName"] = "jzmcwlmc",
    //                ["fieldValue"] = data?["jzmcwlmc"]?.ToString() ?? "N/A"  // 统一字典访问
    //            },
    //            new JObject
    //            {
    //                ["fieldName"] = "dhdhmes",
    //                ["fieldValue"] = data?["dhdhmes"]?.ToString() ?? "N/A"  // 统一字典访问
    //            },
    //            new JObject
    //            {
    //                ["fieldName"] = "bhgpqxms",
    //                ["fieldValue"] = data?["bhgpqxms"]?.ToString() ?? "无缺陷描述"  // 统一字典访问
    //            },
    //            new JObject
    //            {
    //                ["fieldName"] = "bhgpqxmszp",
    //                ["fieldValue"] = data_file  // 使用生成的附件数组
    //            },
    //        };
    //    }

    private JArray BuildAttachments(JToken attachments)
    {
@@ -136,7 +295,7 @@
        {
            new JObject
            {
                ["tableDBName"] = "formtable_main_24_dt1",
                ["tableDBName"] = "formtable_main_33_dt1",
                ["workflowRequestTableRecords"] = new JArray
                {
                    new JObject
@@ -144,9 +303,12 @@
                        ["recordOrder"] = "0",
                        ["workflowRequestTableFields"] = new JArray
                        {
                            new JObject { ["fieldName"] = "xm", ["fieldValue"] = query["inspector"] ?? "默认检验员" },
                            new JObject { ["fieldName"] = "bh", ["fieldValue"] = query["batchNo"] ?? "默认批次号" },
                            new JObject { ["fieldName"] = "dz", ["fieldValue"] = query["location"] ?? "默认地点" }
                            new JObject { ["fieldName"] = "jydh", ["fieldValue"] = query[""] ?? "检验单号" },
                            new JObject { ["fieldName"] = "jydrq", ["fieldValue"] = query[""] ?? "检验单日期" },
                            new JObject { ["fieldName"] = "sjsl", ["fieldValue"] = query[""] ?? "涉及数量" },
                            new JObject { ["fieldName"] = "cys", ["fieldValue"] = query[""] ?? "抽样数" },
                            new JObject { ["fieldName"] = "bls", ["fieldValue"] = query[""] ?? "不良数" },
                            new JObject { ["fieldName"] = "bll", ["fieldValue"] = query[""] ?? "不良率" }
                        }
                    }
                }