逻辑优化

快乐的昕的电脑

2025-10-18 b876edb8c9865d15a41cc0926cde34aa8c89c1f2

 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;
    }

@@ -112,10 +119,15 @@
        var vOrderBycl = new VOrderBycl();
        if (numericalList.Count > 0)
        {
            // 按采集时间升序排序
            var sortedList = numericalList
                .OrderBy(x => DateTime.TryParse(x.CjTiem, out var dt) ? dt : DateTime.MinValue)
                .ToList();

            // 开工数采：最早一条
            vOrderBycl.StartCjNum = numericalList.First().CjNum ?? 0;
            vOrderBycl.StartCjNum = sortedList.First().CjNum ?? 0;
            // 当前数采：最新一条
            vOrderBycl.CurrentCjNum = numericalList.Last().CjNum ?? 0;
            vOrderBycl.CurrentCjNum = sortedList.Last().CjNum ?? 0;
        }
        else
        {
@@ -125,8 +137,9 @@

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

        if (lastReport == null || !lastReport.BgDate.HasValue)
@@ -136,31 +149,15 @@
        }
        else
        {
            // 有报工记录，初始采集数为上一次报工时间后最近一条齿轮数采表的采集数量
            // 1. 精确匹配报工时间
            var exactMatch = numericalList
            // 有报工记录，初始采集数为报工时间点前（含）最近一条齿轮数采表的采集数量
            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)
                .OrderBy(x => x.ParsedTime)
                .Where(x => x.ParsedTime.HasValue && x.ParsedTime.Value <= lastReport.BgDate.Value)
                .OrderByDescending(x => x.ParsedTime) // 降序，取第一条
                .Select(x => x.Item)
                .FirstOrDefault();

            if (exactMatch != null)
            {
                vOrderBycl.InitCjNum = exactMatch.CjNum ?? vOrderBycl.StartCjNum;
            }
            else
            {
                // 2. 找报工时间之后的第一条
                var afterReportNum = 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)
                    .OrderBy(x => x.ParsedTime)
                    .Select(x => x.Item)
                    .FirstOrDefault();

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

        var startCjNum = vOrderBycl.StartCjNum;
@@ -172,7 +169,7 @@
            .Where(c =>
                decimals.Contains(c.ID) &&
                (c.EditDate == date || c.EditDate == null))
            .OrderBy(c => c.EditDate, OrderByType.Desc)
            .OrderBy(c => c.BgDate, OrderByType.Desc)
            .Take(1)
            .ToList();

@@ -253,10 +250,15 @@

        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
        {
@@ -264,6 +266,35 @@
            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;
    }