逻辑优化

快乐的昕的电脑

2025-10-22 c60af0293161db2349a67f6279fb71ec0e165aa6

 Services/MesOrderStaManager.cs

@@ -43,9 +43,7 @@
    {
        // 查询MesOrderSta表获取工单状态记录
        var mesOrderSta = Db.Queryable<MesOrderSta>()
            // 根据工单ID匹配记录
            .Where(s => s.OrderId == query.OrderId)
            // 获取第一条记录
            .First();

        // 如果未找到记录,返回空对象
@@ -54,8 +52,9 @@
        // 查询Womdaa表获取工单主表信息
        var womdaa = Db.Queryable<Womdaa>()
            .Where(a => a.Id == query.OrderId).First();
        // 设置工单状态
        mesOrderSta.OrderStatus = womdaa.Daa018;

        // 判空处理，避免空引用异常
        mesOrderSta.OrderStatus = womdaa != null ? womdaa.Daa018 : null;
        return mesOrderSta;
    }

@@ -93,121 +92,167 @@

    /// <summary>
    ///     更新机器时间并处理首检
    ///     变更说明（新逻辑）：
    ///     1) 首检结果“不合格”时不立即重建，不清空送检时间，只提示需要再次送检
    ///     2) 当用户再次点击“送检呼叫”产生新的送检时间（与数据库原值不同）且上一张首检结果“不合格”，才重建首检单
    ///     3) 不存在首检单时仍直接创建
    ///     4) 首检合格且送检时间 >= 调机开始时间时：写入调机完成时间与开工时间
    /// </summary>
    /// <param name="entity">工单状态实体,包含机器时间信息</param>
    /// <returns>更新是否成功</returns>
    public bool ChangeMachineTime(MesOrderSta entity)
    {
        // 查询工单主表信息
        var womdaa = Db.Queryable<Womdaa>()
            .Where(s => s.Id == entity.OrderId).First();
        const string FirstCheckType = "首检";
        const string FirstCheckResultOK = "合格";
        const string FirstCheckResultNG = "不合格";

        // 如果标记为1,需要处理首检相关逻辑
        if (entity.Flag == 1)
        var womdaa = Db.Queryable<Womdaa>().Where(s => s.Id == entity.OrderId).First();
        if (womdaa == null) throw new Exception("工单不存在");

        // 读取现有状态（用于比较送检时间是否变化）
        var dbSta = Db.Queryable<MesOrderSta>().Where(s => s.Id == entity.Id).First();

        // 行级锁：避免并发重建
        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 == FirstCheckType && (s.Fcancel == null || s.Fcancel != "Y"))
            .OrderBy(s => s.CreateDate, OrderByType.Desc)
            .First();

        var latestResult = latestFirst?.FcheckResu?.Trim();

        // 送检时间是否发生变化（前端重新点击送检）
        var isShoutTimeChanged = !string.IsNullOrEmpty(entity.MaShoutTime)
                                 && entity.MaShoutTime != dbSta?.MaShoutTime;

        // 判定是否需要重建：
        // 1) 首次（latestFirst == null）
        // 2) 上一张是“不合格” 且 用户本次送检时间已发生变化（表示二次送检）
        var needRebuild = latestFirst == null ||
                          (string.Equals(latestResult, FirstCheckResultNG, StringComparison.OrdinalIgnoreCase) && isShoutTimeChanged);

        if (needRebuild)
        {
            // 调用存储过程执行自动首检
            // Db.Ado.ExecuteCommand(
            //     "BEGIN AUTOMATIC_IPQC_FIRST_CHECK(:BILL_NO); END;",
            //     new SugarParameter("BILL_NO", womdaa.Daa001,
            //         DbType.String));
            var automaticIpqcFirstCheck =
                mesQaItemsDetect02Manager
                    .AutomaticIpqcFirstCheck(womdaa.Daa001);
            if (!automaticIpqcFirstCheck) throw new Exception("首检生成失败");
            var previousState = latestResult == null ? "首次创建" :
                (latestResult == FirstCheckResultNG ? "不合格后重建" : "重建");

            // 获取当前时间
            var s1 = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
            // 生成首检备注信息
            var remeke = "工控机于" + s1 + "自动创建的首检单";
            Db.Ado.ExecuteCommand(
                "BEGIN AUTOMATIC_IPQC_FIRST_CHECK(:BILL_NO); END;",
                new SugarParameter("BILL_NO", womdaa.Daa001, System.Data.DbType.String));

            // 更新首检单备注信息
            Db.Updateable<MesQaItemsDetect02>()
                .SetColumns(s => s.Remeke == remeke)
                .Where(s => s.Ftype == "首检" && s.Aufnr == womdaa.Daa001)
                .ExecuteCommand();
            // 重取
            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}自动创建的首检单({previousState})")
                    .Where(s => s.Id == latestFirst.Id)
                    .ExecuteCommand();
            }

            // 重建后不清空本次送检时间（保留用户新输入）
            entity.remark = previousState.Contains("不合格") ? "不合格已重建，等待检验" : entity.remark;
        }
        else
        {
            // 不需要重建但上一张不合格且送检时间未变化 => 提示需要重新送检
            if (latestFirst != null && string.Equals(latestResult, FirstCheckResultNG, StringComparison.OrdinalIgnoreCase) && !isShoutTimeChanged)
            {
                entity.remark = "上一首检不合格，请重新点击送检呼叫以生成新的首检单";
            }
            else if (latestFirst != null)
            {
                // 其它情况更新备注为当前结果
                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)
            .First();


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

        // 发送HTTP请求到数据刷新接口
        MesNumerical mesNumerical = null;
        MesNumericalBycl mesNumerical = null;
        try
        {
            using (var httpClient = new HttpClient())
            using var httpClient = new HttpClient { Timeout = TimeSpan.FromSeconds(30) };
            var content = new StringContent(
                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();

            if (response.IsSuccessStatusCode)
            {
                httpClient.Timeout = TimeSpan.FromSeconds(30);

                var content = new StringContent(
                    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();

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

                    if (responseObj != null && responseObj.code == 200)
                    {
                        // 请求成功，获取MesNumerical数据
                        mesNumerical = Db.Queryable<MesNumerical>()
                            .Where(s => s.EditDate == editDate
                                        && s.MachineNo == entity.MachineNo)
                            .OrderByDescending(s => s.Id)
                            .First();
                    }
                    mesNumerical = Db.Queryable<MesNumericalBycl>()
                        .Where(s => s.EditDate == editDate && s.MachineNo == entity.MachineNo)
                        .OrderByDescending(s => s.Id)
                        .First();
                }
            }
        }
        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
        var eAnchors = new MesAnchors
        {
            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 (!string.IsNullOrEmpty(entity.MaShoutTime)
            && DateTime.TryParse(entity.MaShoutTime, out var sjTime)
            && DateTime.TryParse(entity.MaStartTime, out var startTime)
            && sjTime >= startTime
            && latestFirst != null
            && string.Equals(latestFirst.FcheckResu?.Trim(), FirstCheckResultOK, StringComparison.OrdinalIgnoreCase))
        {
            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");
        }

        // 更新工单状态表
        // 更新
        return Db.Updateable<MesOrderSta>()
            // 如果有送检时间则更新
            .SetColumnsIF(entity.MaShoutTime != null,
                s => s.MaShoutTime == entity.MaShoutTime)
            // 如果标记为1则更新备注信息
            .SetColumnsIF(entity.Flag == 1,
                s => s.remark == "于" + entity.MaShoutTime + "时间有一次送检")
            // 根据ID匹配记录
            .SetColumnsIF(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)
            .SetColumnsIF(entity.Flag == 1 && entity.remark != null, s => s.remark == entity.remark)
            .Where(s => s.Id == entity.Id)
            // 执行更新并判断影响行数是否大于0
            .ExecuteCommand() > 0;
    }

@@ -447,7 +492,7 @@
                        // var reportingOkQty =
                        //     Convert.ToDecimal(vOrder.todayOutput) -
                        //     reporting.OkQty;
                        var CjQty = Db.Queryable<MesNumerical>()
                        var CjQty = Db.Queryable<MesNumericalBycl>()
                            .Where(s => s.MachineNo == entity.MachineNo && s.EditDate == date)
                            .OrderByDescending(s=>s.CjTiem)
                            .Select<long?>(s=>s.CjNum).First();
@@ -465,12 +510,12 @@
                            MachineNo = womdaa.MachineNo,
                            // BfQty = reportingOkQty,
                            BfQty = 0,
                            BlQty = reportingOkQty.ToString(),
                            BlQty = reportingOkQty,
                            OkQty = 0,
                            ItemNo = womdaa.Daa002,
                            BillNo = womdaa.Daa001,
                            CjQty = CjQty.ToString(),
                            DyQty = reporting.OkQty.ToString()
                            CjQty = CjQty,
                            DyQty = reporting.OkQty
                        };
                        
                        // 插入报工记录
@@ -500,7 +545,7 @@
    public bool StateCheck(OrderMachineDto query)
    {
        // 查询工单视图信息
        var vOrder = Db.Queryable<VOrder>()
        var vOrder = Db.Queryable<VOrderBycl>()
            .Where(s => s.ID == query.OrderId).First();

        // 根据不同操作标识进行检查
@@ -579,7 +624,7 @@

        if (binding)
            return Db.Updateable<MesOrderSta>()
                .SetColumns(s => s.MaEndTime == endDate)
                .SetColumns(s => s.MaEndTime == endDate) // 自动写入调机完成时间
                .SetColumns(s => s.StartTime == entity.MaShoutTime)
                .Where(s => s.OrderId == query.OrderId).ExecuteCommand() > 0;