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 | 67 +++++++++++++++++----------------
1 files changed, 35 insertions(+), 32 deletions(-)
diff --git a/Services/WomdaaManager.cs b/Services/WomdaaManager.cs
index 22807c6..6e41ca0 100644
--- a/Services/WomdaaManager.cs
+++ b/Services/WomdaaManager.cs
@@ -14,12 +14,20 @@
/// </summary>
/// <param name="query">鍖呭惈鏈哄櫒缂栧彿鐨勬煡璇㈡潯浠�</param>
/// <returns>宸ュ崟鍒楄〃,鎸夋ā鍏稩D鍒嗙粍鍚庣殑绗竴鏉¤褰�</returns>
- public List<VOrder> GetWomdaasByEngineeringNo(OrderMachineDto query)
+ public List<VOrdreBycl> GetWomdaasByEngineeringNo(OrderMachineDto query)
{
var list = VOrders(query);
- var vOrders = list.GroupBy(p => p.moldId)
- .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>
@@ -27,32 +35,29 @@
/// </summary>
/// <param name="query">鍖呭惈鏈哄櫒缂栧彿鐨勬煡璇㈡潯浠�</param>
/// <returns>鍚堝苟鍚庣殑宸ュ崟鍒楄〃</returns>
- private List<VOrder> VOrders(OrderMachineDto query)
+ private List<VOrdreBycl> VOrders(OrderMachineDto query)
{
- // 鏌ヨ鏈畬宸ヤ笖瀹為檯鏁伴噺涓嶇瓑浜庤鍒掓暟閲忕殑宸ュ崟
- var list = Db.Queryable<VOrder>()
- .Where(s => s.Daa018 != "瀹屽伐" &&
- s.MachineNo == query.machineNo
- && s.Daa011 != s.Daa008
- )
- .Select<VOrder>(s => new VOrder
+ var list = Db.Queryable<VOrdreBycl>()
+ .Where(s => s.MachineNo == query.machineNo)
+ .Select(s => new VOrdreBycl
{
ID = s.ID,
- moldId = s.moldId,
- moldName = s.moldName,
- moldModel = s.moldModel
+ cutterId = s.cutterId,
+ cutterName = s.cutterName,
+ cutterModel = s.cutterModel,
+ Daa018 = s.Daa018 // 纭繚鐘舵�佸瓧娈佃鏄犲皠
})
.ToList();
- // 鏌ヨ鎸囧畾鏈哄櫒鐨勫伐鍗�
- var orders = Db.Queryable<VOrderA>()
+ var orders = Db.Queryable<VOrderABycl>()
.Where(s => s.MachineNo == query.machineNo)
- .Select<VOrder>(s => new VOrder
+ .Select<VOrdreBycl>(s => new VOrdreBycl
{
- ID = s.Id,
- moldId = s.moldId,
- moldName = s.moldName,
- moldModel = s.moldModel
+ ID = s.ID,
+ cutterId = s.cutterId,
+ cutterName = s.cutterName,
+ cutterModel = s.cutterModel,
+ Daa018 = s.Daa018
})
.ToList();
@@ -67,19 +72,17 @@
/// 鍖呭惈鏈哄櫒缂栧彿锛坢achineNo锛夊拰宸ョ▼缂栧彿锛坋ngineeringNo锛夌殑鏌ヨ鏉′欢
/// </param>
/// <returns>
- /// 杩斿洖绗﹀悎鏉′欢鐨勫伐鍗曪紙VOrder锛夊垪琛�
+ /// 杩斿洖绗﹀悎鏉′欢鐨勫伐鍗曪紙VOrdreBycl锛夊垪琛�
/// </returns>
- public List<VOrder> GetWomdaasByMachine(OrderMachineDto query)
+ public List<VOrdreBycl> GetWomdaasByMachine(OrderMachineDto query)
{
// 鑾峰彇褰撳墠鏃ユ湡瀛楃涓诧紝鏍煎紡涓� yyyy-MM-dd
var date = DateTime.Now.ToString("yyyy-MM-dd");
// 鑾峰彇鎸囧畾鏈哄櫒涓嬫湭瀹屽伐涓斿疄闄呮暟閲忎笉绛変簬璁″垝鏁伴噺鐨勫伐鍗曪紙鍚堝苟VOrder鍜孷OrderA锛�
var list = VOrders(query);
-
// 鏍规嵁宸ョ▼缂栧彿锛坋ngineeringNo锛夌瓫閫夊嚭瀵瑰簲鐨勫伐鍗曪紙moldId == engineeringNo锛�
- var vOrders = list.Where(s => s.moldId == query.engineeringNo).ToList();
-
+ var vOrders = list.Where(s => s.cutterId == query.engineeringNo).ToList();
// 鑾峰彇绛涢�夊悗宸ュ崟鐨処D闆嗗悎
var ids = vOrders.Select(s => s.ID).ToArray();
@@ -87,9 +90,9 @@
// 1. 鏈哄彴缂栧彿绛変簬浼犲叆鐨刴achineNo
// 2. 缂栬緫鏃ユ湡涓轰粖澶╂垨涓虹┖
// 3. 宸ュ崟ID鍦╥ds闆嗗悎涓�
- return Db.Queryable<VOrder>()
+ return Db.Queryable<VOrdreBycl>()
.Where(s =>
- s.MachineNo == query.machineNo // 璁惧缂栧彿
+ s.MachineNo == query.machineNo
&& (s.EditDate == date || s.EditDate == null)
&& ids.Contains(s.ID))
.ToList();
@@ -100,7 +103,7 @@
/// </summary>
/// <param name="query">鍖呭惈鏈哄櫒缂栧彿鐨勬煡璇㈡潯浠�</param>
/// <returns>闇�瑕佹樉绀虹殑宸ュ崟鍒楄〃</returns>
- public List<VOrder> GetWomdaasByShow(OrderMachineDto query)
+ public List<VOrdreBycl> GetWomdaasByShow(OrderMachineDto query)
{
// 鏌ヨ闇�瑕佹樉绀虹殑宸ュ崟ID
var ids = Db.Queryable<MesOrderSelect>()
@@ -115,10 +118,10 @@
// 濡傛灉娌℃湁宸ュ崟ID锛岀洿鎺ヨ繑鍥炵┖鍒楄〃
if (decimals.Count == 0)
- return new List<VOrder>();
+ return new List<VOrdreBycl>();
// 鏌ヨ宸ュ崟瑙嗗浘锛岀瓫閫夊嚭闇�瑕佹樉绀虹殑宸ュ崟
- return Db.Queryable<VOrder>()
+ return Db.Queryable<VOrdreBycl>()
.Where(c =>
decimals.Contains(c.ID) &&
(c.EditDate == date || c.EditDate == null))
--
Gitblit v1.9.3