Merge remote-tracking branch 'origin/master'

啊鑫

6 天以前 2ba5117206c152cece2e5ac40067a6232dfb2870

 WebApi/Gs.BaseInfo/Services/MesSupplierManager.cs

@@ -43,29 +43,22 @@
            var _sbBy =
                new StringBuilder(query.sortName + " " + query.sortOrder);
            var totalCount = 0;
            var itemsList = Db
                .Queryable<MesSupplier, SysOrganization>((a, org) =>
                    new object[]
            var itemsList = Db.Queryable<MesSupplier, SysOrganization>(
                    (a, org) => new object[]
                    {
                        JoinType.Left, a.FSubsidiary == org.Fid
                    }
                ).Select((a, org) => new MesSupplier
                {
                    FSubsidiary = "(" + org.FNumber + ")" + org.Name,
                    Fforbidstatus = a.Fforbidstatus + ":" +
                                    (a.Fforbidstatus == "A" ? "正常" : "禁用"),
                    Fforbidstatus = a.Fforbidstatus + ":" + (a.Fforbidstatus == "A" ? "正常" : "禁用"),
                    DataType = a.DataType + ":"
                                          + SqlFunc.IF(a.DataType == "Z")
                                              .Return("暂存")
                                              .ElseIF(a.DataType == "A")
                                              .Return("创建")
                                              .ElseIF(a.DataType == "B")
                                              .Return("审核中")
                                              .ElseIF(a.DataType == "C")
                                              .Return("已审核")
                                              .ElseIF(a.DataType == "D")
                                              .Return("重新审核")
                                              .End(a.DataType)
                        + SqlFunc.IF(a.DataType == "Z").Return("暂存")
                        .ElseIF(a.DataType == "A").Return("创建")
                        .ElseIF(a.DataType == "B").Return("审核中")
                        .ElseIF(a.DataType == "C").Return("已审核")
                        .ElseIF(a.DataType == "D").Return("重新审核")
                        .End(a.DataType)
                }, true)
                .Where(_sbWhere.ToString())
                .OrderBy(_sbBy.ToString())
@@ -148,7 +141,6 @@
            return ReturnDto<PageList<dynamic>>.QuickReturn(
                default(PageList<dynamic>), ReturnCode.Exception, "读取失败");
        }

        var _pglist = new PageList<dynamic>
        {
            total = 0,
@@ -170,14 +162,14 @@
            var _dy = dset.Tables[0].TableToDynamicList();
            _pglist.list = _dy;
        }

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



    /// <summary>
    ///     加入srm名单
    /// 加入srm名单
    /// </summary>
    /// <param name="model"></param>
    /// <returns></returns>
@@ -186,106 +178,83 @@
    {
        string suppId = model.suppId;
        string joinType = model.joinType;
        var rtnInt = (int)ReturnCode.Default;
        int rtnInt = (int)ReturnCode.Default;
        try
        {
            var strSql = new StringBuilder();
            StringBuilder strSql = new StringBuilder();
            strSql.Append(" delete from MES_SUPPLIER_SRM ");
            strSql.Append(" where suppId='" + suppId + "'");
            var rows = DbHelperSQL.ExecuteSql(strSql.ToString());
            int rows = DbHelperSQL.ExecuteSql(strSql.ToString());
            if (joinType == "1")
            {
                strSql = new StringBuilder();
                strSql.Append(
                    " insert into MES_SUPPLIER_SRM(suppId,isSrm,create_by,create_date)");
                strSql.Append(" values('" + suppId + "',1,'" + _userCode +
                              "',getdate())");
                strSql.Append(" insert into MES_SUPPLIER_SRM(suppId,isSrm,create_by,create_date)");
                strSql.Append(" values('" + suppId + "',1,'" + _userCode + "',getdate())");
                rows = DbHelperSQL.ExecuteSql(strSql.ToString());
            }

            rtnInt = rows;
        }
        catch (Exception ex)
        {
            LogHelper.Debug(ToString(), "DeleteModel error：" + ex.Message);
            LogHelper.Debug(this.ToString(), "DeleteModel error：" + ex.Message);
            rtnInt = (int)ReturnCode.Exception;
            return ReturnDto<int>.QuickReturn(default(int?),
                ReturnCode.Exception, "操作失败，" + ex.Message);
            return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Exception, "操作失败，" + ex.Message);
        }

        if (rtnInt > 0)
            return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Success,
                "操作成功！");
        return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Exception,
            "操作失败，请重试！");
            return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Success, "操作成功！");
        else
            return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Exception, "操作失败，请重试！");
    }


    /// <summary>
    ///     读取srm列表
    /// 读取srm列表
    /// </summary>
    /// <param name="model"></param>
    /// <returns></returns>
    [RequestMethod(RequestMethods.POST)]
    public ReturnDto<PageList<dynamic>> GetSrmListPage(
        [FromBody] PageQuery model)
    public ReturnDto<PageList<dynamic>> GetSrmListPage([FromBody] PageQuery model)
    {
        var currentPage = model.currentPage;
        var everyPageSize = model.everyPageSize;
        var sortName = string.IsNullOrEmpty(model.sortName)
            ? "a.supp_name"
            : model.sortName;
        var keyWhere = model.keyWhere;
        var sbSql = new StringBuilder();
        int currentPage = model.currentPage;
        int everyPageSize = model.everyPageSize;
        string sortName = string.IsNullOrEmpty(model.sortName) ? "a.supp_name" : model.sortName;
        string keyWhere = model.keyWhere;
        System.Text.StringBuilder sbSql = new StringBuilder();
        sbSql.Append("select * from ");
        sbSql.Append("( ");
        sbSql.Append("select top 100000 ROW_NUMBER() over(order by " +
                     sortName + " " + model.sortOrder +
                     ") as rowIndex,a.*,b.create_date as joinDate,'(' + org.FNumber + ')' + org.Name as orgName  from [dbo].[MES_SUPPLIER_SRM] b left join [dbo].[MES_SUPPLIER] a on b.suppId=a.[id] left join  SYS_ORGANIZATION org  on org.FID=a.FSubsidiary where 1=1" +
                     keyWhere);
        sbSql.Append("select top 100000 ROW_NUMBER() over(order by " + sortName + " " + model.sortOrder + ") as rowIndex,a.*,b.create_date as joinDate,'(' + org.FNumber + ')' + org.Name as orgName  from [dbo].[MES_SUPPLIER_SRM] b left join [dbo].[MES_SUPPLIER] a on b.suppId=a.[id] left join  SYS_ORGANIZATION org  on org.FID=a.FSubsidiary where 1=1" + keyWhere);
        sbSql.Append(") as T ");
        sbSql.Append(" where T.rowindex>(" + currentPage + "-1)*" +
                     everyPageSize + " and  T.rowindex<=" + currentPage + "*" +
                     everyPageSize);
        sbSql.Append(" where T.rowindex>(" + currentPage + "-1)*" + everyPageSize + " and  T.rowindex<=" + currentPage + "*" + everyPageSize);
        sbSql.Append(" order by rowindex asc ");
        sbSql.Append(
            " select count(1) as intTotal from [dbo].[MES_SUPPLIER_SRM] b left join [dbo].[MES_SUPPLIER] a on b.suppId=a.[id] left join  SYS_ORGANIZATION org  on org.FID=a.FSubsidiary where 1=1 " +
            keyWhere);
        var dset = new DataSet();
        sbSql.Append(" select count(1) as intTotal from [dbo].[MES_SUPPLIER_SRM] b left join [dbo].[MES_SUPPLIER] a on b.suppId=a.[id] left join  SYS_ORGANIZATION org  on org.FID=a.FSubsidiary where 1=1 " + keyWhere);
        DataSet dset = new DataSet();
        try
        {
            dset = DbHelperSQL.Query(sbSql.ToString());
            dset = Gs.Toolbox.DbHelperSQL.Query(sbSql.ToString());
        }
        catch (Exception ex)
        {
            LogHelper.Debug(ToString(), "GetListPage error：" + ex.Message);
            return ReturnDto<PageList<dynamic>>.QuickReturn(
                default(PageList<dynamic>), ReturnCode.Exception, "读取失败");
            Gs.Toolbox.LogHelper.Debug(this.ToString(), "GetListPage error：" + ex.Message);
            return ReturnDto<PageList<dynamic>>.QuickReturn(default(PageList<dynamic>), ReturnCode.Exception, "读取失败");
        }

        var _pglist = new PageList<dynamic>
        PageList<dynamic> _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) //有数据
        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;
            int intTotal = int.Parse(dset.Tables[1].Rows[0]["intTotal"].ToString());
            int pages = (intTotal % everyPageSize != 0) ? (intTotal / everyPageSize + 1) : (intTotal / everyPageSize);
            _pglist.total = intTotal;
            _pglist.everyPageSize = everyPageSize;
            _pglist.pages = pages;
            var _dy = dset.Tables[0].TableToDynamicList();
            List<dynamic> _dy = dset.Tables[0].TableToDynamicList();
            _pglist.list = _dy;
        }

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

}