Merge remote-tracking branch 'origin/master'

啊鑫

2025-03-01 26b62961ce34bd91ba72560017d166502154aae8

Merge remote-tracking branch 'origin/master'

 StandardPda/MES.Service/Modes/IqcBefore.cs

@@ -23,5 +23,11 @@
        ///</summary>
         [SugarColumn(ColumnName="ITEM_ID"    )]
         public decimal ItemId { get; set; }

        /// <summary>
        /// PID 
        ///</summary>
        [SugarColumn(ColumnName = "PID")]
        public decimal PID { get; set; }
    }
}

 StandardPda/MES.Service/Modes/LtsLlj.cs

@@ -179,4 +179,9 @@
    /// 创建人
    /// </summary>
    [SugarColumn(IsIgnore = true)] public string? CreateUserName { get; set; }

    /// <summary>
    /// 上次不良描述
    /// </summary>
    [SugarColumn(IsIgnore = true)] public string? NewFngDesc { get; set; }
}

 StandardPda/MES.Service/Modes/MesQaItemsDetect01.cs

@@ -63,7 +63,7 @@
        /// 备注 
        ///</summary>
        [SugarColumn(ColumnName = "FNG_DESC")]
        public string FngDesc { get; set; }
        public string? FngDesc { get; set; }

        /// <summary>
        /// 检验结果 

 StandardPda/MES.Service/Modes/VMesQaItemsDetect01.cs

@@ -34,6 +34,13 @@
        /// </summary>
        [SugarColumn(ColumnName = "first")]
        public int First { get; set; }


        /// <summary>
        /// 对应视图中的 NEW_FNG_DESC 字段
        /// </summary>
        [SugarColumn(ColumnName = "NEW_FNG_DESC")]
        public string NewFngDesc { get; set; }
    }

}

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

@@ -26,41 +26,47 @@

        var totalCount = 0;

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

        var pageList = db.Queryable<LtsLlj, IqcBefore, SysUser, VMesQaItemsDetect01, SysUser>((a, b, c,d,e) =>
        var pageList = db.Queryable<LtsLlj, IqcBefore, VMesQaItemsDetect01, SysUser, IqcBeforeFrom, SysUser>((a, b,d,e,f,g) =>
                new JoinQueryInfos(JoinType.Left, a.ItemId == b.ItemId,
                    JoinType.Left, b.Sid == c.Fid,
                  
                    JoinType.Inner, a.Id == d.Id,
                     JoinType.Left, a.CreateBy == e.Fcode
                     JoinType.Left, a.CreateBy == e.Fcode,
                     JoinType.Left,f.Id==b.PID,
                     JoinType.Left, f.Sid == g.Fid
                ))
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.result) &&
                "未完成".Equals(queryObj.result),
                (a, b, c) => a.FcheckResu == null )
                (a, b, d) => a.FcheckResu == null )
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.result) &&
                !"未完成".Equals(queryObj.result),
                (a, b, c) => a.FcheckResu != null)
            .WhereIF(
                itemIds is { Length: > 0 },
                (a, b, c) => itemIds.Contains(a.ItemId))
            .WhereIF(id > 0, (a, b, c) => a.Id == id)
                (a, b, d) => a.FcheckResu != null)
            //.WhereIF(
            //    itemIds is { Length: > 0 },
            //    (a, b, c) => itemIds.Contains(a.ItemId))
            .WhereIF(id > 0, (a, b, d) => a.Id == id )
            .WhereIF(true, (a, b,d, e,f,g) => (g.Fcode == queryObj.createUser || g.Fcode == null))
        //加筛选条件,根据供应商，物料编码，物料名称搜索
        //.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,e) => new LtsLlj
            .OrderByDescending((a, b, d) => a.Id)
            .Select((a, b, d,e,f,g) => new LtsLlj
            {
                UserName = c.Fname,
                UserName = g.Fname,
                FIRST=d.First,
                CreateUserName=e.Fname
                CreateUserName=e.Fname,
                NewFngDesc=d.NewFngDesc

            }, true)
            .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);

        
        return (pageList, totalCount);
    }

@@ -552,8 +558,8 @@
        return SqlSugarHelper.UseTransactionWithOracle(db =>
        {
            return db.Updateable<MesQaItemsDetect01>()
                // .SetColumns(it =>
                //     it.Remarks == dto.Remarks) //SetColumns是可以叠加的 写2个就2个字段赋值
                 .SetColumns(it =>
                     it.FngDesc == dto.Remarks) //SetColumns是可以叠加的 写2个就2个字段赋值
                .Where(it => it.ReleaseNo == dto.releaseNo)
                .ExecuteCommand();
        });