Merge branch 'master' of http://43.142.96.171:8080/r/~yhj/HM_JK

hao

2025-08-23 c5a3cfd2cd3e140892fc93cc52902b5b204a50d5

 StandardInterface/MES.Service/service/WomcaaManager.cs

@@ -64,13 +64,65 @@
            .IgnoreColumnsNull()
            .ExecuteCommand() > 0;

        if (orUpdate && baOrUpdate) return true;
        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_DAA2(:P_WORK_NO,:c_Result,:C_MSG); END;",
                inputParam1, outParam1, outParam2);
            // 获取输出参数的值
            var result = int.Parse((string)outParam1.Value);
            var 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("插入或更新失败");
    }

    private bool UpdateData(SqlSugarScope db, Womcaa mesWomcaa,
        List<Womcab> mesWomcabs)
    {

        //定义输入参数
        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_DAA2(:P_WORK_NO,:c_Result,:C_MSG); END;",
            inputParam1, outParam1, outParam2);
        // 获取输出参数的值
        var result = int.Parse((string)outParam1.Value);
        var message = outParam2.Value == DBNull.Value
            ? string.Empty
            : (string)outParam2.Value;
        if (result == 1)
        {
            //存储过程失败则事务进行回滚
            db.Ado.RollbackTran();
            throw new Exception(message);
        }

        // 提交事务
        db.Ado.CommitTran();


        var decimals = mesWomcabs.Select(s => s.Id).ToArray();

        var update = true;
@@ -89,6 +141,7 @@

        if (update && insertOrUpdate)
        {
         
            return true;
        }
        throw new NotImplementedException("更新失败");