修改BUG

快乐的昕的电脑

2025-09-29 78371cdb07c4cb79a686714ffc8f24ef93de314e

 Services/WomdaaManager.cs

@@ -17,9 +17,17 @@
    public List<VOrdreBycl> GetWomdaasByEngineeringNo(OrderMachineDto query)
    {
        var list = VOrders(query);
        var vOrders = list.GroupBy(p => p.cutterId)
            .Select(g => g.First()).ToList();
        return vOrders;

        // 增加状态筛选
        if (query.OrderStatus != null && query.OrderStatus.Any())
        {
            Console.WriteLine("收到OrderStatus参数: " + string.Join(",", query.OrderStatus ?? Array.Empty<string>()));
            Console.WriteLine("所有工单状态: " + string.Join(",", list.Select(x => x.Daa018 ?? "").Distinct()));
            list = list.Where(p => p.Daa018 != null && query.OrderStatus.Contains(p.Daa018)).ToList();
        }

        // 去掉模具分组，直接返回筛选结果
        return list;
    }

    /// <summary>
@@ -30,19 +38,17 @@
    private List<VOrdreBycl> VOrders(OrderMachineDto query)
    {
        var list = Db.Queryable<VOrdreBycl>()
            .Where(s => s.Daa018 != "完工" &&
                        s.MachineNo == query.machineNo
            )
            .Where(s => s.MachineNo == query.machineNo)
            .Select(s => new VOrdreBycl
            {
                ID = s.ID,
                cutterId = s.cutterId,
                cutterName = s.cutterName,
                cutterModel = s.cutterModel
                cutterModel = s.cutterModel,
                Daa018 = s.Daa018 // 确保状态字段被映射
            })
            .ToList();

        // 查询指定机器的工单
        var orders = Db.Queryable<VOrderABycl>()
            .Where(s => s.MachineNo == query.machineNo)
            .Select<VOrdreBycl>(s => new VOrdreBycl
@@ -50,7 +56,8 @@
                ID = s.ID,
                cutterId = s.cutterId,
                cutterName = s.cutterName,
                cutterModel = s.cutterModel
                cutterModel = s.cutterModel,
                Daa018 = s.Daa018
            })
            .ToList();