存储过程未生成 → 兜底 C# 自动生成

快乐的昕的电脑

2025-11-18 62922f98de63b19f54c12a6ad8b39d61b62011ed

 Services/MesOrderStaManager.cs

@@ -91,9 +91,12 @@
    }

    /// <summary>
    ///     更新机器时间并处理首检
    ///     更新机器时间并处理首检/重送检
    /// </summary>
    /// <param name="entity">工单状态实体,包含机器时间信息</param>
    /// <param name="entity">
    ///     工单状态实体,包含机器时间信息
    ///     Flag：1 = 首次送检呼叫；2 = 首检不合格后重新送检；其它值仅更新时间不触发首检单创建
    /// </param>
    /// <returns>更新是否成功</returns>
    public bool ChangeMachineTime(MesOrderSta entity)
    {
@@ -101,31 +104,57 @@
            .Where(s => s.Id == entity.OrderId).First();
        if (womdaa == null) throw new Exception("工单不存在");

        // ================== 首次送检处理（Flag == 1）==================
        if (entity.Flag == 1)
        {
            // 幂等：先查是否已有首检
            // 幂等：先查是否已有未作废的首检单（避免重复生成）
            var existsFirst = Db.Queryable<MesQaItemsDetect02>()
                .Where(s => s.Aufnr == womdaa.Daa001 && s.Ftype == "首检" && (s.Fcancel == null || s.Fcancel != "Y"))
                .Any();

            if (!existsFirst)
            {
                // 行级锁防并发：锁工单行
                // 行级锁防并发（Oracle FOR UPDATE）
                Db.Ado.ExecuteCommand("SELECT ID FROM WOMDAA WHERE DAA001 = :BILL_NO FOR UPDATE",
                    new SugarParameter("BILL_NO", womdaa.Daa001));

                // 再次确认
                // 二次确认
                existsFirst = Db.Queryable<MesQaItemsDetect02>()
                    .Where(s => s.Aufnr == womdaa.Daa001 && s.Ftype == "首检" && (s.Fcancel == null || s.Fcancel != "Y"))
                    .Any();

                if (!existsFirst)
                {
                    // 调用存储过程（单路径）
                    // 调用存储过程生成首检单
                    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();

                // 存储过程未生成 → 兜底 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();
                    }
                }

            }

            // 统一更新最新首检备注
@@ -143,47 +172,200 @@
                    .ExecuteCommand();
            }
        }
        // ================== 不合格后重新送检（Flag == 2）==================
        else if (entity.Flag == 2)
        {
            // 1.加锁防并发（行级锁）
            Db.Ado.ExecuteCommand(
                "SELECT ID FROM WOMDAA WHERE DAA001 = :BILL_NO FOR UPDATE",
                new SugarParameter("BILL_NO", womdaa.Daa001));

        // 原逻辑保持...
            // 2. 当前最新未作废首检单
            var latestFirst = Db.Queryable<MesQaItemsDetect02>()
                .Where(s => s.Aufnr == womdaa.Daa001
                            && s.Ftype == "首检"
                            && (s.Fcancel == null || s.Fcancel != "Y"))
                .OrderBy(s => s.CreateDate, OrderByType.Desc)
                .First();

            bool needReCreate = false;
            /*
             3. 判断是否需要重新生成首检单
•   如果最新首检单存在且结果为“不合格”或“NG”，则需要重建首检单。
•   如果没有活动首检单，但存在已作废的不合格首检记录，也允许重建。
             */
            if (latestFirst != null)
            {
                var resu = latestFirst.FcheckResu?.Trim();
                if (!string.IsNullOrEmpty(resu) &&
                    (resu == "不合格" || resu.Equals("NG", StringComparison.OrdinalIgnoreCase)))
                {
                    needReCreate = true;
                }
            }
            else
            {
                // 4. 没有活动首检单，判断是否存在已作废的不合格首检记录
                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 (needReCreate)
            {
                // 作废当前活动不合格单
                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
                {
                    // 5. 调用存储过程生成新首检单
                    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();
                    }
                }

                //6. 新首检单生成后，写入备注

                var ts = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                //只有开工状态下可以暂停工单
                //当首检结果为‘合格’、‘不合格’时，更新备注
                if (newLatest != null && newLatest.FcheckResu == "合格")
                {
                    var remark = $"工控机于{ts}取消暂停重新送检生成的首检单";
                    Db.Updateable<MesQaItemsDetect02>()
                        .SetColumns(s => s.Remeke == remark)
                        .Where(s => s.Id == newLatest.Id)
                        .ExecuteCommand();
                }
                else if (newLatest != null && newLatest.FcheckResu == "不合格")
                {
                    var remark = $"工控机于{ts}不合格重新送检生成的首检单";
                    Db.Updateable<MesQaItemsDetect02>()
                        .SetColumns(s => s.Remeke == remark)
                        .Where(s => s.Id == newLatest.Id)
                        .ExecuteCommand();
                }
                else
                {
                    Console.WriteLine("[重送检] 仍未生成新首检单，请检查存储过程计数是否排除作废单。");
                }
            }
        }

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

        if (entity.Flag == 1)
        {
            // 首次送检提交
            if (!string.IsNullOrEmpty(entity.MaShoutTime))
                remarkToSet = $"于{entity.MaShoutTime}时间有一次送检";
        }
        else if (entity.Flag == 2)
        {
            // 不合格重新送检（不清空送检时间，由前端可能覆盖为新时间）
            if (!string.IsNullOrEmpty(entity.MaShoutTime))
                remarkToSet = $"于{entity.MaShoutTime}时间不合格重新送检";
        }

        // 非重新送检场景（Flag!=2）才检查是否需要因“不合格”清空送检时间
        if (entity.Flag != 2)
        {
            var latestFirstCheck = 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 (latestFirstCheck != null && latestFirstCheck.FcheckResu == "不合格")
            {
                entity.MaShoutTime = null;  // 置空实体（后面更新时使用）
                clearMaShoutTime = true;
                remarkToSet = "首检不合格，送检时间已清空，请重新送检呼叫生成新的首检单";
            }
        }
        // ========= 首检不合格清空送检时间处理结束 =========

        // ================== 采集数/锚点 Anchors 处理 ==================
        var mesReporting = Db.Queryable<MesReporting>()
            .Where(s => s.BillNo == womdaa.Daa001)
            .OrderByDescending(s => s.Id)
            .First();


        var editDate = DateTime.Now.ToString("yyyy-MM-dd");

        // 发送HTTP请求到数据刷新接口
        // 发送HTTP请求刷新设备采集数据（失败不阻断后续）
        MesNumericalBycl mesNumerical = null;
        try
        {
            using (var httpClient = new HttpClient())
            {
                httpClient.Timeout = TimeSpan.FromSeconds(30);

                var content = new StringContent(
                    JsonConvert.SerializeObject(new
                    { machineNo = entity.MachineNo }),
                    JsonConvert.SerializeObject(new { machineNo = entity.MachineNo }),
                    Encoding.UTF8,
                    "application/json");

                var response = httpClient
                    .PostAsync("http://192.168.0.94:9095/Numerical/RefreshDevBycl",
                        content).GetAwaiter().GetResult();
                    .PostAsync("http://192.168.0.94:9095/Numerical/RefreshDevBycl", content)
                    .GetAwaiter().GetResult();

                if (response.IsSuccessStatusCode)
                {
                    var responseString = response.Content.ReadAsStringAsync()
                        .GetAwaiter().GetResult();
                    var responseObj =
                        JsonConvert.DeserializeObject<dynamic>(responseString);

                    var responseString = response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
                    var responseObj = JsonConvert.DeserializeObject<dynamic>(responseString);
                    if (responseObj != null && responseObj.code == 200)
                    {
                        // 请求成功，获取MesNumerical数据
                        mesNumerical = Db.Queryable<MesNumericalBycl>()
                            .Where(s => s.EditDate == editDate
                                        && s.MachineNo == entity.MachineNo)
                            .Where(s => s.EditDate == editDate && s.MachineNo == entity.MachineNo)
                            .OrderByDescending(s => s.Id)
                            .First();
                    }
@@ -192,15 +374,12 @@
        }
        catch (Exception ex)
        {
            // 记录异常但不阻止流程
            Console.WriteLine($"发送数据刷新请求时出错: {ex.Message}");
        }

        // 如果请求失败或获取数据失败，mesNumerical将保持为null

        // 删除并重建当日锚点记录
        Db.Deleteable<MesAnchors>()
            .Where(a => a.EditDate == editDate
                        && a.OrderId == womdaa.Id)
            .Where(a => a.EditDate == editDate && a.OrderId == womdaa.Id)
            .ExecuteCommand();

        MesAnchors eAnchors = new MesAnchors
@@ -211,62 +390,58 @@
            Qty = mesReporting == null ? 0 : (long?)(mesReporting.DyQty ?? 0),
            InitialValue = mesNumerical == null ? 0 : mesNumerical.CjNum
        };
        Db.Insertable<MesAnchors>(eAnchors)
            .ExecuteCommand();
        Db.Insertable<MesAnchors>(eAnchors).ExecuteCommand();



        // 新增逻辑：送检时间有值时，判断最新首检单是否合格，合格则写入调机完成时间为当前时间
        if (!string.IsNullOrEmpty(entity.MaShoutTime))
        // ================== 首检合格 -> 自动调机完成 + 写入开工时间 ==================
        if (!clearMaShoutTime && !string.IsNullOrEmpty(entity.MaShoutTime)) // 未被清空的前提下才判断合格逻辑
        {
            //送检呼叫时间必须大于或等于调机开始时间，以此来筛选首检单
            if (DateTime.TryParse(entity.MaShoutTime, out var sjTime) && DateTime.TryParse(entity.MaStartTime, out var startTime))
            if (DateTime.TryParse(entity.MaShoutTime, out var sjTime) &&
                DateTime.TryParse(entity.MaStartTime, out var startTime))
            {
                if (sjTime >= startTime)
                {
                    // 查找该工单号下最新的首检单
                    var sjRecord = Db.Queryable<MesQaItemsDetect02>()
                        .Where(x => x.Aufnr == womdaa.Daa001 && x.Ftype == "首检")
                        .Where(x => x.Aufnr == womdaa.Daa001 && x.Ftype == "首检" && (x.Fcancel == null || x.Fcancel != "Y"))
                        .OrderBy(x => x.CreateDate, OrderByType.Desc)
                        .First();

                    if (sjRecord != null && sjRecord.FcheckResu == "合格")
                    {
                        // 使用QualifiedInspection方法更新工单状态
                        QualifiedInspection(new OrderMachineDto
                        {
                            OrderId = entity.OrderId,
                            orderNo = entity.OrderNo,
                            machineNo = entity.MachineNo
                        });
                        //将送检时间写入开工时间
                        // 将送检时间写入开工时间
                        entity.StartTime = entity.MaShoutTime;
                        entity.MaEndTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                        // 若之前 remark 是“送检”可继续沿用；不强制覆盖
                    }
                }
            }
        }

        // 更新工单状态表
        // ================== 最终更新 MES_ORDER_STA ==================
        return Db.Updateable<MesOrderSta>()
            // 如果有送检时间则更新
            .SetColumnsIF(entity.MaShoutTime != null,
            // 送检时间更新：若需要清空则明确赋 null；否则当有值时更新
            .SetColumnsIF(clearMaShoutTime, s => s.MaShoutTime == null)
            .SetColumnsIF(!clearMaShoutTime && entity.MaShoutTime != null,
                s => s.MaShoutTime == entity.MaShoutTime)
            // 如果有调机开始时间则更新
            // 调机开始时间
            .SetColumnsIF(entity.MaStartTime != null,
                s => s.MaStartTime == entity.MaStartTime)
            // 如果有调机完成时间则更新
            // 调机完成时间
            .SetColumnsIF(entity.MaEndTime != null,
                s => s.MaEndTime == entity.MaEndTime)
            // 如果有开工时间则更新
            // 开工时间
            .SetColumnsIF(entity.StartTime != null,
                s => s.StartTime == entity.StartTime)
            // 如果标记为1则更新备注信息
            .SetColumnsIF(entity.Flag == 1,
                s => s.remark == "于" + entity.MaShoutTime + "时间有一次送检")
            // 根据ID匹配记录
            // 统一备注（由前面逻辑确定）
            .SetColumnsIF(!string.IsNullOrEmpty(remarkToSet),
                s => s.remark == remarkToSet)
            // 过滤当前记录
            .Where(s => s.Id == entity.Id)
            // 执行更新并判断影响行数是否大于0
            .ExecuteCommand() > 0;
    }