如果有报工记录，那么初始始采集数为：上一次报工时间后最近一条齿轮数采表的采集数量

快乐的昕的电脑

2025-10-17 7f973db754fe5746b48b6b90a1a6e05cb7b8ed24

 Services/WomdaaManager.cs

@@ -25,12 +25,6 @@
            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();

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

@@ -97,8 +91,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();

@@ -110,12 +103,72 @@
        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)
        {
            // 开工数采：最早一条
            vOrderBycl.StartCjNum = numericalList.First().CjNum ?? 0;
            // 当前数采：最新一条
            vOrderBycl.CurrentCjNum = numericalList.Last().CjNum ?? 0;
        }
        else
        {
            vOrderBycl.StartCjNum = 0;
            vOrderBycl.CurrentCjNum = 0;
        }

        // 查询报工记录，获取最后一次报工时间
        var lastReport = Db.Queryable<MesReporting>()
            .Where(r => r.BillNo != null && r.BillNo.Contains(query.orderNo))
            .OrderBy(r => r.BgDate, OrderByType.Desc)
            .First();

        if (lastReport == null)
        {
            // 没有报工记录，初始采集数为开工采数
            vOrderBycl.InitCjNum = vOrderBycl.StartCjNum;
        }
        else
        {
            // 有报工记录，初始采集数为上一次报工时间后最近一条齿轮数采表的采集数量
            var afterReportNum = numericalList
                .Where(x =>
                    DateTime.TryParse(x.CjTiem, out var cjTiemDt) &&
                    lastReport.BgDate.HasValue &&
                    cjTiemDt > lastReport.BgDate.Value)
                .OrderBy(x => DateTime.Parse(x.CjTiem))
                .FirstOrDefault();

            vOrderBycl.InitCjNum = afterReportNum?.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.EditDate, OrderByType.Desc)
            .Take(1)
            .ToList();

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

        return orders;
    }

    /// <summary>
@@ -166,19 +219,35 @@

        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)
        {
            // 开工数采：最早一条
            VOrdrerBycl.StartCjNum = numericalList.First().CjNum ?? 0;
            // 当前数采：最新一条
            VOrdrerBycl.CurrentCjNum = numericalList.Last().CjNum ?? 0;
        }
        else
        {
            VOrdrerBycl.StartCjNum = 0;
            VOrdrerBycl.CurrentCjNum = 0;
        }

        return VOrdrerBycl;
    }
@@ -217,38 +286,41 @@
    }

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

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

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

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

        var totalCount = query.Count();

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

        return (tbBillList, totalCount);
    }