逻辑优化

快乐的昕的电脑

2025-10-18 b876edb8c9865d15a41cc0926cde34aa8c89c1f2

 Services/WomdaaManager.cs

@@ -1,6 +1,7 @@
using PadApplication.DB;
using PadApplication.Entites.DbModels;
using PadApplication.Entites.Dto;
using SqlSugar;

namespace PadApplication.Services;

@@ -24,12 +25,13 @@
            list = list.Where(p => p.Daa018 != null && query.OrderStatus.Contains(p.Daa018)).ToList();
        }

        //// 分组逻辑（如需分组，按刀具ID分组取第一条）
        //var vOrders = list.GroupBy(p => p.cutterId)
        //    .Select(g => g.First()).ToList();
        // 按工单ID分组，只保留每组中最早报工的一条
        list = list
            .GroupBy(p => p.ID)
            .Select(g => g.OrderBy(x => x.BgDate).First())
            .OrderBy(x => x.BgDate)
            .ToList();

        //return vOrders;
        // 如需分组可加分组逻辑，否则直接返回
        return list;
    }

@@ -96,8 +98,7 @@
    {
        // 查询需要显示的工单ID
        var ids = Db.Queryable<MesOrderSelect>()
            .Where(b => b.MachineNo == query.machineNo
                        && b.IsShow == 0)
            .Where(b => b.MachineNo == query.machineNo && b.IsShow == 0)
            .Select(s => s.OrderId)
            .ToList();

@@ -109,12 +110,77 @@
        if (decimals.Count == 0)
            return new List<VOrderBycl>();

        // 查询工单视图，筛选出需要显示的工单
        return Db.Queryable<VOrderBycl>()
        // 查询齿轮数采表
        var numericalList = Db.Queryable<MesNumericalBycl>()
            .Where(x => ids.Contains(x.OrderId ?? 0))
            .OrderBy(x => x.CjTiem)
            .ToList();

        var vOrderBycl = new VOrderBycl();
        if (numericalList.Count > 0)
        {
            // 按采集时间升序排序
            var sortedList = numericalList
                .OrderBy(x => DateTime.TryParse(x.CjTiem, out var dt) ? dt : DateTime.MinValue)
                .ToList();

            // 开工数采：最早一条
            vOrderBycl.StartCjNum = sortedList.First().CjNum ?? 0;
            // 当前数采：最新一条
            vOrderBycl.CurrentCjNum = sortedList.Last().CjNum ?? 0;
        }
        else
        {
            vOrderBycl.StartCjNum = 0;
            vOrderBycl.CurrentCjNum = 0;
        }

        // 查询报工记录，获取最后一条报工记录
        var lastReport = Db.Queryable<MesReporting>()
            .AS("MES_REPORTING") // 强制表名
            .Where(r => r.BillNo == "MSD01-2507140001-g1-1")
            .OrderBy(r => r.BgDate, OrderByType.Desc)
            .First();

        if (lastReport == null || !lastReport.BgDate.HasValue)
        {
            // 没有报工记录或报工时间无效，初始采集数为开工采数
            vOrderBycl.InitCjNum = vOrderBycl.StartCjNum;
        }
        else
        {
            // 有报工记录，初始采集数为报工时间点前（含）最近一条齿轮数采表的采集数量
            var beforeOrEqualReportNum = numericalList
                .Select(x => new { Item = x, ParsedTime = DateTime.TryParse(x.CjTiem, out var dt) ? dt : (DateTime?)null })
                .Where(x => x.ParsedTime.HasValue && x.ParsedTime.Value <= lastReport.BgDate.Value)
                .OrderByDescending(x => x.ParsedTime) // 降序，取第一条
                .Select(x => x.Item)
                .FirstOrDefault();

            vOrderBycl.InitCjNum = beforeOrEqualReportNum?.CjNum ?? vOrderBycl.StartCjNum;
        }

        var startCjNum = vOrderBycl.StartCjNum;
        var currentCjNum = vOrderBycl.CurrentCjNum;
        var initCjNum = vOrderBycl.InitCjNum;

        // 查询工单视图，筛选出需要显示的工单，只取最新一条
        var orders = Db.Queryable<VOrderBycl>()
            .Where(c =>
                decimals.Contains(c.ID) &&
                (c.EditDate == date || c.EditDate == null))
            .OrderBy(c => c.BgDate, OrderByType.Desc)
            .Take(1)
            .ToList();

        foreach (var order in orders)
        {
            order.StartCjNum = startCjNum;
            order.CurrentCjNum = currentCjNum;
            order.InitCjNum = initCjNum;
        }

        return orders;
    }

    /// <summary>
@@ -126,7 +192,7 @@
    {
        var date = DateTime.Now.ToString("yyyy-MM-dd");

        var count = Db.Queryable<DeviceStatus>()
        var count = Db.Queryable<DeviceStatusBycl>()
            .Where(b => b.OrderNo == query.orderNo && b.EditDate == date)
            .Count();

@@ -165,35 +231,153 @@

        VOrdrerBycl.wjQty = VOrdrerBycl.Daa008 - VOrdrerBycl.Daa011;

        //DevMachine
        var devMachine = Db.Queryable<DevMacBycl>()
            .Where(s => s.MachineNo == VOrdrerBycl.MachineNo)
            .First();


        var sql = string.Format(
            "select FINAL_RESULT from MES_EQ_SPOT_CHECKS where department_no = 'XS0101' and EQ_NO = '{0}' and substr(SUBMIT_DATE, 1, 10) = to_char(sysdate, 'yyyy-mm-dd')",
            devMachine.UniqueBarcode);

        var sqlQuerySingle = Db.Ado.SqlQuerySingle<string>(sql);

        VOrdrerBycl.finalResult = sqlQuerySingle;

        // 查询MES_NUMERICAL_BYCL表，获取开工数采和当前数采
        var numericalList = Db.Queryable<MesNumericalBycl>()
            .Where(x => x.OrderId == VOrdrerBycl.ID)
            .OrderBy(x => x.CjTiem)
            .ToList();

        if (numericalList.Count > 0)
        {
            // 先按采集时间升序排序
            var sortedList = numericalList
                .OrderBy(x => DateTime.TryParse(x.CjTiem, out var dt) ? dt : DateTime.MinValue)
                .ToList();

            // 开工数采：最早一条
            VOrdrerBycl.StartCjNum = sortedList.First().CjNum ?? 0;
            // 当前数采：最新一条
            VOrdrerBycl.CurrentCjNum = sortedList.Last().CjNum ?? 0;
        }
        else
        {
            VOrdrerBycl.StartCjNum = 0;
            VOrdrerBycl.CurrentCjNum = 0;
        }

        Console.WriteLine($"orderNo: [{query.orderNo}]");

        // 查询报工记录，获取最后一条报工记录
        var lastReport = Db.Queryable<MesReporting>()
            .Where(r => r.BillNo.Trim().ToUpper() == query.orderNo.Trim().ToUpper())
            .OrderBy(r => r.BgDate, OrderByType.Desc)
            .First();

        if (lastReport == null || !lastReport.BgDate.HasValue)
        {
            // 没有报工记录，初始采集数为开工采数
            VOrdrerBycl.InitCjNum = VOrdrerBycl.StartCjNum;
        }
        else
        {
            // 有报工记录，初始采集数为报工时间点前（含）最近一条齿轮数采表的采集数量
            var beforeOrEqualReportNum = numericalList
                .Select(x => new { Item = x, ParsedTime = DateTime.TryParse(x.CjTiem, out var dt) ? dt : (DateTime?)null })
                .Where(x => x.ParsedTime.HasValue && x.ParsedTime.Value <= lastReport.BgDate.Value)
                .OrderByDescending(x => x.ParsedTime) // 降序，取第一条
                .Select(x => x.Item)
                .FirstOrDefault();

            VOrdrerBycl.InitCjNum = beforeOrEqualReportNum?.CjNum ?? VOrdrerBycl.StartCjNum;
        }

        // 报工时采集数就是主界面的当前采数
        // VOrdrerBycl.CurrentCjNum 已赋值，无需额外处理

        return VOrdrerBycl;
    }

    /// <summary>
    ///     根据工单ID获取打印信息
    ///     根据工单ID获取报工信息
    /// </summary>
    /// <param name="query">包含工单ID的查询条件</param>
    /// <returns>工单打印信息</returns>
    /// <returns>工单报工信息</returns>
    public VPrint GetWomdaaPrintById(OrderMachineDto query)
    {
        var vPrint = Db.Queryable<VPrint>()
            .Where(s => s.Id == query.OrderId).First();
        vPrint.RmiPrQty =
            (int)Math.Ceiling(
                (double)((vPrint.Bqty - vPrint.SQuantity) / vPrint.Qqty));
            .Where(s => s.Id == query.OrderId)
            .First();

        if (vPrint == null)
            return null;

        // 防止除零和空值异常
        var bqty = vPrint.Bqty ?? 0;
        var sQuantity = vPrint.SQuantity ?? 0;
        var qqty = vPrint.Qqty ?? 0;

        if (qqty == 0)
        {
            vPrint.RmiPrQty = 0;
        }
        else
        {
            // 剩余可打印张数 = (可打印总数量 - 已打印数量) / 标准包装数，向上取整
            var remain = bqty - sQuantity;
            vPrint.RmiPrQty = remain > 0 ? (int)Math.Ceiling((double)remain / (double)qqty) : 0;
        }

        return vPrint;
    }

    /// <summary>
    /// 报工记录表
    /// </summary>
    /// <param name="billNo"></param>
    /// <param name="machineNo"></param>
    /// <param name="from"></param>
    /// <param name="to"></param>
    /// <param name="pageIndex"></param>
    /// <param name="pageSize"></param>
    /// <returns></returns>
    public (List<MesReportingBgDto> tbBillList, int totalCount) GetByBillNoBG(
        string billNo, string machineNo, DateTime? from, DateTime? to, int pageIndex, int pageSize)
    {
        var query = Db.Queryable<MesReporting>()
            // 关联员工信息表，使用报工人编码匹配员工编码
            .LeftJoin<MesStaff>((r, s) => r.BgPerson == s.StaffNo)
            .Where((r, s) => r.BillNo == billNo);

        if (!string.IsNullOrWhiteSpace(machineNo))
            query = query.Where((r, s) => r.MachineNo == machineNo);

        if (from.HasValue)
            query = query.Where((r, s) => r.BgDate >= from.Value);

        if (to.HasValue)
            query = query.Where((r, s) => r.BgDate < to.Value.AddDays(1));

        var totalCount = query.Count();

        var tbBillList = query.OrderBy((r, s) => r.BgDate, OrderByType.Desc)
            .Select((r, s) => new MesReportingBgDto
            {
                Id = (long)r.Id,
                BillNo = r.BillNo,
                ItemNo = r.ItemNo,
                MachineNo = r.MachineNo,
                StaffNo = r.BgPerson,//报工人编号
                StaffName = SqlFunc.IsNullOrEmpty(s.StaffName) ? r.BgPerson : s.StaffName, // 如有独立姓名字段可替换
                BgDate = r.BgDate,//报工时间
                CsQty = SqlFunc.ToInt32(r.CsQty),//初始采集数
                CjQty = SqlFunc.ToInt32(r.CjQty),//报工时采集数
                BfQty = SqlFunc.ToInt32(r.BfQty),//不良数量
                OkQty = SqlFunc.ToInt32(r.OkQty)//良品数量
            })
            .ToPageList((pageIndex < 1 ? 1 : pageIndex),
                (pageSize < 1 ? 200 : (pageSize > 1000 ? 1000 : pageSize)), ref totalCount);

        return (tbBillList, totalCount);
    }
}