From 45a69e109d3ed2f3ba6d03f722021d019cb8792a Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期二, 18 十一月 2025 10:40:28 +0800
Subject: [PATCH] 查询报工记录，获取最后一条报工记录，改为实际的工单ID
---
Services/MesOrderStaManager.cs | 90 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 76 insertions(+), 14 deletions(-)
diff --git a/Services/MesOrderStaManager.cs b/Services/MesOrderStaManager.cs
index 702e586..abd4faa 100644
--- a/Services/MesOrderStaManager.cs
+++ b/Services/MesOrderStaManager.cs
@@ -150,12 +150,12 @@
// ================== 涓嶅悎鏍煎悗閲嶆柊閫佹锛團lag == 2锛�==================
else if (entity.Flag == 2)
{
- // 鍔犻攣闃插苟鍙�
+ // 鍔犻攣闃插苟鍙戯紙琛岀骇閿侊級
Db.Ado.ExecuteCommand(
"SELECT ID FROM WOMDAA WHERE DAA001 = :BILL_NO FOR UPDATE",
new SugarParameter("BILL_NO", womdaa.Daa001));
- // 鏌ヨ鏈�鏂版湭浣滃簾棣栨鍗�
+ // 褰撳墠鏈�鏂版湭浣滃簾棣栨鍗�
var latestFirst = Db.Queryable<MesQaItemsDetect02>()
.Where(s => s.Aufnr == womdaa.Daa001
&& s.Ftype == "棣栨"
@@ -163,27 +163,85 @@
.OrderBy(s => s.CreateDate, OrderByType.Desc)
.First();
- // 鍙鏈�鏂伴妫�鍗曚负鈥滀笉鍚堟牸鈥濓紝鍒欏垱寤烘柊鍗�
- if (latestFirst != null && latestFirst.FcheckResu == "涓嶅悎鏍�")
+ bool needReCreate = false;
+
+ if (latestFirst != null)
{
- // 浣滃簾鏃у崟
- Db.Updateable<MesQaItemsDetect02>()
- .SetColumns(s => s.Fcancel == "Y")
- .Where(s => s.Id == latestFirst.Id && (s.Fcancel == null || s.Fcancel != "Y"))
- .ExecuteCommand();
+ var resu = latestFirst.FcheckResu?.Trim();
+ if (!string.IsNullOrEmpty(resu) &&
+ (resu == "涓嶅悎鏍�" || resu.Equals("NG", StringComparison.OrdinalIgnoreCase)))
+ {
+ needReCreate = true;
+ }
+ }
+ else
+ {
+ // 娌℃湁娲诲姩棣栨鍗曪紝鍒ゆ柇鏄惁瀛樺湪宸蹭綔搴熺殑涓嶅悎鏍奸妫�璁板綍
+ var existsCanceledNg = Db.Queryable<MesQaItemsDetect02>()
+ .Where(s => s.Aufnr == womdaa.Daa001
+ && s.Ftype == "棣栨"
+ && s.Fcancel == "Y"
+ && (s.FcheckResu == "涓嶅悎鏍�" || s.FcheckResu == "NG"))
+ .Any();
+ if (existsCanceledNg)
+ {
+ needReCreate = true;
+ Console.WriteLine("[閲嶉�佹] 鏃犳椿鍔ㄩ妫�鍗曚絾瀛樺湪浣滃簾鐨勪笉鍚堟牸璁板綍锛屽厑璁搁噸寤�");
+ }
+ }
- // 鍒涘缓鏂伴妫�鍗�
- Db.Ado.ExecuteCommand(
- "BEGIN AUTOMATIC_IPQC_FIRST_CHECK(:BILL_NO); END;",
- new SugarParameter("BILL_NO", womdaa.Daa001, System.Data.DbType.String));
+ if (needReCreate)
+ {
+ // 浣滃簾褰撳墠娲诲姩涓嶅悎鏍煎崟
+ if (latestFirst != null)
+ {
+ Db.Updateable<MesQaItemsDetect02>()
+ .SetColumns(s => s.Fcancel == "Y")
+ .Where(s => s.Id == latestFirst.Id
+ && (s.Fcancel == null || s.Fcancel != "Y"))
+ .ExecuteCommand();
+ }
- // 鑾峰彇鏂扮敓鎴愮殑棣栨鍗曞苟鍐欏娉�
+ bool procOk = true;
+ string procErr = "";
+ try
+ {
+ // 璋冪敤瀛樺偍杩囩▼鐢熸垚鏂伴妫�鍗�
+ Db.Ado.ExecuteCommand(
+ "BEGIN AUTOMATIC_IPQC_FIRST_CHECK(:BILL_NO); END;",
+ new SugarParameter("BILL_NO", womdaa.Daa001, System.Data.DbType.String));
+ }
+ catch (Exception ex)
+ {
+ procOk = false;
+ procErr = ex.Message;
+ Console.WriteLine($"[閲嶉�佹] 瀛樺偍杩囩▼寮傚父: {procErr}");
+ }
+
+ // 鍐嶆鏌ヨ鏂扮敓鎴愮殑棣栨鍗�
var newLatest = Db.Queryable<MesQaItemsDetect02>()
.Where(s => s.Aufnr == womdaa.Daa001
&& s.Ftype == "棣栨"
&& (s.Fcancel == null || s.Fcancel != "Y"))
.OrderBy(s => s.CreateDate, OrderByType.Desc)
.First();
+
+ // 瀛樺偍杩囩▼鏈敓鎴� 鈫� 鍏滃簳 C# 鑷姩鐢熸垚
+ if (newLatest == null)
+ {
+ Console.WriteLine("[閲嶉�佹] 瀛樺偍杩囩▼鏈敓鎴愶紝鎵ц C# 鍏滃簳閫昏緫");
+ var fallback = mesQaItemsDetect02Manager.AutomaticIpqcFirstCheck(womdaa.Daa001);
+ if (fallback)
+ {
+ newLatest = 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 (newLatest != null)
{
var ts = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
@@ -193,6 +251,10 @@
.Where(s => s.Id == newLatest.Id)
.ExecuteCommand();
}
+ else
+ {
+ Console.WriteLine("[閲嶉�佹] 浠嶆湭鐢熸垚鏂伴妫�鍗曪紝璇锋鏌ュ瓨鍌ㄨ繃绋嬭鏁版槸鍚︽帓闄や綔搴熷崟銆�");
+ }
}
}
--
Gitblit v1.9.3