From ef0be0cf267c3b668a6559a921bdec0c0cd30865 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期三, 22 十月 2025 14:58:24 +0800
Subject: [PATCH] Revert "逻辑优化"
---
Services/MesOrderStaManager.cs | 59 +++++++++++------------------------------------------------
1 files changed, 11 insertions(+), 48 deletions(-)
diff --git a/Services/MesOrderStaManager.cs b/Services/MesOrderStaManager.cs
index ea971ba..7e4a650 100644
--- a/Services/MesOrderStaManager.cs
+++ b/Services/MesOrderStaManager.cs
@@ -128,59 +128,19 @@
}
}
- // 鏈�鏂伴妫�鍗�
+ // 缁熶竴鏇存柊鏈�鏂伴妫�澶囨敞
var latestFirst = Db.Queryable<MesQaItemsDetect02>()
.Where(s => s.Aufnr == womdaa.Daa001 && s.Ftype == "棣栨" && (s.Fcancel == null || s.Fcancel != "Y"))
.OrderBy(s => s.CreateDate, OrderByType.Desc)
.First();
-
if (latestFirst != null)
{
- // 濡傛灉鏈�鏂伴妫�涓嶅悎鏍硷細娓呯┖璋冩満閫佹鏃堕棿骞堕噸鏂扮敓鎴愰妫�鍗�
- if (latestFirst.FcheckResu == "涓嶅悎鏍�")
- {
- // 娓呯┖鏁版嵁搴撶殑閫佹鏃堕棿
- InspectionIsUnqualified(new OrderMachineDto
- {
- OrderId = entity.OrderId
- });
- // 閬垮厤鍚庣画鏇存柊鏃跺啀鍐欏叆鏃ч�佹鏃堕棿
- entity.MaShoutTime = null;
-
- // 琛岀骇閿侊紝纭繚閲嶅缓杩囩▼涓茶
- Db.Ado.ExecuteCommand("SELECT ID FROM WOMDAA WHERE DAA001 = :BILL_NO FOR UPDATE",
- new SugarParameter("BILL_NO", womdaa.Daa001));
- // 鐩存帴璋冪敤棣栨鐢熸垚瀛樺偍杩囩▼
- Db.Ado.ExecuteCommand(
- "BEGIN AUTOMATIC_IPQC_FIRST_CHECK(:BILL_NO); END;",
- new SugarParameter("BILL_NO", womdaa.Daa001, System.Data.DbType.String));
-
- // 鑾峰彇閲嶅缓鍚庣殑鏈�鏂伴妫�鍗曞苟鍐欏娉�
- var rebuiltFirst = Db.Queryable<MesQaItemsDetect02>()
- .Where(s => s.Aufnr == womdaa.Daa001 && s.Ftype == "棣栨" && (s.Fcancel == null || s.Fcancel != "Y"))
- .OrderBy(s => s.CreateDate, OrderByType.Desc)
- .First();
-
- if (rebuiltFirst != null)
- {
- var ts2 = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
- var remark2 = $"宸ユ帶鏈轰簬{ts2}閲嶅缓鐨勪笉鍚堟牸鍚庨妫�鍗�";
- Db.Updateable<MesQaItemsDetect02>()
- .SetColumns(s => s.Remeke == remark2)
- .Where(s => s.Id == rebuiltFirst.Id)
- .ExecuteCommand();
- }
- }
- else
- {
- // 鍚堟牸鎴栧叾瀹冪粨鏋滄椂浠呮洿鏂板娉�
- var ts = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
- var remark = $"宸ユ帶鏈轰簬{ts}鑷姩鍒涘缓鐨勯妫�鍗�";
- Db.Updateable<MesQaItemsDetect02>()
- .SetColumns(s => s.Remeke == remark)
- .Where(s => s.Id == latestFirst.Id)
- .ExecuteCommand();
- }
+ var ts = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ var remark = $"宸ユ帶鏈轰簬{ts}鑷姩鍒涘缓鐨勯妫�鍗�";
+ Db.Updateable<MesQaItemsDetect02>()
+ .SetColumns(s => s.Remeke == remark)
+ .Where(s => s.Id == latestFirst.Id)
+ .ExecuteCommand();
}
}
@@ -254,9 +214,12 @@
Db.Insertable<MesAnchors>(eAnchors)
.ExecuteCommand();
- // 鑻ラ�佹鏃堕棿瀛樺湪涓旈妫�鍚堟牸鍒欏啓鍏ヨ皟鏈哄畬鎴愭椂闂�
+
+
+ // 鏂板閫昏緫锛氶�佹鏃堕棿鏈夊�兼椂锛屽垽鏂渶鏂伴妫�鍗曟槸鍚﹀悎鏍硷紝鍚堟牸鍒欏啓鍏ヨ皟鏈哄畬鎴愭椂闂翠负褰撳墠鏃堕棿
if (!string.IsNullOrEmpty(entity.MaShoutTime))
{
+ //閫佹鍛煎彨鏃堕棿蹇呴』澶т簬鎴栫瓑浜庤皟鏈哄紑濮嬫椂闂达紝浠ユ鏉ョ瓫閫夐妫�鍗�
if (DateTime.TryParse(entity.MaShoutTime, out var sjTime) && DateTime.TryParse(entity.MaStartTime, out var startTime))
{
if (sjTime >= startTime)
--
Gitblit v1.9.3