From 5a1ea7bd6b736aa2d7b056653cb52f7ed6ec286b Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期五, 17 十月 2025 13:53:35 +0800
Subject: [PATCH] 排序优化
---
Services/MesOrderStaManager.cs | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/Services/MesOrderStaManager.cs b/Services/MesOrderStaManager.cs
index e42f4cd..89adf53 100644
--- a/Services/MesOrderStaManager.cs
+++ b/Services/MesOrderStaManager.cs
@@ -43,9 +43,7 @@
{
// 鏌ヨMesOrderSta琛ㄨ幏鍙栧伐鍗曠姸鎬佽褰�
var mesOrderSta = Db.Queryable<MesOrderSta>()
- // 鏍规嵁宸ュ崟ID鍖归厤璁板綍
.Where(s => s.OrderId == query.OrderId)
- // 鑾峰彇绗竴鏉¤褰�
.First();
// 濡傛灉鏈壘鍒拌褰�,杩斿洖绌哄璞�
@@ -54,8 +52,9 @@
// 鏌ヨWomdaa琛ㄨ幏鍙栧伐鍗曚富琛ㄤ俊鎭�
var womdaa = Db.Queryable<Womdaa>()
.Where(a => a.Id == query.OrderId).First();
- // 璁剧疆宸ュ崟鐘舵��
- mesOrderSta.OrderStatus = womdaa.Daa018;
+
+ // 鍒ょ┖澶勭悊锛岄伩鍏嶇┖寮曠敤寮傚父
+ mesOrderSta.OrderStatus = womdaa != null ? womdaa.Daa018 : null;
return mesOrderSta;
}
@@ -105,15 +104,18 @@
// 濡傛灉鏍囪涓�1,闇�瑕佸鐞嗛妫�鐩稿叧閫昏緫
if (entity.Flag == 1)
{
- // 璋冪敤瀛樺偍杩囩▼鎵ц鑷姩棣栨
- // Db.Ado.ExecuteCommand(
- // "BEGIN AUTOMATIC_IPQC_FIRST_CHECK(:BILL_NO); END;",
- // new SugarParameter("BILL_NO", womdaa.Daa001,
- // DbType.String));
+ //璋冪敤瀛樺偍杩囩▼鎵ц鑷姩棣栨
+ Db.Ado.ExecuteCommand(
+ "BEGIN AUTOMATIC_IPQC_FIRST_CHECK(:BILL_NO); END;",
+ new SugarParameter("BILL_NO", womdaa.Daa001, System.Data.DbType.String));
var automaticIpqcFirstCheck =
mesQaItemsDetect02Manager
.AutomaticIpqcFirstCheck(womdaa.Daa001);
- if (!automaticIpqcFirstCheck) throw new Exception("棣栨鐢熸垚澶辫触");
+ if (!automaticIpqcFirstCheck)
+ {
+ Console.WriteLine($"鑷姩棣栨澶辫触锛屽伐鍗曞彿锛歿womdaa.Daa001}");
+ throw new Exception("棣栨鐢熸垚澶辫触");
+ }
// 鑾峰彇褰撳墠鏃堕棿
var s1 = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
@@ -136,7 +138,7 @@
var editDate = DateTime.Now.ToString("yyyy-MM-dd");
// 鍙戦�丠TTP璇锋眰鍒版暟鎹埛鏂版帴鍙�
- MesNumerical mesNumerical = null;
+ MesNumericalBycl mesNumerical = null;
try
{
using (var httpClient = new HttpClient())
@@ -163,7 +165,7 @@
if (responseObj != null && responseObj.code == 200)
{
// 璇锋眰鎴愬姛锛岃幏鍙朚esNumerical鏁版嵁
- mesNumerical = Db.Queryable<MesNumerical>()
+ mesNumerical = Db.Queryable<MesNumericalBycl>()
.Where(s => s.EditDate == editDate
&& s.MachineNo == entity.MachineNo)
.OrderByDescending(s => s.Id)
@@ -202,6 +204,12 @@
// 濡傛灉鏈夐�佹鏃堕棿鍒欐洿鏂�
.SetColumnsIF(entity.MaShoutTime != null,
s => s.MaShoutTime == entity.MaShoutTime)
+ // 濡傛灉鏈夎皟鏈哄紑濮嬫椂闂村垯鏇存柊
+ .SetColumnsIF(entity.MaStartTime != null,
+ s => s.MaStartTime == entity.MaStartTime)
+ // 濡傛灉鏈夎皟鏈哄畬鎴愭椂闂村垯鏇存柊
+ .SetColumnsIF(entity.MaEndTime != null,
+ s => s.MaEndTime == entity.MaEndTime)
// 濡傛灉鏍囪涓�1鍒欐洿鏂板娉ㄤ俊鎭�
.SetColumnsIF(entity.Flag == 1,
s => s.remark == "浜�" + entity.MaShoutTime + "鏃堕棿鏈変竴娆￠�佹")
@@ -447,7 +455,7 @@
// var reportingOkQty =
// Convert.ToDecimal(vOrder.todayOutput) -
// reporting.OkQty;
- var CjQty = Db.Queryable<MesNumerical>()
+ var CjQty = Db.Queryable<MesNumericalBycl>()
.Where(s => s.MachineNo == entity.MachineNo && s.EditDate == date)
.OrderByDescending(s=>s.CjTiem)
.Select<long?>(s=>s.CjNum).First();
@@ -500,7 +508,7 @@
public bool StateCheck(OrderMachineDto query)
{
// 鏌ヨ宸ュ崟瑙嗗浘淇℃伅
- var vOrder = Db.Queryable<VOrder>()
+ var vOrder = Db.Queryable<VOrderBycl>()
.Where(s => s.ID == query.OrderId).First();
// 鏍规嵁涓嶅悓鎿嶄綔鏍囪瘑杩涜妫�鏌�
@@ -579,7 +587,7 @@
if (binding)
return Db.Updateable<MesOrderSta>()
- .SetColumns(s => s.MaEndTime == endDate)
+ .SetColumns(s => s.MaEndTime == endDate) // 鑷姩鍐欏叆璋冩満瀹屾垚鏃堕棿
.SetColumns(s => s.StartTime == entity.MaShoutTime)
.Where(s => s.OrderId == query.OrderId).ExecuteCommand() > 0;
--
Gitblit v1.9.3