From d9fa4abeecfc12ce234fe9fed339fc83d2b9caf2 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期日, 28 九月 2025 16:37:12 +0800
Subject: [PATCH] 视图更新
---
Services/WomdaaManager.cs | 58 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 31 insertions(+), 27 deletions(-)
diff --git a/Services/WomdaaManager.cs b/Services/WomdaaManager.cs
index 9410264..09d0260 100644
--- a/Services/WomdaaManager.cs
+++ b/Services/WomdaaManager.cs
@@ -14,10 +14,10 @@
/// </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)
+ var vOrders = list.GroupBy(p => p.cutterId)
.Select(g => g.First()).ToList();
return vOrders;
}
@@ -27,32 +27,30 @@
/// </summary>
/// <param name="query">鍖呭惈鏈哄櫒缂栧彿鐨勬煡璇㈡潯浠�</param>
/// <returns>鍚堝苟鍚庣殑宸ュ崟鍒楄〃</returns>
- private List<VOrder> VOrders(OrderMachineDto query)
+ private List<VOrdreBycl> VOrders(OrderMachineDto query)
{
- // 鏌ヨ鏈畬宸ヤ笖瀹為檯鏁伴噺涓嶇瓑浜庤鍒掓暟閲忕殑宸ュ崟
- var list = Db.Queryable<VOrder>()
+ var list = Db.Queryable<VOrdreBycl>()
.Where(s => s.Daa018 != "瀹屽伐" &&
s.MachineNo == query.machineNo
- && s.Daa011 != s.Daa008
)
- .Select<VOrder>(s => new VOrder
+ .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
})
.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
})
.ToList();
@@ -67,19 +65,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 +83,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,17 +96,25 @@
/// </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>()
.Where(b => b.MachineNo == query.machineNo
- && b.IsShow == 0).Select(s => s.OrderId)
+ && b.IsShow == 0)
+ .Select(s => s.OrderId)
.ToList();
+ // 鍘婚噸
var decimals = ids.Distinct().ToList();
var date = DateTime.Now.ToString("yyyy-MM-dd");
- return Db.Queryable<VOrder>()
+ // 濡傛灉娌℃湁宸ュ崟ID锛岀洿鎺ヨ繑鍥炵┖鍒楄〃
+ if (decimals.Count == 0)
+ return new List<VOrdreBycl>();
+
+ // 鏌ヨ宸ュ崟瑙嗗浘锛岀瓫閫夊嚭闇�瑕佹樉绀虹殑宸ュ崟
+ return Db.Queryable<VOrdreBycl>()
.Where(c =>
decimals.Contains(c.ID) &&
(c.EditDate == date || c.EditDate == null))
@@ -166,7 +170,7 @@
vOrder.wjQty = vOrder.Daa008 - vOrder.Daa011;
//DevMachine
- var devMachine = Db.Queryable<DevMachine>()
+ var devMachine = Db.Queryable<DevMacBycl>()
.Where(s => s.MachineNo == vOrder.MachineNo)
.First();
--
Gitblit v1.9.3