同步为祈禧的代码

啊鑫

3 天以前 eb65436c2312821e3e513ab9ada41dd486d6d7cf

 WebApi/Gs.Sales/SalesManager.cs

@@ -120,7 +120,7 @@
                    m = dr.RowToDynamic();
                    var _tb = dset.Tables[1].TableToDynamicList();
                    m.list = _tb;
                    

                }
            }
            catch (Exception ex)
@@ -137,7 +137,7 @@


        /// <summary>
        /// 选择弹窗
        /// 销售出库时，选择销售订单
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
@@ -287,7 +287,7 @@


        /// <summary>
        ///     读取列表，支持分页
        /// 选择销售退货申请明细，有源单据，销售出库单
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
@@ -298,7 +298,8 @@
            int everyPageSize = model.everyPageSize;
            string sortName = model.sortName;
            string keyWhere = model.keyWhere;
            string keyType = model.keyType;//这是销售订单号
            string inP1 = model.inP1;//这是客户id
            string inP2 = model.inP2;//这是销售组织id
            var dset = new DataSet();
            try
            {
@@ -315,8 +316,8 @@
                        new("@inSortName", sortName),
                        new("@inSortOrder", ""),
                        new("@inQueryWhere", keyWhere),
                        new("@inP1",keyType),//这是销售订单号
                        new("@inP2", "")
                        new("@inP1",inP1),
                        new("@inP2", inP2)
                    };
                        foreach (var parameter in parameters)
                            cmd.Parameters.Add(parameter);
@@ -359,5 +360,81 @@
            return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
                ReturnCode.Success, "读取成功");
        }


        /// <summary>
        /// 选择销售退货申请明细，有源单据，销售单
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [RequestMethod(RequestMethods.POST)]
        public ReturnDto<PageList<dynamic>> SelectFormFhMxSales([FromBody] dynamic model)
        {
            int currentPage = model.currentPage;
            int everyPageSize = model.everyPageSize;
            string sortName = model.sortName;
            string keyWhere = model.keyWhere;
            string inP1 = model.inP1;//这是客户id
            string inP2 = model.inP2;//这是销售组织id
            var dset = new DataSet();
            try
            {
                using (var conn = new SqlConnection(DbHelperSQL.strConn))
                {
                    using (var cmd = new SqlCommand("[select_salesFhMxSales]", conn))
                    {
                        conn.Open();
                        cmd.CommandType = CommandType.StoredProcedure;
                        SqlParameter[] parameters =
                        {
                        new("@inCurrentPage", currentPage),
                        new("@inEveryPageSize", everyPageSize),
                        new("@inSortName", sortName),
                        new("@inSortOrder", ""),
                        new("@inQueryWhere", keyWhere),
                        new("@inP1",inP1),
                        new("@inP2", 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(), "select_salesFhMxSales 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, "读取成功");
        }
    }
}