From 78371cdb07c4cb79a686714ffc8f24ef93de314e Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期一, 29 九月 2025 09:24:03 +0800
Subject: [PATCH] 修改BUG
---
Services/WomdaaManager.cs | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/Services/WomdaaManager.cs b/Services/WomdaaManager.cs
index 09d0260..6e41ca0 100644
--- a/Services/WomdaaManager.cs
+++ b/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();
--
Gitblit v1.9.3