逻辑优化

快乐的昕的电脑

2025-10-18 b876edb8c9865d15a41cc0926cde34aa8c89c1f2

 Services/WomdaaManager.cs

@@ -96,7 +96,6 @@
    /// <returns>需要显示的工单列表</returns>
    public List<VOrderBycl> GetWomdaasByShow(OrderMachineDto query)
    {
        Console.WriteLine($"orderNo: {query.orderNo}");
        // 查询需要显示的工单ID
        var ids = Db.Queryable<MesOrderSelect>()
            .Where(b => b.MachineNo == query.machineNo && b.IsShow == 0)
@@ -138,7 +137,8 @@

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

@@ -149,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)
                    .OrderByDescending(x => x.ParsedTime)
                    .Select(x => x.Item)
                    .FirstOrDefault();

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

        var startCjNum = vOrderBycl.StartCjNum;
@@ -282,9 +266,11 @@
            VOrdrerBycl.CurrentCjNum = 0;
        }

        // 查询最后一条报工记录
        Console.WriteLine($"orderNo: [{query.orderNo}]");

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

@@ -295,15 +281,15 @@
        }
        else
        {
            // 有报工记录，初始采集数为上一次报工时间后最近一条齿轮数采表的采集数量
            var afterReportNum = 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)
                .OrderByDescending(x => x.ParsedTime)
                .Where(x => x.ParsedTime.HasValue && x.ParsedTime.Value <= lastReport.BgDate.Value)
                .OrderByDescending(x => x.ParsedTime) // 降序，取第一条
                .Select(x => x.Item)
                .FirstOrDefault();

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

        // 报工时采集数就是主界面的当前采数