来料检添加搜索查询功能

zjh

2025-02-24 469d5fa02a63b78079e5da1a8d569e562bc5a36e

 StandardPda/MES.Service/service/QC/LljService.cs

@@ -4,6 +4,7 @@
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.util;
using Microsoft.EntityFrameworkCore.Metadata.Internal;
using SqlSugar;
using DbType = System.Data.DbType;

@@ -27,9 +28,11 @@

        var itemIds = GetQaItem(db, queryObj.createUser);

        var pageList = db.Queryable<LtsLlj, IqcBefore, SysUser, VMesQaItemsDetect01>((a, b, c,d) =>
        var pageList = db.Queryable<LtsLlj, IqcBefore, SysUser, VMesQaItemsDetect01, SysUser>((a, b, c,d,e) =>
                new JoinQueryInfos(JoinType.Left, a.ItemId == b.ItemId,
                    JoinType.Left, b.Sid == c.Fid,JoinType.Inner, a.Id == d.Id
                    JoinType.Left, b.Sid == c.Fid,
                    JoinType.Inner, a.Id == d.Id,
                     JoinType.Left, a.CreateBy == e.Fcode
                ))
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.result) &&
@@ -43,11 +46,18 @@
                itemIds is { Length: > 0 },
                (a, b, c) => itemIds.Contains(a.ItemId))
            .WhereIF(id > 0, (a, b, c) => a.Id == id)
        //加筛选条件,根据供应商，物料编码，物料名称搜索
        //.WhereIF(queryObj.SearchValue!=null && queryObj.SearchValue!="", (a) => a.SuppName == queryObj.SearchValue|| a.ItemName == queryObj.SearchValue || a.ItemNo == queryObj.SearchValue )
            .WhereIF(queryObj.SearchValue != null && queryObj.SearchValue != "", 
            (a) => (a.SuppName.ToLower().Contains(queryObj.SearchValue.ToLower()) 
            || a.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower()) 
            || a.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower())))
            .OrderByDescending((a, b, c) => a.Id)
            .Select((a, b, c, d) => new LtsLlj
            .Select((a, b, c, d,e) => new LtsLlj
            {
                UserName = c.Fname,
                FIRST=d.First
                FIRST=d.First,
                CreateUserName=e.Fname
            }, true)
            .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);

@@ -261,7 +271,8 @@
                a.FspecRequ,
                a.FreQty,
                a.CheckQyt,
                a.FcheckResu
                a.FcheckResu,
                a.FcheckItemDesc
            }).Select((a, b) => new MesQaItemsDetectDetail5
            {
                Id = a.Id,
@@ -280,7 +291,8 @@
                Factory = "1000",
                Company = "1000",
                FenterQty = SqlFunc.AggregateCount(b.Id),
                FcheckResu = a.FcheckResu
                FcheckResu = a.FcheckResu,
                FcheckItemDesc=a.FcheckItemDesc
            }).ToList();
    }