1.新增MES_PROJECT.cs

fcx

3 天以前 7ee2e58c300374a15c212f9145ba9d762d64e0e6

1.新增MES_PROJECT.cs

2.完善巡检搜索功能

 StandardPda/MES.Service/Modes/MES_PROJECT.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,63 @@
using SqlSugar;

namespace MES.Service.Modes;

/// <summary>
/// </summary>
[SugarTable("MES_PROJECT")]
public class MES_PROJECT
{
   
    [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
    public decimal Id { get; set; }

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

    /// <summary>
    ///     é¡¹ç›®åç§°
    /// </summary>
    [SugarColumn(ColumnName = "PROJECT_NAME")]
    public string? PROJECT_NAME { get; set; }

    /// <summary>
    ///     é¡¹ç›®åˆ†ç±»
    /// </summary>
    [SugarColumn(ColumnName = "PROJECT_TYPE")]
    public string? PROJECT_TYPE { get; set; }

    /// <summary>
    ///    æè¿° 
    /// </summary>
    [SugarColumn(ColumnName = "DESCRIPTION")]
    public string? DESCRIPTION { get; set; }

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

    /// <summary>
    ///     é¡¹ç›®çŠ¶æ€
    /// </summary>
    [SugarColumn(ColumnName = "DOCUMENT_STATUS")]
    public string? DOCUMENT_STATUS { get; set; }

    /// <summary>
    ///     æ˜¯å¦ç”Ÿæ•ˆ
    /// </summary>
    [SugarColumn(ColumnName = "FORBID_STATUS")]
    public string? FORBID_STATUS { get; set; }


    /// <summary>
    ///     ä¸‹å‘组织
    /// </summary>
    [SugarColumn(ColumnName = "USE_ORG_ID")]
    public string? USE_ORG_ID { get; set; }

}

 StandardPda/MES.Service/Modes/QsQaItemXj.cs

@@ -144,4 +144,8 @@
    [SugarColumn(IsIgnore = true)] public string? ItemName { get; set; }

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

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

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

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

@@ -176,40 +176,45 @@
        var totalCount = 0;

        var pageList = db
            .Queryable<QsQaItemXj, Womdaa, MesItems>((s, a, b) =>
            .Queryable<QsQaItemXj, Womdaa, MesItems, Womcaa, MES_PROJECT>((s, a, b,c,d) =>
                new JoinQueryInfos(
                    JoinType.Inner, s.BillNo == a.Daa001,
                    JoinType.Left, s.ItemId == b.Id
                    JoinType.Left, s.ItemId == b.Id,
                    JoinType.Left,a.Daa021 == c.Caa001,
                    JoinType.Left ,d.Id == c.Project
                )
            )

            // â­ æ¨¡ç³Šæœç´¢ï¼ˆBillNo æˆ– ItemNo æ–°å¢ž
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.SearchValue),
                (s, a, b) =>
                (s, a, b,c,d) =>
                    s.BillNo.Contains(queryObj.SearchValue) ||
                    s.ItemNo.Contains(queryObj.SearchValue)
                    s.ItemNo.Contains(queryObj.SearchValue) ||
                    b.ItemName.Contains(queryObj.SearchValue)||
                    a.Daa020.Contains(queryObj.SearchValue)||
                    d.PROJECT_CODE.Contains(queryObj.SearchValue)
            )

            // â­ çŠ¶æ€ç­›é€‰ï¼šæœªå®Œæˆ
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.result) &&
                "未完成".Equals(queryObj.result),
                (s, a, b) => s.Fsubmit == null || s.Fsubmit == 0
                (s, a, b,c,d) => s.Fsubmit == null || s.Fsubmit == 0
            )

            // â­ çŠ¶æ€ç­›é€‰ï¼šå·²å®Œæˆ
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.result) &&
                !"未完成".Equals(queryObj.result),
                (s, a, b) => s.Fsubmit == 1
                (s, a, b,c,d) => s.Fsubmit == 1
            )

            // â­ ID æŸ¥è¯¢ï¼ˆå•æ¡ï¼‰
            .WhereIF(id > 0, (s, a, b) => s.Id == id)
            .WhereIF(id > 0, (s, a, b,c,d) => s.Id == id)

            // â­ select å®žä½“返回
            .Select((s, a, b) => new QsQaItemXj
            .Select((s, a, b,c,d) => new QsQaItemXj
            {
                Id = s.Id,
                ReleaseNo = s.ReleaseNo,
@@ -234,7 +239,9 @@
                // â­ é¢å¤–字段（来自连表）
                PlanQty = a.Daa008,
                ItemName = b.ItemName,
                ItemModel = b.ItemModel
                ItemModel = b.ItemModel,
                DAA020 = a.Daa020,
                PROJECT_CODE = d.PROJECT_CODE
            })

            .OrderBy(s => s.CreateDate, OrderByType.Desc)