同步为祈禧的代码

啊鑫

2 天以前 eb65436c2312821e3e513ab9ada41dd486d6d7cf

 WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs

@@ -213,14 +213,11 @@
    public ReturnDto<ExpandoObject> EditModel([FromBody] dynamic model)
    {
        Guid? guid = model.Guid; //到货单主键
        //string shDh = model.PaperBillNo; //送货单号
        string shDh = model.bcsl;
        string shDh = model.PaperBillNo; //送货单号
        string bz = model.Remark; //备注
        string gysId = model.SuppId; //供应商
        string orgId = model.OrgId; //收料组织

       // string depot = model.Depot;//仓库

        int isSrm = model.IsSrm;
        var _sb = new StringBuilder();
        var _split = "|";
        foreach (var m in model.list)
@@ -256,12 +253,15 @@
                        new("@outSum", SqlDbType.Int),
                        new("@outGuid", SqlDbType.UniqueIdentifier),
                        new("@outNo", SqlDbType.NVarChar, 300),
                        new("@inOrderGuid",  UtilityHelper.CheckGuid(guid)  ? guid  : DBNull.Value),
                        new("@inOrderGuid",
                            UtilityHelper.CheckGuid(guid)
                                ? guid
                                : DBNull.Value),
                        new("@inShdh", shDh),
                        new("@inBz", bz),
                        new("@inGysId", gysId),
                        new("@OrgId", orgId),
                      // new("@inDepot",depot),
                        new("@isSrm", isSrm),
                        new("@inEdtUserGuid", _userGuid),
                        new("@inLineList", _sb.ToString())
                    };
@@ -311,7 +311,7 @@
        foreach (string _val in guidList) sbMx.Append(_val);
        using (var conn = new SqlConnection(DbHelperSQL.strConn))
        {
            using (var cmd = new SqlCommand("[prc_cgdhd_tui]", conn))
            using (var cmd = new SqlCommand("[prc_cgyt_dj_add]", conn))
            {
                try
                {
@@ -337,7 +337,7 @@
                catch (Exception ex)
                {
                    LogHelper.Debug(ToString(),
                        "prc_cgdhd_tui error：" + ex.Message);
                        "prc_cgyt_dj_add error：" + ex.Message);
                    _outMsg = ex.Message;
                    _outSum = -1;
                }
@@ -379,7 +379,6 @@
                        new("@inEdtUserGuid", _userGuid),
                        new("@inOrderGuid", _guid),
                        new("@inFieldValue", 1),
                        new("@inFieldName", ""),
                        new("@in1", ""),
                        new("@in2", "")
                    };
@@ -388,11 +387,8 @@
                    foreach (var parameter in parameters)
                        cmd.Parameters.Add(parameter);
                    cmd.ExecuteNonQuery();
                   
                 
                    m.outMsg = parameters[0].Value.ToString();
                    m.outSum = int.Parse(parameters[1].Value.ToString());

                }
                catch (Exception ex)
                {
@@ -466,64 +462,7 @@

        return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "操作成功！");
    }
    /// <summary>
    ///     合并提交检验 2025-08-06 kyy
    /// </summary>
    /// <param name="mode"></param>
    /// <returns></returns>
    [RequestMethod(RequestMethods.POST)]
    public ReturnDto<ExpandoObject> EditModelSubmitHb([FromBody] dynamic mode)
    {
        string _guid = mode.guid;
        dynamic m = new ExpandoObject();
        m.outSum = -1;
        m.outMsg = "";
        using (var conn = new SqlConnection(DbHelperSQL.strConn))
        {
            using (var cmd = new SqlCommand("prc_cgdhd_submit_hb", conn))
            {
                try
                {
                    conn.Open();
                    cmd.CommandType = CommandType.StoredProcedure;
                    SqlParameter[] parameters =
                    {
                        new("@outMsg", SqlDbType.NVarChar, 2500),
                        new("@outSum", SqlDbType.Int),
                        new("@inEdtUserGuid", _userGuid),
                        new("@inOrderGuid", _guid),
                        new("@inFieldValue", 1),
                        new("@inFieldName", ""),
                        new("@in1", ""),
                        new("@in2", "")
                    };
                    parameters[0].Direction = ParameterDirection.Output;
                    parameters[1].Direction = ParameterDirection.Output;
                    foreach (var parameter in parameters)
                        cmd.Parameters.Add(parameter);
                    cmd.ExecuteNonQuery();


                    m.outMsg = parameters[0].Value.ToString();
                    m.outSum = int.Parse(parameters[1].Value.ToString());

                }
                catch (Exception ex)
                {
                    LogHelper.Debug(ToString(),
                        "prc_cgdhd_submit_hb error：" + ex.Message);
                    m.outMsg = ex.Message;
                    return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default,
                        ex.Message);
                }
                finally
                {
                    conn.Close();
                }
            }
        }
        return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "操作成功！");
    }

    /// <summary>
    ///     读取列表，支持分页
@@ -558,7 +497,7 @@
                        new("@inQueryWhere", keyWhere),
                        new("@inBusType", inBusType),
                        new("@inSupId", inSupId),
                        new("@inP1", inReceiveOrgId),
                        new("@inP1", inReceiveOrgId),//组织
                        new("@inP2", "")
                    };
                    foreach (var parameter in parameters)
@@ -666,8 +605,147 @@
            "读取成功！");
    }


    #endregion


   
    #region srm

    /// <summary>
    ///     读取srm
    /// </summary>
    /// <param name="model"></param>
    /// <returns></returns>
    [RequestMethod(RequestMethods.POST)]
    public ReturnDto<PageList<dynamic>> SelectSrm([FromBody] dynamic model)
    {
        int currentPage = model.currentPage;
        int everyPageSize = model.everyPageSize;
        string sortName = model.sortName;
        string keyWhere = model.keyWhere;
        string inBusType = model.inBusType;
        string inSupId = model.inSupId;
        string inReceiveOrgId = model.inReceiveOrgId;
        var dset = new DataSet();
        try
        {
            using (var conn = new SqlConnection(DbHelperSQL.strConn))
            {
                using (var cmd = new SqlCommand("[prc_sel_dhd_by_xky]", conn))
                {
                    conn.Open();
                    cmd.CommandType = CommandType.StoredProcedure;
                    SqlParameter[] parameters =
                    {
                        new("@inCurrentPage", currentPage),
                        new("@inEveryPageSize", everyPageSize),
                        new("@inSortName", sortName),
                        new("@inSortOrder", ""),
                        new("@inQueryWhere", keyWhere),
                        new("@inBusType", inBusType),//1是采购，2是委外
                        new("@inSupId", inSupId),//供应商
                        new("@inP1", inReceiveOrgId),//组织
                        new("@inP2", "")
                    };
                    foreach (var parameter in parameters)
                        cmd.Parameters.Add(parameter);
                    using (var dt =
                           new SqlDataAdapter(cmd))
                    {
                        dt.Fill(dset, "0");
                    }
                }
                conn.Close();
            }
        }
        catch (Exception ex)
        {
            LogHelper.Debug(ToString(), "SelectSrm error：" + ex.Message);
            return ReturnDto<PageList<dynamic>>.QuickReturn(
                default(PageList<dynamic>), ReturnCode.Exception, "读取失败");
        }

        var _pglist = new PageList<dynamic>
        {
            total = 0,
            everyPageSize = 0,
            pages = 0,
            list = new List<dynamic>()
        };
        if (dset != null && dset.Tables.Count > 0 &&
            dset.Tables[0].Rows.Count > 0) //有数据
        {
            var intTotal =
                int.Parse(dset.Tables[1].Rows[0]["intTotal"].ToString());
            var pages = intTotal % everyPageSize != 0
                ? intTotal / everyPageSize + 1
                : intTotal / everyPageSize;
            _pglist.total = intTotal;
            _pglist.everyPageSize = everyPageSize;
            _pglist.pages = pages;
            var _dy = dset.Tables[0].TableToDynamicList();
            _pglist.list = _dy;
        }

        return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
            ReturnCode.Success, "读取成功");
    }


    /// <summary>
    /// 根据单号读取srm明细
    /// </summary>
    /// <param name="model"></param>
    /// <returns></returns>
    [RequestMethod(RequestMethods.POST)]
    public ReturnDto<List<dynamic>> SelectSrmTo([FromBody] dynamic model)
    {
        string pi_shdh = model.inShdh;
        string inP1 = model.inP1;
        string inP2 = model.inP2;
        var lst = new List<dynamic>();
        var dset = new DataSet();
        using (var conn = new SqlConnection(DbHelperSQL.strConn))
        {
            using (var cmd = new SqlCommand("[prc_sel_dhdmx_by_xky]", conn))
            {
                try
                {
                    conn.Open();
                    cmd.CommandType = CommandType.StoredProcedure;
                    SqlParameter[] parameters =
                    {
                        new("@pi_shdh",pi_shdh),
                        new("@inP1",""),
                        new("@inP2",""),
                    };
                    foreach (var parameter in parameters)
                        cmd.Parameters.Add(parameter);
                    using (var dt =
                           new SqlDataAdapter(cmd))
                    {
                        dt.Fill(dset, "0");
                    }
                }
                catch (Exception ex)
                {
                    LogHelper.Debug(ToString(),
                        "prc_sel_dhdmx_by_xky error：" + ex.Message);
                }
                finally
                {
                    conn.Close();
                }
            }
        }

        if (dset != null && dset.Tables.Count > 0 &&
            dset.Tables[0].Rows.Count > 0) //有数据
            lst = dset.Tables[0].TableToDynamicList();

        return ReturnDto<List<dynamic>>.QuickReturn(lst, ReturnCode.Success,
            "读取成功！");
    }

    #endregion
}