调试

快乐的昕的电脑

2025-10-23 963bfb90d375161eb631009b8ceb50d0c8090a58

 Services/MesOrderStaManager.cs

@@ -150,7 +150,11 @@
        // ================== 不合格后重新送检（Flag == 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();
                }
            }
            // 若最新已合格则不生成新单，直接继续后续流程（不覆盖其备注）
        }

        // ========= 首检不合格清空送检时间处理（Flag != 2 时才清空；并生成统一 remark） =========