From 414050ab3157ab7bc35ad5218594393711d2e447 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期一, 13 十月 2025 16:09:28 +0800
Subject: [PATCH] Revert "BUG修改"
---
Services/MesOrderStaManager.cs | 28 ++++++++--------------------
1 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/Services/MesOrderStaManager.cs b/Services/MesOrderStaManager.cs
index 34bfe3c..62948a3 100644
--- a/Services/MesOrderStaManager.cs
+++ b/Services/MesOrderStaManager.cs
@@ -104,11 +104,10 @@
// 濡傛灉鏍囪涓�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);
@@ -204,6 +203,9 @@
// 濡傛灉鏈夎皟鏈哄紑濮嬫椂闂村垯鏇存柊
.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 + "鏃堕棿鏈変竴娆￠�佹")
@@ -581,7 +583,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;
@@ -616,18 +618,4 @@
// 鏇存柊宸ュ崟鏃堕棿鍜岀姸鎬�
return UpdateTime(entity);
}
-
- /// <summary>
- /// 鍒�鍏锋煡璇紙鏀寔缂栧彿鎴栧悕绉版ā绯婃煡璇級
- /// </summary>
- /// <param name="searchKey">鏌ヨ鍏抽敭瀛�</param>
- /// <returns>鍒�鍏峰垪琛�</returns>
- public List<MesCutterLedger> QueryTools(string searchKey)
- {
- return Db.Queryable<MesCutterLedger>()
- .WhereIF(!string.IsNullOrEmpty(searchKey),
- t => t.CutterId.Contains(searchKey) || t.CutterName.Contains(searchKey))
- .ToList();
- }
-
}
\ No newline at end of file
--
Gitblit v1.9.3