逻辑优化

快乐的昕的电脑

2025-10-18 598f2e950939bfd4e80f8623adfcead7699a715a

 Services/MesQaItemsDetect02Manager.cs

@@ -12,9 +12,11 @@
    //根据工单号查首检
    public MesQaItemsDetect02 FindSJByOrderNo(OrderMachineDto query)
    {
        var entity = Db.Queryable<MesQaItemsDetect02>()
        var list = Db.Queryable<MesQaItemsDetect02>()
            .LeftJoin<MesStaff>((sj, staff) => sj.FcheckBy == staff.StaffNo)
            .Where((sj, staff) => sj.Ftype == "首检" && sj.Aufnr == query.orderNo)
            .Where((sj, staff) =>
                sj.Ftype == "首检" && sj.Aufnr == query.orderNo &&
                sj.FcheckDate != null)
            .Select((sj, staff) => new MesQaItemsDetect02
            {
                Id = sj.Id,
@@ -23,9 +25,17 @@
                // FcheckBy与StaffName组合，如 "工号-姓名"
                FcheckBy = sj.FcheckBy + (staff.StaffName != null ? "-" + staff.StaffName : "")
            })
            .OrderBy(sj => sj.FcheckDate, OrderByType.Desc)
            .First();
            .OrderBy(sj => sj.FcheckDate, OrderByType.Desc);

        if (list == null || list.Count() == 0)
        {
            var empty = new MesQaItemsDetect02();
            empty.xjCount = 0; // 可改为 sjCount，更语义化
            return empty;
        }

        var entity = list.First();
        entity.xjCount = list.Count(); // 可改为 sjCount，更语义化
        return entity;
    }