f759bbb6d14034c0adbe08cdf7ad43139f598ac0..347a4c4ec6b65aeb29d8af0ad43d5d7c5ffab5a9
2025-06-04 sjz
生产订单变更修改
347a4c 对比 | 目录
2025-06-04 cnf
异常处置单功能接口增加结果返回时间
803093 对比 | 目录
已修改11个文件
67 ■■■■ 文件已修改
MES.Service/Modes/QcIssueResult/QcIssueResults.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/bin/Release/net8.0/MES.Service.dll 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/bin/Release/net8.0/MES.Service.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/QcIssueResult/QcIssueResultManager.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/WomcaaManager.cs 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/WomcaaWWManager.cs 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/MES.Service.dll 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/MES.Service.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/MESApplication.dll 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/MESApplication.exe 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/MESApplication.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/QcIssueResult/QcIssueResults.cs
@@ -75,4 +75,8 @@
    [SugarColumn(ColumnName = "RBJSREMARK")]
    public string? RBJSREMARK { get; set; }
    //结果返回时间
    [SugarColumn(ColumnName = "RETURN_DATE")]
    public DateTime? RETURN_DATE { get; set; }
}
MES.Service/bin/Release/net8.0/MES.Service.dll
Binary files differ
MES.Service/bin/Release/net8.0/MES.Service.pdb
Binary files differ
MES.Service/service/QcIssueResult/QcIssueResultManager.cs
@@ -373,6 +373,7 @@
            TCSTATU = erpQcIssueResult.TCSTATU,
            MODEL =erpQcIssueResult.MODEL,
            RBJSREMARK =erpQcIssueResult.RBJSREMARK,
            RETURN_DATE=System.DateTime.Now
        };
        return mesQcIssueResults;
@@ -419,6 +420,7 @@
                            TCSTATU = qcIssueResults.TCSTATU,
                            MODEL = qcIssueResults.MODEL,
                            RBJSREMARK = qcIssueResults.RBJSREMARK,
                            RETURN_DATE=System.DateTime.Now
                        })
                        .Where(t => t.ProcessNo == qcIssueResults.ProcessNo) // 显式指定更新条件
                        .ExecuteCommand();
@@ -490,6 +492,7 @@
                            TCSTATU = qcIssueResults.TCSTATU,
                            MODEL = qcIssueResults.MODEL,
                            RBJSREMARK = qcIssueResults.RBJSREMARK,
                            RETURN_DATE = System.DateTime.Now
                        })
                        .Where(t => t.ProcessNo == qcIssueResults.ProcessNo) // 显式指定更新条件
                        .ExecuteCommand();
@@ -579,6 +582,7 @@
                            TCSTATU = qcIssueResults.TCSTATU,
                            MODEL = qcIssueResults.MODEL,
                            RBJSREMARK = qcIssueResults.RBJSREMARK,
                            RETURN_DATE = System.DateTime.Now
                        })
                        .Where(t => t.ProcessNo == qcIssueResults.ProcessNo) // 显式指定更新条件
                        .ExecuteCommand();
MES.Service/service/WomcaaManager.cs
@@ -56,6 +56,7 @@
        }
        var orUpdate = base.Insert(mesWomcaa);
        var baOrUpdate = _womcabManager.InsertRange(mesWomcabs);
        db.Ado.CommitTran();
        if (orUpdate && baOrUpdate) {
            //定义输入参数
            var inputParam1 = new SugarParameter("P_WORK_NO", mesWomcaa.Caa001);
@@ -70,11 +71,11 @@
            if (result == 1)
            {
                //存储过程失败则事务进行回滚
                db.Ado.RollbackTran();
                //db.Ado.RollbackTran();
                throw new Exception(message);
            }
            // 提交事务
            db.Ado.CommitTran();
            //db.Ado.CommitTran();
            return true;
        }
        throw new NotImplementedException("插入或更新失败");
@@ -90,8 +91,29 @@
        }
        var orUpdate = base.Insert(mesWomcaa);
        var baOrUpdate = _womcabManager.InsertRange(mesWomcabs);
        if (orUpdate && baOrUpdate) return true;
        db.Ado.CommitTran();
        if (orUpdate && baOrUpdate)
        {
            //定义输入参数
            var inputParam1 = new SugarParameter("P_WORK_NO", mesWomcaa.Caa001);
            // 定义输出参数
            var outParam1 = new SugarParameter("c_Result", null, true);
            var outParam2 = new SugarParameter("C_MSG", null, true);
            // 使用 SqlSugar 执行存储过程
            Db.Ado.ExecuteCommand("BEGIN PRC_UPDATE_DAA(:P_WORK_NO,:c_Result,:C_MSG); END;", inputParam1, 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;
        }
        throw new NotImplementedException("插入或更新失败");
    }
MES.Service/service/WomcaaWWManager.cs
@@ -56,6 +56,7 @@
        }
        var orUpdate = base.Insert(mesWomcaa);
        var baOrUpdate = _womcabWWManager.InsertRange(mesWomcabs);
        db.Ado.CommitTran();
        if (orUpdate && baOrUpdate)
        {
            //定义输入参数
@@ -71,11 +72,11 @@
            if (result == 1)
            {
                //存储过程失败则事务进行回滚
                db.Ado.RollbackTran();
                //db.Ado.RollbackTran();
                throw new Exception(message);
            }
            // 提交事务
            db.Ado.CommitTran();
            //db.Ado.CommitTran();
            return true;
        }
        throw new NotImplementedException("插入或更新失败");
@@ -90,7 +91,29 @@
        var orUpdate = base.Insert(mesWomcaa);
        var baOrUpdate = _womcabWWManager.InsertRange(mesWomcabss);
        if (orUpdate && baOrUpdate) return true;
        db.Ado.CommitTran();
        if (orUpdate && baOrUpdate)
        {
            //定义输入参数
            var inputParam1 = new SugarParameter("P_WORK_NO", mesWomcaa.Caa001);
            // 定义输出参数
            var outParam1 = new SugarParameter("c_Result", null, true);
            var outParam2 = new SugarParameter("C_MSG", null, true);
            // 使用 SqlSugar 执行存储过程
            Db.Ado.ExecuteCommand("BEGIN PRC_UPDATE_DAA(:P_WORK_NO,:c_Result,:C_MSG); END;", inputParam1, 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;
        }
        throw new NotImplementedException("插入或更新失败");
    }
MESApplication/bin/Release/net8.0/MES.Service.dll
Binary files differ
MESApplication/bin/Release/net8.0/MES.Service.pdb
Binary files differ
MESApplication/bin/Release/net8.0/MESApplication.dll
Binary files differ
MESApplication/bin/Release/net8.0/MESApplication.exe
Binary files differ
MESApplication/bin/Release/net8.0/MESApplication.pdb
Binary files differ