不合格后重送检逻辑_2

快乐的昕的电脑

2025-10-23 810818b52ac65bd701c9582571be23ded5aea776

 Services/MesOrderStaManager.cs

@@ -91,83 +91,192 @@
    }

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

        // 如果标记为1,需要处理首检相关逻辑
        // ================== 首次送检处理（Flag == 1）==================
        if (entity.Flag == 1)
        {
            //调用存储过程执行自动首检
             Db.Ado.ExecuteCommand(
                 "BEGIN AUTOMATIC_IPQC_FIRST_CHECK(:BILL_NO); END;",
                 new SugarParameter("BILL_NO", womdaa.Daa001, System.Data.DbType.String));
            var automaticIpqcFirstCheck =
                mesQaItemsDetect02Manager
                    .AutomaticIpqcFirstCheck(womdaa.Daa001);
            if (!automaticIpqcFirstCheck)
            // 幂等：先查是否已有未作废的首检单（避免重复生成）
            var existsFirst = Db.Queryable<MesQaItemsDetect02>()
                .Where(s => s.Aufnr == womdaa.Daa001 && s.Ftype == "首检" && (s.Fcancel == null || s.Fcancel != "Y"))
                .Any();

            if (!existsFirst)
            {
                Console.WriteLine($"自动首检失败，工单号：{womdaa.Daa001}");
                throw new Exception("首检生成失败");
                // 行级锁防并发（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 s1 = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
            // 生成首检备注信息
            var remeke = "工控机于" + s1 + "自动创建的首检单";
            // 统一更新最新首检备注
            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();
            if (latestFirst != 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 == latestFirst.Id)
                    .ExecuteCommand();
            }
        }
        // ================== 不合格后重新送检（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));

            // 更新首检单备注信息
            Db.Updateable<MesQaItemsDetect02>()
                .SetColumns(s => s.Remeke == remeke)
                .Where(s => s.Ftype == "首检" && s.Aufnr == womdaa.Daa001)
                .ExecuteCommand();
            // 最新未作废首检单
            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();

            var needCreate = false;

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

        // ========= 首检不合格清空送检时间处理（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/RefreshDev",
                        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();
                    }
@@ -176,15 +285,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
@@ -192,24 +298,61 @@
            OrderId = womdaa.Id,
            OrderNo = womdaa.Daa001,
            EditDate = editDate,
            Qty = mesReporting == null ? 0 : Int64.Parse(mesReporting.DyQty),
            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 (!clearMaShoutTime && !string.IsNullOrEmpty(entity.MaShoutTime)) // 未被清空的前提下才判断合格逻辑
        {
            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 == "首检" && (x.Fcancel == null || x.Fcancel != "Y"))
                        .OrderBy(x => x.CreateDate, OrderByType.Desc)
                        .First();

        // 更新工单状态表
                    if (sjRecord != null && sjRecord.FcheckResu == "合格")
                    {
                        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>()
            // 如果有调机完成时间则更新
            // 送检时间更新：若需要清空则明确赋 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)
            // 如果标记为1则更新备注信息
            .SetColumnsIF(entity.Flag == 1,
                s => s.remark == "于" + entity.MaShoutTime + "时间有一次送检")
            // 根据ID匹配记录
            // 开工时间
            .SetColumnsIF(entity.StartTime != null,
                s => s.StartTime == entity.StartTime)
            // 统一备注（由前面逻辑确定）
            .SetColumnsIF(!string.IsNullOrEmpty(remarkToSet),
                s => s.remark == remarkToSet)
            // 过滤当前记录
            .Where(s => s.Id == entity.Id)
            // 执行更新并判断影响行数是否大于0
            .ExecuteCommand() > 0;
    }

@@ -363,125 +506,125 @@

                    break;
                case "完工":
                {
                    // 更新工单选择表显示状态
                    // Db.Updateable<MesOrderSelect>()
                    //     .SetColumns(a => a.IsShow == 1)
                    //     .Where(a => orderIds.Contains(a.OrderId))
                    //     .ExecuteCommand();

                    // 更新工单状态表
                    // Db.Updateable<MesOrderSta>()
                    //     .SetColumns(a => a.IsShow == 0)
                    //     .SetColumns(a => a.EndTime == endDate)
                    //     .Where(a => orderIds.Contains(a.OrderId))
                    //     .ExecuteCommand();

                    // 处理每个工单的报工数据
                    foreach (var orderId in orderIds)
                    {
                        // 查询工单主表信息
                        var womdaa = Db.Queryable<Womdaa>()
                            .Where(s => s.Id == orderId).First();
                        // 更新工单选择表显示状态
                        // Db.Updateable<MesOrderSelect>()
                        //     .SetColumns(a => a.IsShow == 1)
                        //     .Where(a => orderIds.Contains(a.OrderId))
                        //     .ExecuteCommand();

                        //当已生成数不等于完工数是就跳过
                        if (womdaa.Daa008 > womdaa.Daa011)
                        // 更新工单状态表
                        // Db.Updateable<MesOrderSta>()
                        //     .SetColumns(a => a.IsShow == 0)
                        //     .SetColumns(a => a.EndTime == endDate)
                        //     .Where(a => orderIds.Contains(a.OrderId))
                        //     .ExecuteCommand();

                        // 处理每个工单的报工数据
                        foreach (var orderId in orderIds)
                        {
                            updateable += 1;
                            continue;
                            // 查询工单主表信息
                            var womdaa = Db.Queryable<Womdaa>()
                                .Where(s => s.Id == orderId).First();

                            //当已生成数不等于完工数是就跳过
                            if (womdaa.Daa008 > womdaa.Daa011)
                            {
                                updateable += 1;
                                continue;
                            }

                            var btnLog = new MesWorkorderBtnLog
                            {
                                WorkNo = womdaa.Daa001,
                                BtnType = "工控自动完工",
                                BtnDate = DateTime.Now
                            };
                            db.Insertable<MesWorkorderBtnLog>(btnLog)
                                .ExecuteCommand();

                            // 更新工单主表状态 - 这里将Womdaa表的daa018更新为完工状态
                            updateable = db.Updateable<Womdaa>()
                                .SetColumns(s => s.Daa018 == daa018)
                                .SetColumnsIF("完工".Equals(daa018),
                                    s => s.Daa017 == DateTime.Now)
                                .SetColumnsIF("暂停".Equals(daa018),
                                    s => s.Daa034 == DateTime.Now)
                                .Where(s => s.Id == orderId).ExecuteCommand();

                            // Db.Deleteable<MesOrderSelect>()
                            //     .Where(a =>  a.OrderId == orderId)
                            //     .ExecuteCommand();
                            //
                            // Db.Deleteable<MesOrderSta>()
                            //     .Where(a => a.OrderId == orderId)
                            //     .ExecuteCommand();
                            //更新工单选择表显示状态
                            db.Updateable<MesOrderSelect>()
                                .SetColumns(a => a.IsShow == 1)
                                .Where(a => a.OrderId == orderId)
                                .ExecuteCommand();

                            //更新工单状态表
                            db.Updateable<MesOrderSta>()
                                .SetColumns(a => a.IsShow == 0)
                                .SetColumns(a => a.EndTime == endDate)
                                .Where(a => a.OrderId == orderId)
                                .ExecuteCommand();

                            // 查询已报工数量
                            var reporting = db.Queryable<MesReporting>()
                                .Where(s => s.BillNo == womdaa.Daa001)
                                .Select(s => new MesReporting
                                {
                                    OkQty = SqlFunc.AggregateSum(s.OkQty),
                                    BfQty = SqlFunc.AggregateSum(s.BfQty)
                                }).First();

                            reporting.OkQty ??= 0;
                            reporting.BfQty ??= 0;

                            // 查询工单视图信息
                            // var vOrder = db.Queryable<VOrder>()
                            //     .Where(s => s.ID == orderId).First();

                            // 计算待报工数量
                            // var reportingOkQty =
                            //     Convert.ToDecimal(vOrder.todayOutput) -
                            //     reporting.OkQty;
                            var CjQty = Db.Queryable<MesNumericalBycl>()
                                .Where(s => s.MachineNo == entity.MachineNo && s.EditDate == date)
                                .OrderByDescending(s => s.CjTiem)
                                .Select<long?>(s => s.CjNum).First();

                            // 计算待报工数量
                            var reportingOkQty = CjQty - reporting.OkQty;

                            // 如果有待报工数量则创建报工记录
                            if (!(reportingOkQty > 0)) continue;
                            var mesReporting = new MesReporting
                            {
                                CheckType = 1,
                                BgDate = DateTime.Now,
                                AddressCode = womdaa.AddressCode,
                                MachineNo = womdaa.MachineNo,
                                // BfQty = reportingOkQty,
                                BfQty = 0,
                                BlQty = reportingOkQty,
                                OkQty = 0,
                                ItemNo = womdaa.Daa002,
                                BillNo = womdaa.Daa001,
                                CjQty = CjQty,
                                DyQty = reporting.OkQty
                            };

                            // 插入报工记录
                            db.Insertable(mesReporting)
                                .IgnoreColumns(true).ExecuteCommand();
                        }

                        var btnLog = new MesWorkorderBtnLog
                        {
                            WorkNo = womdaa.Daa001,
                            BtnType = "工控自动完工",
                            BtnDate = DateTime.Now
                        };
                        db.Insertable<MesWorkorderBtnLog>(btnLog)
                            .ExecuteCommand();

                        // 更新工单主表状态 - 这里将Womdaa表的daa018更新为完工状态
                        updateable = db.Updateable<Womdaa>()
                            .SetColumns(s => s.Daa018 == daa018)
                            .SetColumnsIF("完工".Equals(daa018),
                                s => s.Daa017 == DateTime.Now)
                            .SetColumnsIF("暂停".Equals(daa018),
                                s => s.Daa034 == DateTime.Now)
                            .Where(s => s.Id == orderId).ExecuteCommand();

                        // Db.Deleteable<MesOrderSelect>()
                        //     .Where(a =>  a.OrderId == orderId)
                        //     .ExecuteCommand();
                        //
                        // Db.Deleteable<MesOrderSta>()
                        //     .Where(a => a.OrderId == orderId)
                        //     .ExecuteCommand();
                        //更新工单选择表显示状态
                        db.Updateable<MesOrderSelect>()
                            .SetColumns(a => a.IsShow == 1)
                            .Where(a => a.OrderId == orderId)
                            .ExecuteCommand();

                        //更新工单状态表
                        db.Updateable<MesOrderSta>()
                            .SetColumns(a => a.IsShow == 0)
                            .SetColumns(a => a.EndTime == endDate)
                            .Where(a => a.OrderId == orderId)
                            .ExecuteCommand();

                        // 查询已报工数量
                        var reporting = db.Queryable<MesReporting>()
                            .Where(s => s.BillNo == womdaa.Daa001)
                            .Select(s => new MesReporting
                            {
                                OkQty = SqlFunc.AggregateSum(s.OkQty),
                                BfQty = SqlFunc.AggregateSum(s.BfQty)
                            }).First();
                        
                        reporting.OkQty ??= 0;
                        reporting.BfQty ??= 0;
                        
                        // 查询工单视图信息
                        // var vOrder = db.Queryable<VOrder>()
                        //     .Where(s => s.ID == orderId).First();
                        
                        // 计算待报工数量
                        // var reportingOkQty =
                        //     Convert.ToDecimal(vOrder.todayOutput) -
                        //     reporting.OkQty;
                        var CjQty = Db.Queryable<MesNumericalBycl>()
                            .Where(s => s.MachineNo == entity.MachineNo && s.EditDate == date)
                            .OrderByDescending(s=>s.CjTiem)
                            .Select<long?>(s=>s.CjNum).First();
                        
                        // 计算待报工数量
                        var reportingOkQty = CjQty - reporting.OkQty;
                        
                        // 如果有待报工数量则创建报工记录
                        if (!(reportingOkQty > 0)) continue;
                        var mesReporting = new MesReporting
                        {
                            CheckType = 1,
                            BgDate = DateTime.Now,
                            AddressCode = womdaa.AddressCode,
                            MachineNo = womdaa.MachineNo,
                            // BfQty = reportingOkQty,
                            BfQty = 0,
                            BlQty = reportingOkQty.ToString(),
                            OkQty = 0,
                            ItemNo = womdaa.Daa002,
                            BillNo = womdaa.Daa001,
                            CjQty = CjQty.ToString(),
                            DyQty = reporting.OkQty.ToString()
                        };
                        
                        // 插入报工记录
                        db.Insertable(mesReporting)
                            .IgnoreColumns(true).ExecuteCommand();
                        break;
                    }

                    break;
                }
            }