From 148e3eea1fea2d45ab135c6e66e69d163a4dd811 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期五, 28 二月 2025 16:19:53 +0800
Subject: [PATCH] 代码提交
---
StandardPda/MES.Service/service/QC/LljService.cs | 38 ++++++++++++++++++++++----------------
StandardPda/MES.Service/Modes/IqcBefore.cs | 6 ++++++
StandardPda/MES.Service/Modes/LtsLlj.cs | 5 +++++
StandardPda/MES.Service/Modes/MesQaItemsDetect01.cs | 2 +-
StandardPda/MES.Service/Modes/VMesQaItemsDetect01.cs | 7 +++++++
5 files changed, 41 insertions(+), 17 deletions(-)
diff --git a/StandardPda/MES.Service/Modes/IqcBefore.cs b/StandardPda/MES.Service/Modes/IqcBefore.cs
index 917f19d..3c5cac6 100644
--- a/StandardPda/MES.Service/Modes/IqcBefore.cs
+++ b/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; }
}
}
diff --git a/StandardPda/MES.Service/Modes/LtsLlj.cs b/StandardPda/MES.Service/Modes/LtsLlj.cs
index ef25554..6a89652 100644
--- a/StandardPda/MES.Service/Modes/LtsLlj.cs
+++ b/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; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Modes/MesQaItemsDetect01.cs b/StandardPda/MES.Service/Modes/MesQaItemsDetect01.cs
index 71b0a9e..ff63c5d 100644
--- a/StandardPda/MES.Service/Modes/MesQaItemsDetect01.cs
+++ b/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>
/// 妫�楠岀粨鏋�
diff --git a/StandardPda/MES.Service/Modes/VMesQaItemsDetect01.cs b/StandardPda/MES.Service/Modes/VMesQaItemsDetect01.cs
index 60daa28..3fe9ac5 100644
--- a/StandardPda/MES.Service/Modes/VMesQaItemsDetect01.cs
+++ b/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; }
}
}
diff --git a/StandardPda/MES.Service/service/QC/LljService.cs b/StandardPda/MES.Service/service/QC/LljService.cs
index fd7a432..4137734 100644
--- a/StandardPda/MES.Service/service/QC/LljService.cs
+++ b/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();
});
--
Gitblit v1.9.3