未首检的工单现在不会出现在巡检创建选项中

zyf

2025-09-12 3b787c15c3d1640d1e6bbe3147206b852a47741f

 MES.Service/service/QC/XJService.cs

@@ -73,7 +73,7 @@
    public List<Womdaa> getDaa001(string daa020, string item)
    {
        var db = SqlSugarHelper.GetInstance();
        return db.Queryable<Womdaa, MesItems>((a, b) =>
        /*return db.Queryable<Womdaa, MesItems>((a, b) =>
                new JoinQueryInfos(JoinType.Inner, a.Daa002 == b.Id.ToString()))
            .Where((a, b) =>
                a.Daa015 == daa020 &&
@@ -85,16 +85,40 @@
                Daa001 = a.Daa001,
                Daa003 = a.Daa003,
                Daa008 = a.Daa008
            }).ToList();
            }).ToList();*/
        var list = db.Queryable<Womdaa, MesItems, QsItemIpiReq>(
                (a, b, c) => new JoinQueryInfos(
                    JoinType.Inner, a.Daa002 == b.Id.ToString(),
                    JoinType.Left, a.Id == c.Pbaid
                )
            )
            .Where((a, b, c) =>
                a.Daa015 == daa020 &&
                b.ItemNo == item &&
                statusArray.Contains(a.Daa018) && (c.Id > 0) //只查询有首检单据的工单
            )
            .GroupBy((a, b) => new { a.Id, a.Daa001, a.Daa003, a.Daa008 })
            .Select((a, b) => new Womdaa
            {
                Id = a.Id,
                Daa001 = a.Daa001,
                Daa003 = a.Daa003,
                Daa008 = a.Daa008
            })
            .ToList();
        return list;
    }

    public List<MesItems> getBoardItem(string lineNo)
    {
        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) &&
                             a.Daa015 == lineNo)
        return db.Queryable<Womdaa, MesItems, QsItemIpiReq>((a, b, c) =>
                new JoinQueryInfos(
                    JoinType.Inner, a.Daa002 == b.Id.ToString(),
                    JoinType.Left, a.Id == c.Pbaid))
            .Where((a, b, c) => statusArray.Contains(a.Daa018) &&
                             a.Daa015 == lineNo && statusArray.Contains(a.Daa018) && (c.Id > 0))
            .GroupBy((a, b) => new { b.Id, b.ItemNo, b.ItemName, b.ItemModel })
            .OrderBy((a, b) => b.ItemName)
            .Select<MesItems>((a, b) =>
                new MesItems