From 963bfb90d375161eb631009b8ceb50d0c8090a58 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期四, 23 十月 2025 13:57:58 +0800
Subject: [PATCH] 调试

---
 Services/MesOrderStaManager.cs |   50 ++++++++++++++++++++------------------------------
 1 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/Services/MesOrderStaManager.cs b/Services/MesOrderStaManager.cs
index a5c8f89..8e1af31 100644
--- a/Services/MesOrderStaManager.cs
+++ b/Services/MesOrderStaManager.cs
@@ -150,7 +150,11 @@
         // ================== 涓嶅悎鏍煎悗閲嶆柊閫佹锛團lag == 2锛�==================
         else if (entity.Flag == 2)
         {
-            // 浠呭綋鏈�鏂版湁鏁堥妫�涓衡�滀笉鍚堟牸鈥濇椂鎵嶅厑璁搁噸鏂扮敓鎴�
+            // 绗竴鍗曢妫�涓轰笉鍚堟牸鍚庯紝鍥炰紶 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 == "棣栨"
@@ -158,45 +162,31 @@
                 .OrderBy(s => s.CreateDate, OrderByType.Desc)
                 .First();
 
-            if (latestFirst != null && latestFirst.FcheckResu == "涓嶅悎鏍�")
+            // 鏈�鏂版棤璁板綍 鎴� 鏈�鏂颁笉鍚堟牸 -> 鐢熸垚鏂伴妫�鍗�
+            if (latestFirst == null || latestFirst.FcheckResu == "涓嶅悎鏍�")
             {
-                // 琛岀骇閿� + 浜屾纭闃插苟鍙戦噸澶嶇敓鎴�
-                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));
 
-                latestFirst = Db.Queryable<MesQaItemsDetect02>()
+                // 鑾峰彇鍒氱敓鎴愮殑鏂伴妫�鍗曞苟鍐欏娉�
+                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 == "涓嶅悎鏍�")
+                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)
-                    {
-                        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();
-                    }
+                    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();
                 }
             }
+            // 鑻ユ渶鏂板凡鍚堟牸鍒欎笉鐢熸垚鏂板崟锛岀洿鎺ョ户缁悗缁祦绋嬶紙涓嶈鐩栧叾澶囨敞锛�
         }
 
         // ========= 棣栨涓嶅悎鏍兼竻绌洪�佹鏃堕棿澶勭悊锛團lag != 2 鏃舵墠娓呯┖锛涘苟鐢熸垚缁熶竴 remark锛� =========

--
Gitblit v1.9.3