From 799a463b41e84aa265f109035c08892614ea9fd8 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期四, 24 七月 2025 21:12:32 +0800
Subject: [PATCH] 首检排序
---
MES.Service/Modes/MesQualityStandard.cs | 5 +++++
MES.Service/service/QC/SJService.cs | 7 ++++++-
MES.Service/Dto/service/SJPageResult.cs | 1 +
3 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/MES.Service/Dto/service/SJPageResult.cs b/MES.Service/Dto/service/SJPageResult.cs
index 413bd4d..213137d 100644
--- a/MES.Service/Dto/service/SJPageResult.cs
+++ b/MES.Service/Dto/service/SJPageResult.cs
@@ -112,4 +112,5 @@
[SugarColumn(ColumnName = "FSUBMIT_BY")] //瀹℃牳浜�
public string? SongJ { get; set; }
+ public string? Cjr { get; set; } //鍒涘缓浜�
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesQualityStandard.cs b/MES.Service/Modes/MesQualityStandard.cs
index a52a9f5..a0186a3 100644
--- a/MES.Service/Modes/MesQualityStandard.cs
+++ b/MES.Service/Modes/MesQualityStandard.cs
@@ -202,4 +202,9 @@
/// </summary>
[SugarColumn(ColumnName = "MEMO")]
public string Memo { get; set; }
+ /// <summary>
+ /// 搴忓彿
+ /// </summary>
+ [SugarColumn(ColumnName = "XH")]
+ public string Xh { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/service/QC/SJService.cs b/MES.Service/service/QC/SJService.cs
index 5bb9e7f..a7942ca 100644
--- a/MES.Service/service/QC/SJService.cs
+++ b/MES.Service/service/QC/SJService.cs
@@ -110,6 +110,8 @@
a => a.ItemCj.Contains(queryObj.ItemCj))
.WhereIF(!string.IsNullOrEmpty(queryObj.daa001),
a => a.daa001.Contains(queryObj.daa001))
+ .WhereIF(!string.IsNullOrEmpty(queryObj.Cjr),
+ a => a.Cjr.Contains(queryObj.Cjr))
.OrderBy(a => a.BillNo, OrderByType.Desc)
.ToPageList(queryObj.PageIndex, queryObj.Limit);
@@ -186,7 +188,9 @@
return db
.Queryable<MesQualityStandard>()
- .Where(b => b.QsType == "1" && b.ItemId == itemId).Select(b =>
+ .Where(b => b.QsType == "1" && b.ItemId == itemId)
+ .OrderBy(b => b.Xh) // 鎸塜h瀛楁鍗囧簭鎺掑簭
+ .Select(b =>
new QsItemIpiItem
{
ProjName = b.ProjName,
@@ -448,6 +452,7 @@
return db.Updateable<QsItemIpiReq>()
.SetColumns(s => s.IsPass == result)
.SetColumns(s => s.StatusUser == detail.CreateBy)
+ .SetColumns(s => s.StatusDate== DateTime.Now)
.SetColumns(s => s.CompleteTime == DateTime.Now)
.Where(s => s.Id == detail.Gid)
.ExecuteCommand();
--
Gitblit v1.9.3