1111

tjx

2025-11-05 30ecd82c14c5b62bf5444f29edcbb7a044653b93

 Services/MesQaItemsDetect02Manager.cs

@@ -12,33 +12,50 @@
    //根据工单号查首检
    public MesQaItemsDetect02 FindSJByOrderNo(OrderMachineDto query)
    {
        return Db.Queryable<MesQaItemsDetect02>()
            .Where(s => s.Ftype == "首检" && s.Aufnr == query.orderNo)
            .Select(s => new MesQaItemsDetect02
        var list = Db.Queryable<MesQaItemsDetect02>()
            .LeftJoin<MesStaff>((sj, staff) => sj.FcheckBy == staff.StaffNo)
            .Where((sj, staff) =>
                sj.Ftype == "首检" && sj.Aufnr == query.orderNo &&
                sj.FcheckDate != null)
            .Select((sj, staff) => new MesQaItemsDetect02
            {
                Id = s.Id,
                FcheckDate = s.FcheckDate,
                FcheckResu = s.FcheckResu
                Id = sj.Id,
                FcheckDate = sj.FcheckDate,
                FcheckResu = sj.FcheckResu,
                // FcheckBy与StaffName组合，如 "工号-姓名"
                FcheckBy = sj.FcheckBy + (staff.StaffName != null ? "-" + staff.StaffName : "")
            })
            .OrderBy(s => s.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;
    }

    //根据工单号查巡检
    public MesQaItemsDetect02 FindXJByOrderNo(OrderMachineDto query)
    {
        var list = Db.Queryable<MesQaItemsDetect02>()
            .Where(s =>
                s.Ftype == "巡检" && s.Aufnr == query.orderNo &&
                s.FcheckDate != null)
            .Select(s => new MesQaItemsDetect02
            .LeftJoin<MesStaff>((xj, staff) => xj.FcheckBy == staff.StaffNo)
            .Where((xj, staff) =>
                xj.Ftype == "巡检" && xj.Aufnr == query.orderNo &&
                xj.FcheckDate != null)
            .Select((xj, staff) => new MesQaItemsDetect02
            {
                Id = s.Id,
                FcheckDate = s.FcheckDate,
                FcheckResu = s.FcheckResu,
                FcheckBy = s.FcheckBy // 新增
                Id = xj.Id,
                FcheckDate = xj.FcheckDate,
                FcheckResu = xj.FcheckResu,
                // FcheckBy与StaffName组合，如 "工号-姓名"
                FcheckBy = xj.FcheckBy + (staff.StaffName != null ? "-" + staff.StaffName : "")
            })
            .OrderBy(s => s.FcheckDate, OrderByType.Desc);
            .OrderBy(xj => xj.FcheckDate, OrderByType.Desc);

        if (list == null || list.Count() == 0)
        {