优化多组织代码

sjz

13 小时以前 302054e253f1550ee64430882786ec9a3920ec92

 MES.Service/service/QC/XJService.cs

@@ -47,7 +47,7 @@
        return db.Queryable<Womdaa>()
            .Where(a =>
                a.Daa001 == daa001 &&
                statusArray.Contains(a.Daa018))
                a.Daa018 != "完工")
            .ToList();
    }

@@ -58,10 +58,11 @@
        return db.Queryable<Womdaa, MesLine>((a, b) =>
                new JoinQueryInfos(JoinType.Left, a.Daa015 == b.LineNo))
            .Where((a, b) => b.LineName != null &&
                             statusArray.Contains(a.Daa018))
                             a.Daa018 != "完工")
            .GroupBy((a, b) => new
            {
                b.LineNo, b.LineName
                b.LineNo,
                b.LineName
            })
            .Select((a, b) => new MesLine
            {
@@ -78,7 +79,7 @@
            .Where((a, b) =>
                a.Daa015 == daa020 &&
                b.ItemNo == item &&
                statusArray.Contains(a.Daa018))
                a.Daa018 != "完工")
            .Select<Womdaa>(a => new Womdaa
            {
                Id = a.Id,
@@ -93,16 +94,16 @@
        var db = SqlSugarHelper.GetInstance();
        return db.Queryable<Womdaa, MesItems>((a, b) =>
                new JoinQueryInfos(JoinType.Inner, a.Daa002 == b.Id.ToString()))
            .Where((a, b) => statusArray.Contains(a.Daa018) &&
            .Where((a, b) => a.Daa018 != "完工" &&
                             a.Daa015 == lineNo)
            .OrderBy((a, b) => b.ItemName)
            .Select<MesItems>((a, b) =>
                new MesItems
                {
                    Id = b.Id,
                    ItemId = b.ItemId,
                    ItemNo = b.ItemNo,
                    ItemName = b.ItemName,
                    ItemModel = b.ItemModel,
                    ItemModel = b.ItemModel
                }).ToList();
    }

@@ -137,6 +138,7 @@
                !"未完成".Equals(queryObj.result),
                (s, a, c, b) => s.FcheckResu != null)
            .WhereIF(id > 0, (s, a, c, b) => s.Id == id)
            //.WhereIF(queryObj.Comments != null, (s, a, c, b) => s.Comments == queryObj.Comments)
            .Select((s, a, c, b) => new QsQaItemXj
            {
                Daa020 = c.LineNo,
@@ -151,7 +153,8 @@
                ItemModel = b.ItemModel,
                FcheckBy = s.FcheckBy,
                FcheckResu = s.FcheckResu,
                Remarks = s.Remarks
                Remarks = s.Remarks,
                Comments = s.Comments
            }).OrderBy(s => s.CreateDate, OrderByType.Desc)
            .ToPageList(queryObj.PageIndex, queryObj.Limit);
    }
@@ -161,16 +164,15 @@
    {
        var db = SqlSugarHelper.GetInstance();

        var count = db.Queryable<MesQa>().Where(s => s.QsType == "2"
            && s.ItemNo == itemNo && s.Fsubmit == 1).Count();
        var count = db.Queryable<MesQa>().Where(s =>
            s.QsType == "2" && s.ItemNo == itemNo && s.Fsubmit == 1).Count();

        if (count <= 0) return new List<QsQaItemXj01>();

        return db
            .Queryable<MesQualityStandard>()
            .Where(b => b.QsType == "2"
                        && b.ItemNo == itemNo).Select(
                b => new QsQaItemXj01
            .Where(b => b.QsType == "2" && b.ItemNo == itemNo).Select(b =>
                new QsQaItemXj01
                {
                    ProjName = b.ProjName,
                    ItemMod = b.ItemMod,
@@ -398,8 +400,8 @@

        if (count == passCount) result = 1;

        var useTransactionWithOracle = SqlSugarHelper.UseTransactionWithOracle(
            db =>
        var useTransactionWithOracle =
            SqlSugarHelper.UseTransactionWithOracle(db =>
            {
                var commit = 0;
                commit += db.Updateable<QsQaItemXj01>()
@@ -503,6 +505,19 @@
        });
    }


    public int saveCommentGid(XJDto dto)
    {
        return SqlSugarHelper.UseTransactionWithOracle(db =>
        {
            return db.Updateable<QsQaItemXj>()
                .SetColumns(it =>
                    it.Comments == dto.Comments) //SetColumns是可以叠加的 写2个就2个字段赋值
                .Where(it => it.Id == dto.gid)
                .ExecuteCommand();
        });
    }

    //子表修改备注字段
    public int saveRemarksPid(XJDto dto)
    {