逻辑优化

快乐的昕的电脑

2025-10-22 731b5b8b9d5826c5e7343d0a7b5254731a522273

逻辑优化

 Services/MesOrderStaManager.cs

@@ -108,66 +108,64 @@
        if (womdaa == null) throw new Exception("工单不存在");

        MesQaItemsDetect02 latestFirst = null;
        var clearMaShout = false; // 标记：是否需要清空送检时间
        var clearMaShout = false;

        if (entity.Flag == 1)
        // 原来限制 entity.Flag == 1，这里取消限制：任何保存动作都评估首检结果
        // 行级锁防并发
        Db.Ado.ExecuteCommand("SELECT ID FROM WOMDAA WHERE DAA001 = :BILL_NO FOR UPDATE",
            new SugarParameter("BILL_NO", womdaa.Daa001));

        // 当前最新首检
        latestFirst = Db.Queryable<MesQaItemsDetect02>()
            .Where(s => s.Aufnr == womdaa.Daa001 && s.Ftype == FirstCheckType && (s.Fcancel == null || s.Fcancel != "Y"))
            .OrderBy(s => s.CreateDate, OrderByType.Desc)
            .First();

        // 结果归一（防止尾部空格或大小写）：可能来源于接口/用户录入
        var latestResult = latestFirst?.FcheckResu?.Trim();

        // 仅在不存在首检单时创建
        if (latestFirst == null)
        {
            // 行级锁防并发
            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>()
                .Where(s => s.Aufnr == womdaa.Daa001 && s.Ftype == FirstCheckType && (s.Fcancel == null || s.Fcancel != "Y"))
                .OrderBy(s => s.CreateDate, OrderByType.Desc)
                .First();

            // 仅在不存在首检单时创建（原“ 不合适 ”已统一改为“ 不合格 ”，且不合格不再触发重建）
            var needCreate = latestFirst == null;

            if (needCreate)
            if (latestFirst != null)
            {
                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>()
                    .Where(s => s.Aufnr == womdaa.Daa001 && s.Ftype == FirstCheckType && (s.Fcancel == null || s.Fcancel != "Y"))
                    .OrderBy(s => s.CreateDate, OrderByType.Desc)
                    .First();

                if (latestFirst != null)
                {
                    var ts = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                    Db.Updateable<MesQaItemsDetect02>()
                        .SetColumns(s => s.Remeke == $"工控机于{ts}自动创建的首检单(首次创建)")
                        .Where(s => s.Id == latestFirst.Id)
                        .ExecuteCommand();
                }
                var ts = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                Db.Updateable<MesQaItemsDetect02>()
                    .SetColumns(s => s.Remeke == $"工控机于{ts}自动创建的首检单(首次创建)")
                    .Where(s => s.Id == latestFirst.Id)
                    .ExecuteCommand();
            }
        }
        else
        {
            // 最新结果为“不合格” => 清空送检时间，不重建
            if (string.Equals(latestResult, FirstCheckResultNG, StringComparison.OrdinalIgnoreCase))
            {
                clearMaShout = true;
                entity.MaShoutTime = null;
                entity.remark = $"最新首检结果“{FirstCheckResultNG}”，已清空送检时间，待再次送检";
            }
            else
            {
                // 最新结果为“不合格” => 仅清空送检时间，不重建
                if (latestFirst != null && latestFirst.FcheckResu == FirstCheckResultNG)
                {
                    clearMaShout = true;
                    entity.MaShoutTime = null;
                    entity.remark = $"最新首检结果“{FirstCheckResultNG}”，已清空送检时间，待再次送检";
                }
                else if (latestFirst != null)
                {
                    // 其它结果（如合格）更新备注
                    var ts = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                    Db.Updateable<MesQaItemsDetect02>()
                        .SetColumns(s => s.Remeke == $"工控机于{ts}首检结果：{latestFirst.FcheckResu}")
                        .Where(s => s.Id == latestFirst.Id)
                        .ExecuteCommand();
                }
                // 其它结果更新备注
                var ts = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                Db.Updateable<MesQaItemsDetect02>()
                    .SetColumns(s => s.Remeke == $"工控机于{ts}首检结果：{latestResult}")
                    .Where(s => s.Id == latestFirst.Id)
                    .ExecuteCommand();
            }
        }

        // 原报工/数采锚点逻辑保持
        // 后续逻辑保持
        var mesReporting = Db.Queryable<MesReporting>()
            .Where(s => s.BillNo == womdaa.Daa001)
            .OrderByDescending(s => s.Id)
@@ -230,7 +228,7 @@
                                   .OrderBy(x => x.CreateDate, OrderByType.Desc)
                                   .First();

                if (sjRecord != null && sjRecord.FcheckResu == FirstCheckResultOK)
                if (sjRecord != null && string.Equals(sjRecord.FcheckResu?.Trim(), FirstCheckResultOK, StringComparison.OrdinalIgnoreCase))
                {
                    QualifiedInspection(new OrderMachineDto
                    {
@@ -244,7 +242,6 @@
            }
        }

        // 更新工单状态表
        var upd = Db.Updateable<MesOrderSta>()
            .SetColumnsIF(clearMaShout, s => s.MaShoutTime == null)
            .SetColumnsIF(!clearMaShout && entity.MaShoutTime != null, s => s.MaShoutTime == entity.MaShoutTime)