检验查询功能新增、检验根据车间显示单据

zyf

2025-08-26 fa53abd5d374862c640da5310d0bd1bb641a0d5b

检验查询功能新增、检验根据车间显示单据

 MES.Service/Dto/service/SJPageResult.cs

@@ -109,4 +109,7 @@

    //销售订单号
    [SugarColumn(IsIgnore = true)] public string? SaleOrder { get; set; }
    [SugarColumn(IsIgnore = true)]  public string? LoginUser { get; set; } //用户编码

    [SugarColumn(IsIgnore = true)] public string? DepartName { get; set; }
}

 MES.Service/Dto/service/XJPageResult.cs

@@ -10,5 +10,5 @@
    public string? id { get; set; }

    public string? SearchValue { get; set; }
    public string? statusUser { get; set; } //用户编码
    public string? LoginUser { get; set; } //用户编码
}

 MES.Service/Modes/MesUserDepartmentQc.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,29 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
namespace MES.Service.Modes
{
    /// <summary>
    /// 
    ///</summary>
    [SugarTable("MES_USER_DEPARTMENT_QC")]
    public class MesUserDepartmentQc
    {
        /// <summary>
        ///  
        ///</summary>
         [SugarColumn(ColumnName="ID"    )]
         public decimal? Id { get; set; }
        /// <summary>
        ///  
        ///</summary>
         [SugarColumn(ColumnName="USERCODE"    )]
         public string Usercode { get; set; }
        /// <summary>
        ///  
        ///</summary>
         [SugarColumn(ColumnName="DEPARTMENTCODE"    )]
         public string Departmentcode { get; set; }
    }
}

 MES.Service/Modes/QsItemOqcReq.cs

@@ -142,4 +142,5 @@

    [SugarColumn(IsIgnore = true)] public decimal? Quantity { get; set; }
    [SugarColumn(IsIgnore = true)] public string? CreateUser { get; set; }
    [SugarColumn(IsIgnore = true)] public string? DepartName { get; set; }
}

 MES.Service/Modes/QsQaItemXj.cs

@@ -137,4 +137,5 @@
    [SugarColumn(IsIgnore = true)] public string? LineName { get; set; }
    [SugarColumn(IsIgnore = true)] public string? CreateUser { get; set; }
    [SugarColumn(IsIgnore = true)] public string? SaleOrder { get; set; }
    [SugarColumn(IsIgnore = true)] public string? DepartName { get; set; }
}

 MES.Service/bin/Debug/net8.0/MES.Service.dll

Binary files differ

 MES.Service/bin/Debug/net8.0/MES.Service.pdb

Binary files differ

 MES.Service/service/QC/RKJService.cs

@@ -522,14 +522,16 @@


        var query = db
            .Queryable<QsItemOqcReq, MesItems, Womdaa, MesLine, SysUser,Womcaa>((a, b,
                    da, c, us, ca) =>
            .Queryable<QsItemOqcReq, MesItems, Womdaa, MesLine, SysUser,Womcaa, SysDepartment,MesUserDepartmentQc>((a, b,
                    da, c, us, ca, d, dq) =>
                new JoinQueryInfos(
                    JoinType.Left, a.ItemNo == b.ItemNo, // å…³è”物料信息
                    JoinType.Left, a.BillNo == da.Daa001, // å…³è”工单信息
                    JoinType.Left, da.Daa015 == c.LineNo, // å…³è”工单信息
                    JoinType.Left, us.Fcode == a.CreateBy, // å…³è”工单信息
                    JoinType.Left, da.Daa021 == ca.Caa020//任务单，用于查询销售订单号
                    JoinType.Left, da.Daa021 == ca.Caa020,//任务单，用于查询销售订单号
                    JoinType.Left, d.Departmentid == Convert.ToDecimal(da.Daa013),//查询车间
                    JoinType.Left, dq.Departmentcode == d.Departmentcode//查询用户权限
                ))
            // ç”¨æˆ·çº¿ä½“过滤条件
            //.WhereIF(lineNo != null && lineNo.Length > 0 && !"PL017".Equals(queryObj.createUser),
@@ -544,12 +546,17 @@
                (a, b, da, c, us) => a.Fsubmit == 1)
            // æœç´¢æ¡ä»¶ï¼ˆç‰©æ–™åç§°/编号）
            .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue),
                (a, b, da, c, us) =>
                (a, b, da, c, us,ca) =>
                    b.ItemName.ToLower()
                        .Contains(queryObj.SearchValue.ToLower()) ||
                    ca.Caa015.ToLower()
                        .Contains(queryObj.SearchValue.ToLower()) ||
                    a.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower()))
            // æ–°å¢žï¼šç”¨æˆ·code过滤
            .WhereIF(!string.IsNullOrEmpty(queryObj.LoginUser),
                (a, b, da, c, us, ca, d, dq) => dq.Usercode == queryObj.LoginUser)
            // æŸ¥è¯¢å­—段
            .Select((a, b, da, c, us, ca) => new QsItemOqcReq
            .Select((a, b, da, c, us, ca,d,dq) => new QsItemOqcReq
            {
                Id = a.Id,
                BillNo = a.BillNo,
@@ -568,7 +575,8 @@
                Fsubmit = a.Fsubmit,
                Quantity = da.Daa008,
                LineNo = c.LineName,
                SaleOrderNo = ca.Caa015
                SaleOrderNo = ca.Caa015,
                DepartName = d.Departmentname
            })
            // æŽ’序
            .OrderBy(a => a.CreateDate, OrderByType.Desc);

 MES.Service/service/QC/SJService.cs

@@ -48,11 +48,14 @@
        //if (StringUtil.IsNotNullOrEmpty(queryObj.StatusUser))
        //    lineNo = _baseService.getUserLineNo(queryObj.StatusUser);

        var data = db.Queryable<SJPageResult, Womdaa, Womcaa> ((a,
                    da,ca) =>
        var data = db.Queryable<SJPageResult, Womdaa, Womcaa, SysDepartment, MesUserDepartmentQc,MesItems> ((a,
                    da,ca,d,dq,i) =>
                new JoinQueryInfos(
                    JoinType.Left, Convert.ToDecimal(a.Pbaid) == da.Id, // å…³è”工单信息
                    JoinType.Left, da.Daa021 == ca.Caa020//任务单，用于查询销售订单号
                    JoinType.Left, da.Daa021 == ca.Caa020,//任务单，用于查询销售订单号
                    JoinType.Left, d.Departmentid == Convert.ToDecimal(da.Daa013),//查询车间
                    JoinType.Left, dq.Departmentcode == d.Departmentcode,//查询用户权限
                    JoinType.Left, i.Id == Convert.ToDecimal(da.Daa002)//查询用户权限
                ))
            //.WhereIF(lineNo != null && lineNo.Length > 0,
            //    a => lineNo.Contains(a.line))
@@ -67,7 +70,17 @@
                StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
                !"未完成".Equals(queryObj.Result),
                a => a.FSubmit == "1")
            .Select((a, da, ca) => new SJPageResult
            //匹配权限
            .WhereIF(!string.IsNullOrEmpty(queryObj.LoginUser),
                (a, da, ca, d, dq) => dq.Usercode == queryObj.LoginUser)
            //匹配搜索字符串
            .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue),
                (a, da, ca, d, dq,i) =>
                a.BillNo.ToLower().Contains(queryObj.SearchValue.ToLower())||
                i.ItemName.ToLower() .Contains(queryObj.SearchValue.ToLower()) ||
                ca.Caa015.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
                i.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower()))
            .Select((a, da, ca, d, dq) => new SJPageResult
            {
                Id = a.Id,
                BillNo = a.BillNo,
@@ -91,9 +104,8 @@
                Daa004 = a.Daa004,
                Daa008 = a.Daa008,
                LineName = a.LineName,

                // æ˜ å°„额外的字段（销售订单号）
                SaleOrder = ca.Caa015
                SaleOrder = ca.Caa015,
                DepartName = d.Departmentname
            })
            .OrderBy(a => a.CreateTime, OrderByType.Desc);
        var items = data.ToPageList(queryObj.PageIndex, queryObj.Limit,ref totalCount);

 MES.Service/service/QC/XJService.cs

@@ -123,14 +123,16 @@

        var query = db
            .Queryable<QsQaItemXj, Womdaa, MesLine,
                MesItems, SysUser,Womcaa,SysDepartment>((s, a, c, b, us,ca,d) =>
                MesItems, SysUser,Womcaa,SysDepartment, MesUserDepartmentQc,MesItems>((s, a, c, b, us,ca,d,dq,i) =>
                new JoinQueryInfos(
                    JoinType.Inner, s.BillNo == a.Daa001,
                    JoinType.Left, a.Daa015 == c.LineNo,
                    JoinType.Left, s.ItemId == b.Id,
                    JoinType.Left, us.Fcode == s.CreateBy,
                    JoinType.Left, ca.Caa020 == a.Daa021,
                    JoinType.Left, d.Departmentcode == c.Departmentcode
                    JoinType.Left, d.Departmentcode == c.Departmentcode,
                    JoinType.Left, dq.Departmentcode == d.Departmentcode,//查询用户权限
                    JoinType.Left, i.Id == Convert.ToDecimal(a.Daa002)
                )
            )
            //.WhereIF(lineNo != null && lineNo.Length > 0,
@@ -145,7 +147,15 @@
                !"未完成".Equals(queryObj.result),
                (s, a, c, b, us) => s.SubmitStatus == 1)
            .WhereIF(id > 0, (s, a, c, b, us,ca) => s.Id == id)
            .Select((s, a, c, b, us,ca) => new QsQaItemXj
            .WhereIF(!string.IsNullOrEmpty(queryObj.LoginUser),
                (s, a, c, b, us, ca, d, dq) => dq.Usercode == queryObj.LoginUser)
            .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue),
                (s, a, c, b, us, ca, d, dq,i) =>
                s.ReleaseNo.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
                i.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
                ca.Caa015.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
                i.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower()))
            .Select((s, a, c, b, us,ca,d) => new QsQaItemXj
            {
                Daa020 = c.LineNo,
                Id = s.Id,
@@ -162,7 +172,9 @@
                CheckBy = s.CheckBy,
                CheckResult = s.CheckResult,
                Remarks = s.Remarks,
                SaleOrder = ca.Caa015 
                SaleOrder = ca.Caa015,
                DepartName = d.Departmentname

            }).OrderBy(s => s.CreateDate, OrderByType.Desc);
        var items = query.ToPageList(queryObj.PageIndex, queryObj.Limit,
            ref totalCount);

 MESApplication/bin/Debug/net8.0/MES.Service.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/MES.Service.pdb

Binary files differ

 MESApplication/bin/Debug/net8.0/MESApplication.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/MESApplication.exe

Binary files differ

 MESApplication/bin/Debug/net8.0/MESApplication.pdb

Binary files differ