111

cnf

2025-05-08 3155ee2aeffa89f229a4f9d31f8fd34a3809f358

 StandardInterface/MES.Service/service/QcIssueResult/QcIssueResultManager.cs

@@ -305,12 +305,12 @@
            };
            AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues12 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues
            {
                Name = "DDPhotoField_QD15KYR764G0\r\n",
                Name = "DDPhotoField_QD15KYR764G0",
                Value = "测试不良图片",
            };
            AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues13 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues
            {
                Name = "DDAttachment_GLZLFSIWK9S0\r\n",
                Name = "DDAttachment_GLZLFSIWK9S0",
                Value = "附件",
            };
            AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues14 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues
@@ -354,7 +354,7 @@
                FormComponentValues = new List<AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues>
                {
                     formComponentValues1,formComponentValues2,formComponentValues3, formComponentValues4, formComponentValues5, formComponentValues6, formComponentValues7, formComponentValues8,
                     formComponentValues9,formComponentValues10, formComponentValues11
                     formComponentValues9, formComponentValues11
                },
                TargetSelectActioners = new List<AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestTargetSelectActioners>
                {
@@ -419,7 +419,7 @@
    {
        var QcIssueResults = new QcIssueResults
        {
            ProcessNo = ProcessNo,
            INSTANCEID = ProcessNo,
            ReleaseNo = ReleaseNo,
            QcStatu = ""
        };
@@ -432,28 +432,44 @@
    */
    public dynamic Save(ErpQcIssueResult erpQcIssueResult)
    {
        var json = JsonConvert.SerializeObject(erpQcIssueResult);
        //var json = JsonConvert.SerializeObject(erpQcIssueResult);

        //var saveSuccess = UseTransaction(db =>
        ////var saveSuccess = UseTransaction(db =>
        ////{
        ////    var data = GetMesQcIssueResults(erpQcIssueResult);
        ////    return SaveOrUpdateData(db, data);
        ////});

        //return new
        //{
        //    var data = GetMesQcIssueResults(erpQcIssueResult);
        //    return SaveOrUpdateData(db, data);
        //});
        //    SerializedPayload = json,
        //    ServerTime = DateTime.UtcNow.ToString("O")
        //};

        return new
        var mesQcIssueResults = GetMesQcIssueResults(erpQcIssueResult);

        return UseTransaction(db =>
        {
            SerializedPayload = json,
            ServerTime = DateTime.UtcNow.ToString("O")
        };
            return SaveOrUpdateData(db, mesQcIssueResults) ? 1 : 0;
        }) > 0;

    }

    public QcIssueResults GetMesQcIssueResults(ErpQcIssueResult erpQcIssueResult)
    {
        var mesQcIssueResults = new QcIssueResults
        {
            ProcessNo = erpQcIssueResult.ProcessNo,
            INSTANCEID = erpQcIssueResult.ProcessNo,
            FReview = erpQcIssueResult.FReview,
            QcStatu = erpQcIssueResult.QcStatus
            APPLICATIONNUM = erpQcIssueResult.ApplicationQuantity.ToString(),
            BADCAUSES = erpQcIssueResult.BadCauses,
            BELONGINGWORKSHOP = erpQcIssueResult.AffiliatedWorkshop,
            REVIEWSTATUS = erpQcIssueResult.FReview,
            QcStatu = erpQcIssueResult.QcStatus,
            ITEMNAME =erpQcIssueResult.ItemName,
            ITEMNO =erpQcIssueResult.ItemNo,
            SUPPLIERNAME = erpQcIssueResult.SupplierName,
            REMARK=erpQcIssueResult.Remark
        };

        return mesQcIssueResults;
@@ -467,7 +483,7 @@

        // 查询 QcIssueResults 表中是否存在匹配的记录
        var mapping = db.Queryable<QcIssueResults>()
            .Where(t => t.ProcessNo == qcIssueResults.ProcessNo)
            .Where(t => t.INSTANCEID == qcIssueResults.INSTANCEID)
            .Select(t => new QcIssueResults
            {
                ReleaseNo = t.ReleaseNo,
@@ -485,9 +501,20 @@
                    .SetColumns(t => new QcIssueResults
                    {
                        ReleaseNo = ReleaseNo,
                        FReview = qcIssueResults.FReview
                        INSTANCEID = qcIssueResults.INSTANCEID,
                        FReview = qcIssueResults.FReview,
                        APPLICATIONNUM = qcIssueResults.APPLICATIONNUM,
                        BADCAUSES = qcIssueResults.BADCAUSES,
                        BELONGINGWORKSHOP = qcIssueResults.BELONGINGWORKSHOP,
                        REVIEWSTATUS = qcIssueResults.REVIEWSTATUS,
                        QcStatu = qcIssueResults.QcStatu,
                        ITEMNAME = qcIssueResults.ITEMNAME,
                        ITEMNO = qcIssueResults.ITEMNO,
                        SUPPLIERNAME = qcIssueResults.SUPPLIERNAME,
                        REMARK = qcIssueResults.REMARK

                    })
                    .Where(t => t.ProcessNo == qcIssueResults.ProcessNo) // 显式指定更新条件
                    .Where(t => t.INSTANCEID == qcIssueResults.INSTANCEID) // 显式指定更新条件
                    .ExecuteCommand();

                // 查询 UpdateMesQaItems 表中是否存在匹配的记录
@@ -499,41 +526,28 @@

                if (existingRecord != null)
                {
                    string result = null;
                    bool returnValue = false;
                    try
                    {
                        string connectionString = "User Id=yc_dev;Password=ycdev;Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.0.100)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=ORCL)))";
                        using (OracleConnection connection = new OracleConnection(connectionString))
                        //定义输入参数
                        var inputParam1 = new SugarParameter("pi_no", existingRecord.ReleaseNo);
                        var inputParam2 = new SugarParameter("pi_user", "PL017");
                        // 定义输出参数
                        var outParam1 = new SugarParameter("po_result", null, true);
                        var outParam2 = new SugarParameter("po_msg", null, true);
                        // 使用 SqlSugar 执行存储过程
                        Db.Ado.ExecuteCommand("BEGIN PRC_MES_IQC_CG_REVOCK(:pi_no,:pi_user,:po_result,:po_msg ); END;", inputParam1, inputParam2, outParam1, outParam2);
                        // 获取输出参数的值
                        int result = int.Parse((string)outParam1.Value);
                        string message = outParam2.Value == DBNull.Value ? string.Empty : (string)outParam2.Value;
                        if (result == 1)
                        {
                            using (OracleCommand command = new OracleCommand("PRC_MES_IQC_CG_REVOCK", connection))
                            {
                                command.CommandType = CommandType.StoredProcedure;
                                // 添加输入参数
                                command.Parameters.Add("pi_no", OracleDbType.Varchar2).Value = existingRecord.ReleaseNo; // 替换为实际值
                                command.Parameters.Add("pi_user", OracleDbType.Varchar2).Value = "PL017"; // 替换为实际值
                                                                                                                       // 添加输出参数
                                OracleParameter poResult = new OracleParameter("po_result", OracleDbType.Int32, ParameterDirection.Output);
                                OracleParameter poMsg = new OracleParameter("po_msg", OracleDbType.Varchar2, 4000, ParameterDirection.Output);
                                command.Parameters.Add(poResult);
                                command.Parameters.Add(poMsg);
                                // 打开连接并执行命令
                                connection.Open();
                                command.ExecuteNonQuery();
                                // 处理返回值
                                if (poResult.Value != null && poResult.Value.ToString() == "0")
                                {
                                    returnValue = true;
                                }
                                else
                                {
                                    // 输出错误信息
                                    string errorMsg = poMsg.Value != null ? poMsg.Value.ToString() : "Unknown error occurred";
                                    Console.WriteLine("Error: " + errorMsg);
                                }
                            }
                            //存储过程失败则事务进行回滚
                            db.Ado.RollbackTran();
                            throw new Exception(message);
                        }
                        return returnValue;
                        // 提交事务
                        db.Ado.CommitTran();
                        return true;
                    }
                    catch (Exception ex)
                    {
@@ -554,9 +568,20 @@
                    .SetColumns(t => new QcIssueResults
                    {
                        ReleaseNo = ReleaseNo,
                        FReview = qcIssueResults.FReview
                        INSTANCEID = qcIssueResults.INSTANCEID,
                        FReview = qcIssueResults.FReview,
                        APPLICATIONNUM = qcIssueResults.APPLICATIONNUM,
                        BADCAUSES = qcIssueResults.BADCAUSES,
                        BELONGINGWORKSHOP = qcIssueResults.BELONGINGWORKSHOP,
                        REVIEWSTATUS = qcIssueResults.REVIEWSTATUS,
                        QcStatu = qcIssueResults.QcStatu,
                        ITEMNAME = qcIssueResults.ITEMNAME,
                        ITEMNO = qcIssueResults.ITEMNO,
                        SUPPLIERNAME = qcIssueResults.SUPPLIERNAME,
                        REMARK = qcIssueResults.REMARK

                    })
                    .Where(t => t.ProcessNo == qcIssueResults.ProcessNo) // 显式指定更新条件
                    .Where(t => t.INSTANCEID == qcIssueResults.INSTANCEID) // 显式指定更新条件
                    .ExecuteCommand();

                // 查询 UpdateMesQaItems 表中是否存在匹配的记录
@@ -569,7 +594,7 @@
                if (existingRecord != null)
                {
                    // 更新 UpdateMesQaItems 表中的字段
                    existingRecord.FngHandle = qcIssueResults.FReview;
                    existingRecord.FngHandle = qcIssueResults.REVIEWSTATUS;
                    if (existingRecord.FngHandle == "退货")
                    {
                        existingRecord.FMRMODE = "退料补料";
@@ -582,6 +607,44 @@
                    // 执行更新操作
                    updateResult = db.Updateable(existingRecord).ExecuteCommand();

                    if (updateResult > 0)
                    {
                        try
                        {

                            //定义输入参数
                            var inputParam1 = new SugarParameter("PI_BILLNO", ReleaseNo);
                            var inputParam2 = new SugarParameter("PI_USER", "PL017");
                            var inputParam3 = new SugarParameter("PI_HANDLE", existingRecord.FngHandle);
                            var inputParam4 = new SugarParameter("PI_TLFS", existingRecord.FMRMODE);
                            var inputParam5 = new SugarParameter("PI_REMARK", "");

                            // 定义输出参数
                            var outParam1 = new SugarParameter("PO_RESULT", null, true);
                            var outParam2 = new SugarParameter("PO_MSG", null, true);
                            // 使用 SqlSugar 执行存储过程
                            Db.Ado.ExecuteCommand("BEGIN PRC_MES_IQC_CG_SUBMIT(:PI_BILLNO,:PI_BILLNO,:PI_HANDLE,:PI_TLFS,:PI_REMARK,:PO_RESULT,:PO_MSG); END;", inputParam1, inputParam2, inputParam3, inputParam4, inputParam5, outParam1, outParam2);
                            // 获取输出参数的值
                            int result = int.Parse((string)outParam1.Value);
                            string message = outParam2.Value == DBNull.Value ? string.Empty : (string)outParam2.Value;
                            if (result == 1)
                            {
                                //存储过程失败则事务进行回滚
                                db.Ado.RollbackTran();
                                throw new Exception(message);
                            }
                            // 提交事务
                            db.Ado.CommitTran();
                            return true;

                        }
                        catch (Exception ex)
                        {
                            Console.WriteLine("Exception: " + ex.Message);
                            return false;
                        }
                    }

                    return updateResult > 0; // 如果更新成功，返回 true
                }
                else