StandardPda/MES.Service/Dto/service/XJPageResult.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
StandardPda/MES.Service/Modes/LtsLlj.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
StandardPda/MES.Service/Modes/MesQaItemsDetectDetail12.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
StandardPda/MES.Service/Modes/VMesQaItemsDetect01.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
StandardPda/MES.Service/service/QC/LljService.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
StandardPda/MES.Service/Dto/service/XJPageResult.cs
@@ -8,4 +8,8 @@ public string? result { get; set; } public string? id { get; set; } /// <summary> /// æç´¢æ¡ä»¶ï¼æ ¹æ®æ¤æ¡ä»¶çéä¾åºå ç©æç¼ç ç©æåç§°çæ°æ® /// </summary> public string? SearchValue { get; set; } } StandardPda/MES.Service/Modes/LtsLlj.cs
@@ -171,4 +171,12 @@ public int Ftype { get; set; } [SugarColumn(IsIgnore = true)] public string? UserName { get; set; } /// <summary> /// ç©ææ è¯ï¼0ï¼é馿¬¡ã1ï¼é¦æ¬¡ï¼ /// </summary> [SugarColumn(IsIgnore = true)] public int? FIRST { get; set; } /// <summary> /// å建人 /// </summary> [SugarColumn(IsIgnore = true)] public string? CreateUserName { get; set; } } StandardPda/MES.Service/Modes/MesQaItemsDetectDetail12.cs
@@ -14,7 +14,7 @@ /// <summary> /// ///</summary> [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] [SugarColumn(ColumnName = "ID",OracleSequenceName = "SEQ_QM_ID", IsPrimaryKey = true)] public decimal Id { get; set; } /// <summary> StandardPda/MES.Service/Modes/VMesQaItemsDetect01.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,40 @@ using SqlSugar; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; using SqlSugar; namespace MES.Service.Modes { [SugarTable("V_MES_QA_ITEMS_DETECT_01")] public class VMesQaItemsDetect01 { /// <summary> /// 对åºè§å¾ä¸ç id åæ®µ /// </summary> [SugarColumn(ColumnName = "id")] public int Id { get; set; } /// <summary> /// 对åºè§å¾ä¸ç ITEM_ID åæ®µ /// </summary> [SugarColumn(ColumnName = "ITEM_ID")] public string ItemId { get; set; } /// <summary> /// 对åºè§å¾ä¸ç SUPP_NO åæ®µ /// </summary> [SugarColumn(ColumnName = "SUPP_NO")] public string SuppNo { get; set; } /// <summary> /// 对åºè§å¾ä¸ç first åæ®µ /// </summary> [SugarColumn(ColumnName = "first")] public int First { get; set; } } } 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,14 +28,16 @@ var itemIds = GetQaItem(db, queryObj.createUser); var pageList = db.Queryable<LtsLlj, IqcBefore, SysUser>((a, b, c) => new JoinQueryInfos(JoinType.Inner, a.ItemId == b.ItemId, JoinType.Inner, b.Sid == c.Fid 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, a.CreateBy == e.Fcode )) .WhereIF( StringUtil.IsNotNullOrEmpty(queryObj.result) && "æªå®æ".Equals(queryObj.result), (a, b, c) => a.FcheckResu == null) (a, b, c) => a.FcheckResu == null ) .WhereIF( StringUtil.IsNotNullOrEmpty(queryObj.result) && !"æªå®æ".Equals(queryObj.result), @@ -43,10 +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) => new LtsLlj .Select((a, b, c, d,e) => new LtsLlj { UserName = c.Fname UserName = c.Fname, FIRST=d.First, CreateUserName=e.Fname }, true) .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount); @@ -260,7 +271,8 @@ a.FspecRequ, a.FreQty, a.CheckQyt, a.FcheckResu a.FcheckResu, a.FcheckItemDesc }).Select((a, b) => new MesQaItemsDetectDetail5 { Id = a.Id, @@ -279,7 +291,8 @@ Factory = "1000", Company = "1000", FenterQty = SqlFunc.AggregateCount(b.Id), FcheckResu = a.FcheckResu FcheckResu = a.FcheckResu, FcheckItemDesc=a.FcheckItemDesc }).ToList(); }