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 | 218 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 154 insertions(+), 64 deletions(-)
diff --git a/Services/MesOrderStaManager.cs b/Services/MesOrderStaManager.cs
index 94da01b..abd4faa 100644
--- a/Services/MesOrderStaManager.cs
+++ b/Services/MesOrderStaManager.cs
@@ -93,7 +93,10 @@
/// <summary>
/// 鏇存柊鏈哄櫒鏃堕棿骞跺鐞嗛妫�/閲嶉�佹
/// </summary>
- /// <param name="entity">宸ュ崟鐘舵�佸疄浣�,鍖呭惈鏈哄櫒鏃堕棿淇℃伅锛團lag锛�1=棣栨閫佹锛�2=涓嶅悎鏍煎悗閲嶆柊閫佹锛�</param>
+ /// <param name="entity">
+ /// 宸ュ崟鐘舵�佸疄浣�,鍖呭惈鏈哄櫒鏃堕棿淇℃伅
+ /// Flag锛�1 = 棣栨閫佹鍛煎彨锛�2 = 棣栨涓嶅悎鏍煎悗閲嶆柊閫佹锛涘叾瀹冨�间粎鏇存柊鏃堕棿涓嶈Е鍙戦妫�鍗曞垱寤�
+ /// </param>
/// <returns>鏇存柊鏄惁鎴愬姛</returns>
public bool ChangeMachineTime(MesOrderSta entity)
{
@@ -101,18 +104,20 @@
.Where(s => s.Id == entity.OrderId).First();
if (womdaa == null) throw new Exception("宸ュ崟涓嶅瓨鍦�");
+ // ================== 棣栨閫佹澶勭悊锛團lag == 1锛�==================
if (entity.Flag == 1)
{
- // 棣栨閫佹锛氬箓绛夛紝閬垮厤閲嶅鐢熸垚
+ // 骞傜瓑锛氬厛鏌ユ槸鍚﹀凡鏈夋湭浣滃簾鐨勯妫�鍗曪紙閬垮厤閲嶅鐢熸垚锛�
var existsFirst = Db.Queryable<MesQaItemsDetect02>()
.Where(s => s.Aufnr == womdaa.Daa001 && s.Ftype == "棣栨" && (s.Fcancel == null || s.Fcancel != "Y"))
.Any();
if (!existsFirst)
{
- // 琛岀骇閿侀槻骞跺彂
+ // 琛岀骇閿侀槻骞跺彂锛圤racle FOR UPDATE锛�
Db.Ado.ExecuteCommand("SELECT ID FROM WOMDAA WHERE DAA001 = :BILL_NO FOR UPDATE",
new SugarParameter("BILL_NO", womdaa.Daa001));
+
// 浜屾纭
existsFirst = Db.Queryable<MesQaItemsDetect02>()
.Where(s => s.Aufnr == womdaa.Daa001 && s.Ftype == "棣栨" && (s.Fcancel == null || s.Fcancel != "Y"))
@@ -120,7 +125,7 @@
if (!existsFirst)
{
- // 璋冪敤瀛樺偍杩囩▼锛堝崟璺緞锛�
+ // 璋冪敤瀛樺偍杩囩▼鐢熸垚棣栨鍗�
Db.Ado.ExecuteCommand(
"BEGIN AUTOMATIC_IPQC_FIRST_CHECK(:BILL_NO); END;",
new SugarParameter("BILL_NO", womdaa.Daa001, System.Data.DbType.String));
@@ -142,9 +147,15 @@
.ExecuteCommand();
}
}
+ // ================== 涓嶅悎鏍煎悗閲嶆柊閫佹锛團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 == "棣栨"
@@ -152,59 +163,146 @@
.OrderBy(s => s.CreateDate, OrderByType.Desc)
.First();
- // 婊¤冻鏉′欢锛氬瓨鍦ㄦ渶鏂伴妫�涓斿垽瀹氱粨鏋滀负鈥滀笉鍚堟牸鈥�
- if (latestFirst != null && latestFirst.FcheckResu == "涓嶅悎鏍�")
- {
- // 琛岀骇閿�
- Db.Ado.ExecuteCommand("SELECT ID FROM WOMDAA WHERE DAA001 = :BILL_NO FOR UPDATE",
- new SugarParameter("BILL_NO", womdaa.Daa001));
+ bool needReCreate = false;
- // 浜屾纭锛堝啀娆¤鍙栨渶鏂伴妫�锛�
- latestFirst = Db.Queryable<MesQaItemsDetect02>()
+ if (latestFirst != null)
+ {
+ 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("[閲嶉�佹] 鏃犳椿鍔ㄩ妫�鍗曚絾瀛樺湪浣滃簾鐨勪笉鍚堟牸璁板綍锛屽厑璁搁噸寤�");
+ }
+ }
+
+ 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();
- if (latestFirst != null && latestFirst.FcheckResu == "涓嶅悎鏍�")
+ // 瀛樺偍杩囩▼鏈敓鎴� 鈫� 鍏滃簳 C# 鑷姩鐢熸垚
+ if (newLatest == null)
{
- // 鐢熸垚鏂扮殑棣栨鍗曪紙閲嶆柊閫佹锛�
- Db.Ado.ExecuteCommand(
- "BEGIN AUTOMATIC_IPQC_FIRST_CHECK(:BILL_NO); END;",
- new SugarParameter("BILL_NO", womdaa.Daa001, System.Data.DbType.String));
-
- // 鏇存柊鏂扮敓鎴愰妫�鍗曞娉�
- 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();
-
- if (newLatest != null)
+ Console.WriteLine("[閲嶉�佹] 瀛樺偍杩囩▼鏈敓鎴愶紝鎵ц C# 鍏滃簳閫昏緫");
+ var fallback = mesQaItemsDetect02Manager.AutomaticIpqcFirstCheck(womdaa.Daa001);
+ if (fallback)
{
- 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 == newLatest.Id)
- .ExecuteCommand();
+ 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");
+ var remark = $"宸ユ帶鏈轰簬{ts}涓嶅悎鏍奸噸鏂伴�佹鐢熸垚鐨勯妫�鍗�";
+ Db.Updateable<MesQaItemsDetect02>()
+ .SetColumns(s => s.Remeke == remark)
+ .Where(s => s.Id == newLatest.Id)
+ .ExecuteCommand();
+ }
+ else
+ {
+ Console.WriteLine("[閲嶉�佹] 浠嶆湭鐢熸垚鏂伴妫�鍗曪紝璇锋鏌ュ瓨鍌ㄨ繃绋嬭鏁版槸鍚︽帓闄や綔搴熷崟銆�");
}
}
}
- // 鍘熼�昏緫淇濇寔...
+ // ========= 棣栨涓嶅悎鏍兼竻绌洪�佹鏃堕棿澶勭悊锛團lag != 2 鏃舵墠娓呯┖锛涘苟鐢熸垚缁熶竴 remark锛� =========
+ string remarkToSet = null; // 鏈�缁堣鍐欏叆 MES_ORDER_STA.remark 鐨勫唴瀹�
+ var clearMaShoutTime = false; // 鏄惁闇�瑕佺湡姝ｅ啓 null 娓呯┖閫佹鏃堕棿
+
+ if (entity.Flag == 1)
+ {
+ // 棣栨閫佹鎻愪氦
+ if (!string.IsNullOrEmpty(entity.MaShoutTime))
+ remarkToSet = $"浜巤entity.MaShoutTime}鏃堕棿鏈変竴娆￠�佹";
+ }
+ else if (entity.Flag == 2)
+ {
+ // 涓嶅悎鏍奸噸鏂伴�佹锛堜笉娓呯┖閫佹鏃堕棿锛岀敱鍓嶇鍙兘瑕嗙洊涓烘柊鏃堕棿锛�
+ if (!string.IsNullOrEmpty(entity.MaShoutTime))
+ remarkToSet = $"浜巤entity.MaShoutTime}鏃堕棿涓嶅悎鏍奸噸鏂伴�佹";
+ }
+
+ // 闈為噸鏂伴�佹鍦烘櫙锛團lag!=2锛夋墠妫�鏌ユ槸鍚﹂渶瑕佸洜鈥滀笉鍚堟牸鈥濇竻绌洪�佹鏃堕棿
+ if (entity.Flag != 2)
+ {
+ var latestFirstCheck = 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 (latestFirstCheck != null && latestFirstCheck.FcheckResu == "涓嶅悎鏍�")
+ {
+ entity.MaShoutTime = null; // 缃┖瀹炰綋锛堝悗闈㈡洿鏂版椂浣跨敤锛�
+ clearMaShoutTime = true;
+ remarkToSet = "棣栨涓嶅悎鏍硷紝閫佹鏃堕棿宸叉竻绌猴紝璇烽噸鏂伴�佹鍛煎彨鐢熸垚鏂扮殑棣栨鍗�";
+ }
+ }
+ // ========= 棣栨涓嶅悎鏍兼竻绌洪�佹鏃堕棿澶勭悊缁撴潫 =========
+
+ // ================== 閲囬泦鏁�/閿氱偣 Anchors 澶勭悊 ==================
var mesReporting = Db.Queryable<MesReporting>()
.Where(s => s.BillNo == womdaa.Daa001)
.OrderByDescending(s => s.Id)
.First();
-
var editDate = DateTime.Now.ToString("yyyy-MM-dd");
- // 鍙戦�丠TTP璇锋眰鍒版暟鎹埛鏂版帴鍙�
+ // 鍙戦�丠TTP璇锋眰鍒锋柊璁惧閲囬泦鏁版嵁锛堝け璐ヤ笉闃绘柇鍚庣画锛�
MesNumericalBycl mesNumerical = null;
try
{
@@ -221,16 +319,12 @@
if (response.IsSuccessStatusCode)
{
- var responseString = response.Content.ReadAsStringAsync()
- .GetAwaiter().GetResult();
+ var responseString = response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
var responseObj = JsonConvert.DeserializeObject<dynamic>(responseString);
-
if (responseObj != null && responseObj.code == 200)
{
- // 璇锋眰鎴愬姛锛岃幏鍙朚esNumerical鏁版嵁
mesNumerical = Db.Queryable<MesNumericalBycl>()
- .Where(s => s.EditDate == editDate
- && s.MachineNo == entity.MachineNo)
+ .Where(s => s.EditDate == editDate && s.MachineNo == entity.MachineNo)
.OrderByDescending(s => s.Id)
.First();
}
@@ -239,15 +333,12 @@
}
catch (Exception ex)
{
- // 璁板綍寮傚父浣嗕笉闃绘娴佺▼
Console.WriteLine($"鍙戦�佹暟鎹埛鏂拌姹傛椂鍑洪敊: {ex.Message}");
}
- // 濡傛灉璇锋眰澶辫触鎴栬幏鍙栨暟鎹け璐ワ紝mesNumerical灏嗕繚鎸佷负null
-
+ // 鍒犻櫎骞堕噸寤哄綋鏃ラ敋鐐硅褰�
Db.Deleteable<MesAnchors>()
- .Where(a => a.EditDate == editDate
- && a.OrderId == womdaa.Id)
+ .Where(a => a.EditDate == editDate && a.OrderId == womdaa.Id)
.ExecuteCommand();
MesAnchors eAnchors = new MesAnchors
@@ -260,15 +351,14 @@
};
Db.Insertable<MesAnchors>(eAnchors).ExecuteCommand();
- // 閫佹鍚堟牸鑷姩璋冩満瀹屾垚涓庡紑宸�
- if (!string.IsNullOrEmpty(entity.MaShoutTime))
+ // ================== 棣栨鍚堟牸 -> 鑷姩璋冩満瀹屾垚 + 鍐欏叆寮�宸ユ椂闂� ==================
+ if (!clearMaShoutTime && !string.IsNullOrEmpty(entity.MaShoutTime)) // 鏈娓呯┖鐨勫墠鎻愪笅鎵嶅垽鏂悎鏍奸�昏緫
{
if (DateTime.TryParse(entity.MaShoutTime, out var sjTime) &&
DateTime.TryParse(entity.MaStartTime, out var startTime))
{
if (sjTime >= startTime)
{
- // 鏌ユ壘璇ュ伐鍗曞彿涓嬫渶鏂扮殑棣栨鍗�
var sjRecord = Db.Queryable<MesQaItemsDetect02>()
.Where(x => x.Aufnr == womdaa.Daa001 && x.Ftype == "棣栨" && (x.Fcancel == null || x.Fcancel != "Y"))
.OrderBy(x => x.CreateDate, OrderByType.Desc)
@@ -276,41 +366,41 @@
if (sjRecord != null && sjRecord.FcheckResu == "鍚堟牸")
{
- // 浣跨敤QualifiedInspection鏂规硶鏇存柊宸ュ崟鐘舵��
QualifiedInspection(new OrderMachineDto
{
OrderId = entity.OrderId,
orderNo = entity.OrderNo,
machineNo = entity.MachineNo
});
- //灏嗛�佹鏃堕棿鍐欏叆寮�宸ユ椂闂�
+ // 灏嗛�佹鏃堕棿鍐欏叆寮�宸ユ椂闂�
entity.StartTime = entity.MaShoutTime;
entity.MaEndTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ // 鑻ヤ箣鍓� remark 鏄�滈�佹鈥濆彲缁х画娌跨敤锛涗笉寮哄埗瑕嗙洊
}
}
}
}
- // 鏇存柊宸ュ崟鐘舵�佽〃
+ // ================== 鏈�缁堟洿鏂� MES_ORDER_STA ==================
return Db.Updateable<MesOrderSta>()
- // 濡傛灉鏈夐�佹鏃堕棿鍒欐洿鏂�
- .SetColumnsIF(entity.MaShoutTime != null,
+ // 閫佹鏃堕棿鏇存柊锛氳嫢闇�瑕佹竻绌哄垯鏄庣‘璧� null锛涘惁鍒欏綋鏈夊�兼椂鏇存柊
+ .SetColumnsIF(clearMaShoutTime, s => s.MaShoutTime == null)
+ .SetColumnsIF(!clearMaShoutTime && 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)
- // 濡傛灉鏈夊紑宸ユ椂闂村垯鏇存柊
+ // 寮�宸ユ椂闂�
.SetColumnsIF(entity.StartTime != null,
s => s.StartTime == entity.StartTime)
- // 濡傛灉鏍囪涓�1鍒欐洿鏂板娉ㄤ俊鎭�
- .SetColumnsIF(entity.Flag == 1,
- s => s.remark == "浜�" + entity.MaShoutTime + "鏃堕棿鏈変竴娆￠�佹")
- // 鏍规嵁ID鍖归厤璁板綍
+ // 缁熶竴澶囨敞锛堢敱鍓嶉潰閫昏緫纭畾锛�
+ .SetColumnsIF(!string.IsNullOrEmpty(remarkToSet),
+ s => s.remark == remarkToSet)
+ // 杩囨护褰撳墠璁板綍
.Where(s => s.Id == entity.Id)
- // 鎵ц鏇存柊骞跺垽鏂奖鍝嶈鏁版槸鍚﹀ぇ浜�0
.ExecuteCommand() > 0;
}
--
Gitblit v1.9.3