1.新增MES_PROJECT.cs

fcx

3 天以前 7ee2e58c300374a15c212f9145ba9d762d64e0e6

 StandardPda/MES.Service/service/QC/XJService.cs

@@ -89,7 +89,7 @@
                Daa001 = a.Daa001,
                Daa003 = a.Daa003,
                Daa008 = a.Daa008
            }).ToList();
            }).Distinct().ToList();
    }

    public List<MesItems> getBoardItem(string lineNo)
@@ -107,7 +107,7 @@
                    ItemNo = b.ItemNo,
                    ItemName = b.ItemName,
                    ItemModel = b.ItemModel
                }).ToList();
                }).Distinct().ToList();
    }

    //public (List<QsQaItemXj> item, int TotalCount) getPage(XJPageResult queryObj)
@@ -176,40 +176,45 @@
        var totalCount = 0;

        var pageList = db
            .Queryable<QsQaItemXj, Womdaa, MesItems>((s, a, b) =>
            .Queryable<QsQaItemXj, Womdaa, MesItems, Womcaa, MES_PROJECT>((s, a, b,c,d) =>
                new JoinQueryInfos(
                    JoinType.Inner, s.BillNo == a.Daa001,
                    JoinType.Left, s.ItemId == b.Id
                    JoinType.Left, s.ItemId == b.Id,
                    JoinType.Left,a.Daa021 == c.Caa001,
                    JoinType.Left ,d.Id == c.Project
                )
            )

            // ⭐ 模糊搜索（BillNo 或 ItemNo 新增
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.SearchValue),
                (s, a, b) =>
                (s, a, b,c,d) =>
                    s.BillNo.Contains(queryObj.SearchValue) ||
                    s.ItemNo.Contains(queryObj.SearchValue)
                    s.ItemNo.Contains(queryObj.SearchValue) ||
                    b.ItemName.Contains(queryObj.SearchValue)||
                    a.Daa020.Contains(queryObj.SearchValue)||
                    d.PROJECT_CODE.Contains(queryObj.SearchValue)
            )

            // ⭐ 状态筛选：未完成
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.result) &&
                "未完成".Equals(queryObj.result),
                (s, a, b) => s.Fsubmit == null || s.Fsubmit == 0
                (s, a, b,c,d) => s.Fsubmit == null || s.Fsubmit == 0
            )

            // ⭐ 状态筛选：已完成
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.result) &&
                !"未完成".Equals(queryObj.result),
                (s, a, b) => s.Fsubmit == 1
                (s, a, b,c,d) => s.Fsubmit == 1
            )

            // ⭐ ID 查询（单条）
            .WhereIF(id > 0, (s, a, b) => s.Id == id)
            .WhereIF(id > 0, (s, a, b,c,d) => s.Id == id)

            // ⭐ select 实体返回
            .Select((s, a, b) => new QsQaItemXj
            .Select((s, a, b,c,d) => new QsQaItemXj
            {
                Id = s.Id,
                ReleaseNo = s.ReleaseNo,
@@ -234,7 +239,9 @@
                // ⭐ 额外字段（来自连表）
                PlanQty = a.Daa008,
                ItemName = b.ItemName,
                ItemModel = b.ItemModel
                ItemModel = b.ItemModel,
                DAA020 = a.Daa020,
                PROJECT_CODE = d.PROJECT_CODE
            })

            .OrderBy(s => s.CreateDate, OrderByType.Desc)