查询报工记录，获取最后一条报工记录，改为实际的工单ID

快乐的昕的电脑

2025-11-18 45a69e109d3ed2f3ba6d03f722021d019cb8792a

 Services/MesOrderStaManager.cs

@@ -150,15 +150,12 @@
        // ================== 不合格后重新送检（Flag == 2）==================
        else if (entity.Flag == 2)
        {
            // 首检不合格后直接生成新的首检单：
            // 1. 加锁防并发
            // 2. 若不存在首检 -> 直接生成
            // 3. 若存在且为“不合格” -> 先作废旧单(Fcancel='Y')再生成新单（绕过存储过程内部只允许一单的限制）
            // 4. 若已合格 -> 不生成
            Db.Ado.ExecuteCommand("SELECT ID FROM WOMDAA WHERE DAA001 = :BILL_NO FOR UPDATE",
            // 加锁防并发（行级锁）
            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 == "首检"
@@ -166,36 +163,85 @@
                .OrderBy(s => s.CreateDate, OrderByType.Desc)
                .First();

            var needCreate = false;
            bool needReCreate = false;

            if (latestFirst == null)
            if (latestFirst != null)
            {
                // 没有任何有效首检单，需要创建
                needCreate = true;
                var resu = latestFirst.FcheckResu?.Trim();
                if (!string.IsNullOrEmpty(resu) &&
                    (resu == "不合格" || resu.Equals("NG", StringComparison.OrdinalIgnoreCase)))
                {
                    needReCreate = true;
                }
            }
            else if (latestFirst.FcheckResu == "不合格")
            else
            {
                // 旧单不合格，先作废再创建新单
                Db.Updateable<MesQaItemsDetect02>()
                    .SetColumns(s => s.Fcancel == "Y")
                    .Where(s => s.Id == latestFirst.Id && (s.Fcancel == null || s.Fcancel != "Y"))
                    .ExecuteCommand();
                needCreate = true;
                // 没有活动首检单，判断是否存在已作废的不合格首检记录
                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 (needCreate)
            if (needReCreate)
            {
                Db.Ado.ExecuteCommand(
                    "BEGIN AUTOMATIC_IPQC_FIRST_CHECK(:BILL_NO); END;",
                    new SugarParameter("BILL_NO", womdaa.Daa001, System.Data.DbType.String));
                // 作废当前活动不合格单
                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");
@@ -205,10 +251,12 @@
                        .Where(s => s.Id == newLatest.Id)
                        .ExecuteCommand();
                }
                else
                {
                    Console.WriteLine("[重送检] 仍未生成新首检单，请检查存储过程计数是否排除作废单。");
                }
            }
        // 已有且合格 -> 不执行创建
        // 若最新已合格则不生成新单，直接继续后续流程（不覆盖其备注）
    }
        }

        // ========= 首检不合格清空送检时间处理（Flag != 2 时才清空；并生成统一 remark） =========
        string remarkToSet = null;      // 最终要写入 MES_ORDER_STA.remark 的内容