不合格后重送检逻辑_2

快乐的昕的电脑

2025-10-23 810818b52ac65bd701c9582571be23ded5aea776

 Services/MesOrderStaManager.cs

@@ -150,7 +150,15 @@
        // ================== 不合格后重新送检（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",
                new SugarParameter("BILL_NO", womdaa.Daa001));

            // 最新未作废首检单
            var latestFirst = Db.Queryable<MesQaItemsDetect02>()
                .Where(s => s.Aufnr == womdaa.Daa001
                            && s.Ftype == "首检"
@@ -158,46 +166,49 @@
                .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));
            var needCreate = false;

                latestFirst = Db.Queryable<MesQaItemsDetect02>()
            if (latestFirst == null)
            {
                // 没有任何有效首检单，需要创建
                needCreate = true;
            }
            else if (latestFirst.FcheckResu == "不合格")
            {
                // 旧单不合格，先作废再创建新单
                Db.Updateable<MesQaItemsDetect02>()
                    .SetColumns(s => s.Fcancel == "Y")
                    .Where(s => s.Id == latestFirst.Id && (s.Fcancel == null || s.Fcancel != "Y"))
                    .ExecuteCommand();
                needCreate = true;
            }

            if (needCreate)
            {
                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 (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();
                }
            }
        }
        // 已有且合格 -> 不执行创建
        // 若最新已合格则不生成新单，直接继续后续流程（不覆盖其备注）
    }

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