新加首检搜索框查

fcx

10 天以前 92e4d27f7083331fdffec1edb83211ad73ce51d6

新加首检搜索框查

 StandardPda/MES.Service/Dto/service/SJPageResult.cs

@@ -126,4 +126,8 @@
    public string? DAA019 { get; set; }

    public string? searchValue { get; set; }

    // æ·»åŠ  selectedIndex å±žæ€§ä»¥æ”¯æŒå‰ç«¯ä¼ å…¥çš„搜索选项索引   æ–°æ·»åŠ 
     
    //public int? selectedIndex { get; set; }
}

 StandardPda/MES.Service/Dto/service/SJPageResult2.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,133 @@
using MES.Service.Dto.@base;
using SqlSugar;

namespace MES.Service.Dto.service;

[SugarTable("V_MES_SJ")] //用于SqlSugar
public class SJPageResult2 : Page
{
    public decimal? Id { get; set; }

    [SugarColumn(ColumnName = "BILL_NO")] //用于SqlSugar
    public string? BillNo { get; set; }


    [SugarColumn(ColumnName = "STATUS_DATE")] //用于SqlSugar
    public DateTime? StatusDate { get; set; }

    public string? FName { get; set; }
    public string? Result { get; set; }

    [SugarColumn(ColumnName = "STATUS_USER")] //用于SqlSugar
    public string? StatusUser { get; set; }


    //WORKSHOP_CODE
    // [SugarColumn(ColumnName = "WORKSHOP_CODE")] //用于SqlSugar
    // public string? workshopCode { get; set; }

    //PBAID
    [SugarColumn(ColumnName = "PBAID")] //用于SqlSugar
    public string? Pbaid { get; set; }

    //COMPLETE_TIME
    // [SugarColumn(ColumnName = "COMPLETE_TIME")] //用于SqlSugar
    // public DateTime? CompleteTime { get; set; }

    [SugarColumn(ColumnName = "CREATE_TIME")] //用于SqlSugar
    public DateTime? CreateTime { get; set; }

    [SugarColumn(ColumnName = "COMMENTS")] //用于SqlSugar
    public string? Comments { get; set; }

    // [SugarColumn(ColumnName = "WORKSHOP_NAME")] //用于SqlSugar
    // public string? WorkshopName { get; set; }

    //ITEM_MOD
    [SugarColumn(ColumnName = "ITEM_MOD")] //用于SqlSugar
    public string? ItemMod { get; set; }

    //ITEM_NAME
    // [SugarColumn(ColumnName = "ITEM_NAME")] //用于SqlSugar
    // public string? ItemName { get; set; }

    [SugarColumn(ColumnName = "ITEM_NO")] //用于SqlSugar
    public string? ItemNo { get; set; }

    [SugarColumn(ColumnName = "DAA001")] //用于SqlSugar
    public string? daa001 { get; set; }

    //LINE
    [SugarColumn(ColumnName = "LINE")] //用于SqlSugar
    public string? line { get; set; }


    [SugarColumn(ColumnName = "Remarks")] //用于SqlSugar
    public string? Remarks { get; set; }

    /// <summary>
    ///     äº§å“åç§°
    /// </summary>
    [SugarColumn(ColumnName = "DAA003")]
    public string? Daa003 { get; set; }

    /// <summary>
    ///     äº§å“è§„æ ¼
    /// </summary>
    [SugarColumn(ColumnName = "DAA004")]
    public string? Daa004 { get; set; }

    /// <summary>
    ///     å·¥å•æ•°é‡
    /// </summary>
    [SugarColumn(ColumnName = "DAA008")]
    public decimal? Daa008 { get; set; }

    /// <summary>
    ///     æäº¤çŠ¶æ€
    /// </summary>
    [SugarColumn(ColumnName = "FSUBMIT")]
    public decimal? FSubmit { get; set; }

    /// <summary>
    ///     æäº¤äºº
    /// </summary>
    [SugarColumn(ColumnName = "FSUBMIT_BY")]
    public string? FSubmitBy { get; set; }

    /// <summary>
    ///     æäº¤æ—¶é—´
    /// </summary>
    [SugarColumn(ColumnName = "FSUBMIT_DATE")]
    public DateTime? FSubmitDate { get; set; }

    /// <summary>
    ///     å·¥å•ç¼–号
    /// </summary>
    [SugarColumn(ColumnName = "MOID_NUM")]
    public string? MoidNum { get; set; }

    /// <summary>
    ///     é¡¹ç›®
    /// </summary>
    [SugarColumn(ColumnName = "PROJECT_CODE")]
    public string? PROJECT_CODE { get; set; }

    /// <summary>
    ///     å·¥å•çŠ¶æ€
    /// </summary>
    [SugarColumn(ColumnName = "DAA018")]
    public string? daa018 { get; set; }

    /// <summary>
    ///     é½å¥—状态
    /// </summary>
    [SugarColumn(ColumnName = "qtzt")]
    public string? DAA019 { get; set; }

    public string? searchValue { get; set; }

    // æ·»åŠ  selectedIndex å±žæ€§ä»¥æ”¯æŒå‰ç«¯ä¼ å…¥çš„搜索选项索引   æ–°æ·»åŠ 
     
    public int? selectedIndex { get; set; }
}

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

@@ -74,7 +74,74 @@
    //    return (data, totalCount);
    //}

    public (List<SJPageResult> item, int TotalCount) getPage(SJPageResult queryObj)
    //public (List<SJPageResult> item, int TotalCount) getPage(SJPageResult queryObj)
    //{
    //    var db = SqlSugarHelper.GetInstance();

    //    string[]? lineNo = null;

    //    // if (StringUtil.IsNotNullOrEmpty(queryObj.StatusUser))
    //    //     lineNo = _baseService.getUserLineNo(queryObj.StatusUser);

    //    var totalCount = 0;
    //    string searchValue = queryObj.searchValue?.Trim();

    //    // ========= æž„建基础 query =========
    //    var query = db.Queryable<SJPageResult>()
    //        .WhereIF(lineNo != null && lineNo.Length > 0,
    //            a => lineNo.Contains(a.line))
    //        .WhereIF(queryObj.Id != null,
    //            a => a.Id == queryObj.Id)
    //        .WhereIF(StringUtil.IsNotNullOrEmpty(queryObj.BillNo),
    //            a => a.BillNo == queryObj.BillNo)
    //        // æœªå®Œæˆ
    //        .WhereIF(
    //            StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
    //            "未完成".Equals(queryObj.Result),
    //            a => a.FSubmit == 0 || a.FSubmit == null)
    //        // å·²å®Œæˆ
    //        .WhereIF(
    //            StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
    //            !"未完成".Equals(queryObj.Result),
    //            a => a.FSubmit == 1);

    //    // ========= SearchValue åˆ¤æ–­ =========

    //    // SearchValue ä¸ºç©ºï¼šè¿”回全部
    //    if (string.IsNullOrWhiteSpace(searchValue))
    //    {
    //        var allData = query
    //            .OrderBy(a => a.BillNo, OrderByType.Desc)
    //            .ToPageList(
    //                Math.Max(queryObj.PageIndex, 1),
    //                Math.Max(queryObj.Limit, 1),
    //                ref totalCount
    //            );

    //        return (allData, totalCount);
    //    }

    //    // SearchValue ä¸ä¸ºç©ºï¼šæ¨¡ç³ŠæŸ¥ BILL_NO / ITEM_NO
    //    query = query.Where(a =>
    //        SqlFunc.Like(SqlFunc.Trim(a.BillNo).ToLower(), $"%{searchValue.ToLower()}%") ||
    //        SqlFunc.Like(SqlFunc.Trim(a.ItemNo).ToLower(), $"%{searchValue.ToLower()}%")
    //    );

    //    // ========= æ‰§è¡Œåˆ†é¡µ =========
    //    var data = query
    //        .OrderBy(a => a.BillNo, OrderByType.Desc)
    //        .ToPageList(
    //            Math.Max(queryObj.PageIndex, 1),
    //            Math.Max(queryObj.Limit, 1),
    //            ref totalCount
    //        );

    //    return (data, totalCount);
    //}



    public (List<SJPageResult> item, int TotalCount) getPage(SJPageResult2 queryObj)
    {
        var db = SqlSugarHelper.GetInstance();

@@ -85,6 +152,9 @@

        var totalCount = 0;
        string searchValue = queryObj.searchValue?.Trim();

        // èŽ·å–搜索选项索引 (0:项目, 1:线体, 2:工单号, 3:物料号, 4:物料名)
        int selectedIndex = queryObj.selectedIndex ?? 0;

        // ========= æž„建基础 query =========
        var query = db.Queryable<SJPageResult>()
@@ -121,11 +191,27 @@
            return (allData, totalCount);
        }

        // SearchValue ä¸ä¸ºç©ºï¼šæ¨¡ç³ŠæŸ¥ BILL_NO / ITEM_NO
        query = query.Where(a =>
            SqlFunc.Like(SqlFunc.Trim(a.BillNo).ToLower(), $"%{searchValue.ToLower()}%") ||
            SqlFunc.Like(SqlFunc.Trim(a.ItemNo).ToLower(), $"%{searchValue.ToLower()}%")
        );
        // SearchValue ä¸ä¸ºç©ºï¼šæ ¹æ®selectedIndex进行不同字段的模糊查询
        switch (queryObj.selectedIndex)
        {
            case 2: // å·¥å•å·
                query = query.Where(a => SqlFunc.Like(a.daa001.ToLower(), $"%{searchValue.ToLower()}%"));
                break;
            case 3: // ç‰©æ–™å·
                query = query.Where(a => SqlFunc.Like(a.ItemNo.ToLower(), $"%{searchValue.ToLower()}%"));
                break;
            case 4: // ç‰©æ–™åç§°
                query = query.Where(a => SqlFunc.Like(a.Daa003.ToLower(), $"%{searchValue.ToLower()}%"));
                break;
            case 0: // é¡¹ç›®ç¼–码
                query = query.Where(a => SqlFunc.Like(a.PROJECT_CODE.ToLower(), $"%{searchValue.ToLower()}%"));
                break;
            case 1: // çº¿ä½“
                query = query.Where(a => SqlFunc.Like(a.line.ToLower(), $"%{searchValue.ToLower()}%"));
                break;
            default:
                return (new List<SJPageResult>(), 0);
        }

        // ========= æ‰§è¡Œåˆ†é¡µ =========
        var data = query
@@ -138,10 +224,6 @@

        return (data, totalCount);
    }







@@ -306,7 +388,7 @@
        });

        item.Items = getQSItems(qsItemIpiReq.Id, null);
        var sjPageResult = new SJPageResult
        var sjPageResult = new SJPageResult2
            { Id = item.From.Id, Limit = 1, PageIndex = 1 };
        var pageResult = getPage(sjPageResult);
        item.Result = pageResult.item[0];

 StandardPda/MESApplication/Controllers/QC/SJController.cs

@@ -43,7 +43,7 @@


    [HttpPost("GetPage")]
    public ResponseResult GetPage([FromBody] SJPageResult queryObj)
    public ResponseResult GetPage([FromBody] SJPageResult2 queryObj)
    {
        try
        {