如果有报工记录，那么初始始采集数为：上一次报工时间后最近一条齿轮数采表的采集数量

快乐的昕的电脑

2025-10-17 7f973db754fe5746b48b6b90a1a6e05cb7b8ed24

 Services/WomdaaManager.cs

@@ -91,8 +91,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 +103,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)
@@ -114,12 +113,9 @@
        if (numericalList.Count > 0)
        {
            // 开工数采：最早一条
            var firstNum = numericalList.First().CjNum ?? 0;
            var lastNum = numericalList.Last().CjNum ?? 0;
            // 需要有对象引用，假设你有一个 VOrderBycl 类型的对象，比如 vOrderBycl

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

        // 查询报工记录，获取最后一次报工时间
        var lastReport = Db.Queryable<MesReporting>()
            .Where(r => r.BillNo != null && r.BillNo.Contains(query.orderNo))
            .OrderBy(r => r.BgDate, OrderByType.Desc)
            .First();

        if (lastReport == null)
        {
            // 没有报工记录，初始采集数为开工采数
            vOrderBycl.InitCjNum = vOrderBycl.StartCjNum;
        }
        else
        {
            // 有报工记录，初始采集数为上一次报工时间后最近一条齿轮数采表的采集数量
            var afterReportNum = numericalList
                .Where(x =>
                    DateTime.TryParse(x.CjTiem, out var cjTiemDt) &&
                    lastReport.BgDate.HasValue &&
                    cjTiemDt > lastReport.BgDate.Value)
                .OrderBy(x => DateTime.Parse(x.CjTiem))
                .FirstOrDefault();

            vOrderBycl.InitCjNum = afterReportNum?.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.EditDate, OrderByType.Desc)
            .Take(1)
            .ToList();

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

        return orders;