逻辑回调

快乐的昕的电脑

2025-10-18 9f815134b902d19605c753616765cedb598e323f

 Services/WomdaaManager.cs

@@ -25,6 +25,13 @@
            list = list.Where(p => p.Daa018 != null && query.OrderStatus.Contains(p.Daa018)).ToList();
        }

        // 按工单ID分组，只保留每组中最早报工的一条
        list = list
            .GroupBy(p => p.ID)
            .Select(g => g.OrderBy(x => x.BgDate).First())
            .OrderBy(x => x.BgDate)
            .ToList();

        return list;
    }

@@ -91,8 +98,7 @@
    {
        // 查询需要显示的工单ID
        var ids = Db.Queryable<MesOrderSelect>()
            .Where(b => b.MachineNo == query.machineNo
                        && b.IsShow == 0)
            .Where(b => b.MachineNo == query.machineNo && b.IsShow == 0)
            .Select(s => s.OrderId)
            .ToList();

@@ -104,7 +110,7 @@
        if (decimals.Count == 0)
            return new List<VOrderBycl>();

        //如果有工单ID
        // 查询齿轮数采表
        var numericalList = Db.Queryable<MesNumericalBycl>()
            .Where(x => ids.Contains(x.OrderId ?? 0))
            .OrderBy(x => x.CjTiem)
@@ -113,13 +119,15 @@
        var vOrderBycl = new VOrderBycl();
        if (numericalList.Count > 0)
        {
            // 开工数采：最早一条
            var firstNum = numericalList.First().CjNum ?? 0;
            var lastNum = numericalList.Last().CjNum ?? 0;
            // 需要有对象引用，假设你有一个 VOrderBycl 类型的对象，比如 vOrderBycl
            // 按采集时间升序排序
            var sortedList = numericalList
                .OrderBy(x => DateTime.TryParse(x.CjTiem, out var dt) ? dt : DateTime.MinValue)
                .ToList();

            vOrderBycl.StartCjNum = firstNum;
            vOrderBycl.CurrentCjNum = lastNum;
            // 开工数采：最早一条
            vOrderBycl.StartCjNum = sortedList.First().CjNum ?? 0;
            // 当前数采：最新一条
            vOrderBycl.CurrentCjNum = sortedList.Last().CjNum ?? 0;
        }
        else
        {
@@ -127,20 +135,49 @@
            vOrderBycl.CurrentCjNum = 0;
        }

        // 查询报工记录，获取最后一条报工记录
        var lastReport = Db.Queryable<MesReporting>()
            .AS("MES_REPORTING") // 强制表名
            .Where(r => r.BillNo == "MSD01-2507140001-g1-1")
            .OrderBy(r => r.BgDate, OrderByType.Desc)
            .First();

        if (lastReport == null || !lastReport.BgDate.HasValue)
        {
            // 没有报工记录或报工时间无效，初始采集数为开工采数
            vOrderBycl.InitCjNum = vOrderBycl.StartCjNum;
        }
        else
        {
            // 有报工记录，初始采集数为报工时间点前（含）最近一条齿轮数采表的采集数量
            var beforeOrEqualReportNum = numericalList
                .Select(x => new { Item = x, ParsedTime = DateTime.TryParse(x.CjTiem, out var dt) ? dt : (DateTime?)null })
                .Where(x => x.ParsedTime.HasValue && x.ParsedTime.Value <= lastReport.BgDate.Value)
                .OrderByDescending(x => x.ParsedTime) // 降序，取第一条
                .Select(x => x.Item)
                .FirstOrDefault();

            vOrderBycl.InitCjNum = beforeOrEqualReportNum?.CjNum ?? vOrderBycl.StartCjNum;
        }

        var startCjNum = vOrderBycl.StartCjNum;
        var currentCjNum = vOrderBycl.CurrentCjNum;
        var initCjNum = vOrderBycl.InitCjNum;

        // 查询工单视图，筛选出需要显示的工单
        // 查询工单视图，筛选出需要显示的工单，只取最新一条
        var orders = Db.Queryable<VOrderBycl>()
            .Where(c =>
                decimals.Contains(c.ID) &&
                (c.EditDate == date || c.EditDate == null))
            .OrderBy(c => c.BgDate, OrderByType.Desc)
            .Take(1)
            .ToList();

        foreach (var order in orders)
        {
            order.StartCjNum = startCjNum;
            order.CurrentCjNum = currentCjNum;
            order.InitCjNum = initCjNum;
        }

        return orders;
@@ -213,16 +250,50 @@

        if (numericalList.Count > 0)
        {
            // 先按采集时间升序排序
            var sortedList = numericalList
                .OrderBy(x => DateTime.TryParse(x.CjTiem, out var dt) ? dt : DateTime.MinValue)
                .ToList();

            // 开工数采：最早一条
            VOrdrerBycl.StartCjNum = numericalList.First().CjNum ?? 0;
            VOrdrerBycl.StartCjNum = sortedList.First().CjNum ?? 0;
            // 当前数采：最新一条
            VOrdrerBycl.CurrentCjNum = numericalList.Last().CjNum ?? 0;
            VOrdrerBycl.CurrentCjNum = sortedList.Last().CjNum ?? 0;
        }
        else
        {
            VOrdrerBycl.StartCjNum = 0;
            VOrdrerBycl.CurrentCjNum = 0;
        }

        Console.WriteLine($"orderNo: [{query.orderNo}]");

        // 查询报工记录，获取最后一条报工记录
        var lastReport = Db.Queryable<MesReporting>()
            .Where(r => r.BillNo.Trim().ToUpper() == query.orderNo.Trim().ToUpper())
            .OrderBy(r => r.BgDate, OrderByType.Desc)
            .First();

        if (lastReport == null || !lastReport.BgDate.HasValue)
        {
            // 没有报工记录，初始采集数为开工采数
            VOrdrerBycl.InitCjNum = VOrdrerBycl.StartCjNum;
        }
        else
        {
            // 有报工记录，初始采集数为报工时间点前（含）最近一条齿轮数采表的采集数量
            var beforeOrEqualReportNum = numericalList
                .Select(x => new { Item = x, ParsedTime = DateTime.TryParse(x.CjTiem, out var dt) ? dt : (DateTime?)null })
                .Where(x => x.ParsedTime.HasValue && x.ParsedTime.Value <= lastReport.BgDate.Value)
                .OrderByDescending(x => x.ParsedTime) // 降序，取第一条
                .Select(x => x.Item)
                .FirstOrDefault();

            VOrdrerBycl.InitCjNum = beforeOrEqualReportNum?.CjNum ?? VOrdrerBycl.StartCjNum;
        }

        // 报工时采集数就是主界面的当前采数
        // VOrdrerBycl.CurrentCjNum 已赋值，无需额外处理

        return VOrdrerBycl;
    }
@@ -260,6 +331,16 @@
        return vPrint;
    }

    /// <summary>
    /// 报工记录表
    /// </summary>
    /// <param name="billNo"></param>
    /// <param name="machineNo"></param>
    /// <param name="from"></param>
    /// <param name="to"></param>
    /// <param name="pageIndex"></param>
    /// <param name="pageSize"></param>
    /// <returns></returns>
    public (List<MesReportingBgDto> tbBillList, int totalCount) GetByBillNoBG(
        string billNo, string machineNo, DateTime? from, DateTime? to, int pageIndex, int pageSize)
    {