数据库字段做映射

快乐的昕的电脑

2025-10-16 12415f9a89c8e7cf58f2b0d36665f7684fa5f8e1

 Services/WomdaaManager.cs

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

namespace PadApplication.Services;

@@ -14,7 +15,7 @@
    /// </summary>
    /// <param name="query">包含机器编号和工单状态的查询条件</param>
    /// <returns>工单列表</returns>
    public List<VOrdreBycl> GetWomdaasByEngineeringNo(OrderMachineDto query)
    public List<VOrderBycl> GetWomdaasByEngineeringNo(OrderMachineDto query)
    {
        var list = VOrders(query);

@@ -24,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;
    }

@@ -38,16 +33,16 @@
    /// </summary>
    /// <param name="query">包含机器编号的查询条件</param>
    /// <returns>合并后的工单列表</returns>
    private List<VOrdreBycl> VOrders(OrderMachineDto query)
    private List<VOrderBycl> VOrders(OrderMachineDto query)
    {
        var list = Db.Queryable<VOrdreBycl>()
        var list = Db.Queryable<VOrderBycl>()
            .Where(s => s.Daa018 != "完工" &&
                        s.MachineNo == query.machineNo)
            .ToList();

        var orders = Db.Queryable<VOrderABycl>()
            .Where(s => s.MachineNo == query.machineNo)
            .Select<VOrdreBycl>()
            .Select<VOrderBycl>()
            .ToList();

        list.AddRange(orders);
@@ -63,7 +58,7 @@
    /// <returns>
    ///     返回符合条件的工单（VOrdreBycl）列表
    /// </returns>
    public List<VOrdreBycl> GetWomdaasByMachine(OrderMachineDto query)
    public List<VOrderBycl> GetWomdaasByMachine(OrderMachineDto query)
    {
        // 获取当前日期字符串，格式为 yyyy-MM-dd
        var date = DateTime.Now.ToString("yyyy-MM-dd");
@@ -79,7 +74,7 @@
        // 1. 机台编号等于传入的machineNo
        // 2. 编辑日期为今天或为空
        // 3. 工单ID在ids集合中
        return Db.Queryable<VOrdreBycl>()
        return Db.Queryable<VOrderBycl>()
            .Where(s =>
                s.MachineNo == query.machineNo
                && (s.EditDate == date || s.EditDate == null)
@@ -92,7 +87,7 @@
    /// </summary>
    /// <param name="query">包含机器编号的查询条件</param>
    /// <returns>需要显示的工单列表</returns>
    public List<VOrdreBycl> GetWomdaasByShow(OrderMachineDto query)
    public List<VOrderBycl> GetWomdaasByShow(OrderMachineDto query)
    {
        // 查询需要显示的工单ID
        var ids = Db.Queryable<MesOrderSelect>()
@@ -107,10 +102,10 @@

        // 如果没有工单ID，直接返回空列表
        if (decimals.Count == 0)
            return new List<VOrdreBycl>();
            return new List<VOrderBycl>();

        // 查询工单视图，筛选出需要显示的工单
        return Db.Queryable<VOrdreBycl>()
        return Db.Queryable<VOrderBycl>()
            .Where(c =>
                decimals.Contains(c.ID) &&
                (c.EditDate == date || c.EditDate == null))
@@ -122,54 +117,53 @@
    /// </summary>
    /// <param name="query">包含工单ID和工单号的查询条件</param>
    /// <returns>工单详细信息</returns>
    public VOrder GetWomdaaById(OrderMachineDto query)
    public VOrderBycl GetWomdaaById(OrderMachineDto query)
    {
        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();

        var vOrder = Db.Queryable<VOrder>()
        var VOrdrerBycl = Db.Queryable<VOrderBycl>()
            .Where(s => s.ID == query.OrderId)
            .WhereIF(count > 0, s => s.EditDate == date)
            .OrderByDescending(s => s.workStartDate).First();

        if (vOrder == null) return null;
        if (VOrdrerBycl == null) return null;

        vOrder.YJQTY ??= 0;
        VOrdrerBycl.YJQTY ??= 0;

        var mesOrderSelect = Db.Queryable<MesOrderSelect>()
            .Where(a => a.OrderId == vOrder.ID
            .Where(a => a.OrderId == VOrdrerBycl.ID
                        && a.IsShow == 0).First();

        vOrder.todayRunTime = 0;
        vOrder.TodayFaultNum = 0;
        VOrdrerBycl.todayRunTime = 0;
        VOrdrerBycl.TodayFaultNum = 0;

        if (mesOrderSelect != null)
        {
            vOrder.todayRunTime = mesOrderSelect.TjTime;
            vOrder.TodayFaultNum = mesOrderSelect.TjCount;
            VOrdrerBycl.todayRunTime = mesOrderSelect.TjTime;
            VOrdrerBycl.TodayFaultNum = mesOrderSelect.TjCount;

            if (mesOrderSelect.TjTime is null or 0)
            {
                vOrder.JDL = 100;
                VOrdrerBycl.JDL = 100;
            }
            else
            {
                var round = Math.Round(mesOrderSelect.TjTime.Value / 1440, 2);
                var round1 = (1 - round) * 100;
                vOrder.JDL = round1;
                VOrdrerBycl.JDL = round1;
            }
        }

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

        //DevMachine
        var devMachine = Db.Queryable<DevMacBycl>()
            .Where(s => s.MachineNo == vOrder.MachineNo)
            .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')",
@@ -177,23 +171,81 @@

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

        vOrder.finalResult = sqlQuerySingle;
        VOrdrerBycl.finalResult = sqlQuerySingle;

        return vOrder;
        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;
    }

    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);
    }
}