From 9c6fb59b2777a58f071e4eb2ccdf8bac3fdf9e73 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期二, 30 九月 2025 16:05:57 +0800
Subject: [PATCH] 数据源更新
---
Entites/DbModels/VOrderBycl.cs | 14 +++++++++++++-
Services/MesQaItemsDetect02Manager.cs | 2 +-
Services/WomdaaManager.cs | 22 +++++++++++-----------
Services/DeviceMetricsManager.cs | 2 +-
4 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/Entites/DbModels/VOrdrerBycl.cs b/Entites/DbModels/VOrderBycl.cs
similarity index 93%
rename from Entites/DbModels/VOrdrerBycl.cs
rename to Entites/DbModels/VOrderBycl.cs
index 6313a0b..66ecb49 100644
--- a/Entites/DbModels/VOrdrerBycl.cs
+++ b/Entites/DbModels/VOrderBycl.cs
@@ -6,7 +6,7 @@
/// 鏁版嵁婧愬鍏�
/// </summary>
[SugarTable("V_ORDER_BYCL")]
-public class VOrdrerBycl
+public class VOrderBycl
{
/// <summary>
/// </summary>
@@ -177,6 +177,18 @@
[SugarColumn(ColumnName = "PROC_NAME")]
public string? ProcName { get; set; }
+ /// <summary>
+ /// 鎴愬瀷鍛ㄦ湡锛坰锛�
+ /// </summary>
+ [SugarColumn(ColumnName = "CUTTERING_CYC")]
+ public string? cutteringCyc { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_NO")]
+ public string? itemNo { get; set; }
+
[SugarColumn(IsIgnore = true)] public decimal? wjQty { get; set; }
[SugarColumn(IsIgnore = true)] public string? finalResult { get; set; }
}
\ No newline at end of file
diff --git a/Services/DeviceMetricsManager.cs b/Services/DeviceMetricsManager.cs
index a61c5dd..6d14eb9 100644
--- a/Services/DeviceMetricsManager.cs
+++ b/Services/DeviceMetricsManager.cs
@@ -12,7 +12,7 @@
public List<DeviceMetrics> GetListByOrderNo(OrderMachineDto query)
{
- var womdaa = Db.Queryable<VOrder>()
+ var womdaa = Db.Queryable<VOrderBycl> ()
.Where(a => a.ID == query.OrderId).First();
return Db.Queryable<DeviceMetrics>()
diff --git a/Services/MesQaItemsDetect02Manager.cs b/Services/MesQaItemsDetect02Manager.cs
index 2cc2e8b..bad6958 100644
--- a/Services/MesQaItemsDetect02Manager.cs
+++ b/Services/MesQaItemsDetect02Manager.cs
@@ -88,7 +88,7 @@
return UseTransaction(db =>
{
-// 娉ㄥ宸ュ崟澶勭悊
+// 宸ュ崟澶勭悊
if (departmentNo == "XS0101")
{
// 妫�鏌ユ槸鍚﹀凡瀛樺湪棣栨鍗�
diff --git a/Services/WomdaaManager.cs b/Services/WomdaaManager.cs
index a095f73..b763544 100644
--- a/Services/WomdaaManager.cs
+++ b/Services/WomdaaManager.cs
@@ -14,7 +14,7 @@
/// </summary>
/// <param name="query">鍖呭惈鏈哄櫒缂栧彿鍜屽伐鍗曠姸鎬佺殑鏌ヨ鏉′欢</param>
/// <returns>宸ュ崟鍒楄〃</returns>
- public List<VOrdrerBycl> GetWomdaasByEngineeringNo(OrderMachineDto query)
+ public List<VOrderBycl> GetWomdaasByEngineeringNo(OrderMachineDto query)
{
var list = VOrders(query);
@@ -38,16 +38,16 @@
/// </summary>
/// <param name="query">鍖呭惈鏈哄櫒缂栧彿鐨勬煡璇㈡潯浠�</param>
/// <returns>鍚堝苟鍚庣殑宸ュ崟鍒楄〃</returns>
- private List<VOrdrerBycl> VOrders(OrderMachineDto query)
+ private List<VOrderBycl> VOrders(OrderMachineDto query)
{
- var list = Db.Queryable<VOrdrerBycl>()
+ var list = Db.Queryable<VOrderBycl>()
.Where(s => s.Daa018 != "瀹屽伐" &&
s.MachineNo == query.machineNo)
.ToList();
var orders = Db.Queryable<VOrderABycl>()
.Where(s => s.MachineNo == query.machineNo)
- .Select<VOrdrerBycl>()
+ .Select<VOrderBycl>()
.ToList();
list.AddRange(orders);
@@ -63,7 +63,7 @@
/// <returns>
/// 杩斿洖绗﹀悎鏉′欢鐨勫伐鍗曪紙VOrdreBycl锛夊垪琛�
/// </returns>
- public List<VOrdrerBycl> GetWomdaasByMachine(OrderMachineDto query)
+ public List<VOrderBycl> GetWomdaasByMachine(OrderMachineDto query)
{
// 鑾峰彇褰撳墠鏃ユ湡瀛楃涓诧紝鏍煎紡涓� yyyy-MM-dd
var date = DateTime.Now.ToString("yyyy-MM-dd");
@@ -79,7 +79,7 @@
// 1. 鏈哄彴缂栧彿绛変簬浼犲叆鐨刴achineNo
// 2. 缂栬緫鏃ユ湡涓轰粖澶╂垨涓虹┖
// 3. 宸ュ崟ID鍦╥ds闆嗗悎涓�
- return Db.Queryable<VOrdrerBycl>()
+ return Db.Queryable<VOrderBycl>()
.Where(s =>
s.MachineNo == query.machineNo
&& (s.EditDate == date || s.EditDate == null)
@@ -92,7 +92,7 @@
/// </summary>
/// <param name="query">鍖呭惈鏈哄櫒缂栧彿鐨勬煡璇㈡潯浠�</param>
/// <returns>闇�瑕佹樉绀虹殑宸ュ崟鍒楄〃</returns>
- public List<VOrdrerBycl> GetWomdaasByShow(OrderMachineDto query)
+ public List<VOrderBycl> GetWomdaasByShow(OrderMachineDto query)
{
// 鏌ヨ闇�瑕佹樉绀虹殑宸ュ崟ID
var ids = Db.Queryable<MesOrderSelect>()
@@ -107,10 +107,10 @@
// 濡傛灉娌℃湁宸ュ崟ID锛岀洿鎺ヨ繑鍥炵┖鍒楄〃
if (decimals.Count == 0)
- return new List<VOrdrerBycl>();
+ return new List<VOrderBycl>();
// 鏌ヨ宸ュ崟瑙嗗浘锛岀瓫閫夊嚭闇�瑕佹樉绀虹殑宸ュ崟
- return Db.Queryable<VOrdrerBycl>()
+ return Db.Queryable<VOrderBycl>()
.Where(c =>
decimals.Contains(c.ID) &&
(c.EditDate == date || c.EditDate == null))
@@ -122,7 +122,7 @@
/// </summary>
/// <param name="query">鍖呭惈宸ュ崟ID鍜屽伐鍗曞彿鐨勬煡璇㈡潯浠�</param>
/// <returns>宸ュ崟璇︾粏淇℃伅</returns>
- public VOrdrerBycl GetWomdaaById(OrderMachineDto query)
+ public VOrderBycl GetWomdaaById(OrderMachineDto query)
{
var date = DateTime.Now.ToString("yyyy-MM-dd");
@@ -130,7 +130,7 @@
.Where(b => b.OrderNo == query.orderNo && b.EditDate == date)
.Count();
- var VOrdrerBycl = Db.Queryable<VOrdrerBycl>()
+ var VOrdrerBycl = Db.Queryable<VOrderBycl>()
.Where(s => s.ID == query.OrderId)
.WhereIF(count > 0, s => s.EditDate == date)
.OrderByDescending(s => s.workStartDate).First();
--
Gitblit v1.9.3