From 7517c0cbcddb428b95498af990a4831769a9d7e7 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 30 七月 2025 08:53:21 +0800
Subject: [PATCH] 111
---
MES.Service/service/QC/MesOqcItemsDetect02Manager.cs | 4 +++-
MES.Service/Dto/service/XJPageResult.cs | 4 ++++
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/MES.Service/Dto/service/XJPageResult.cs b/MES.Service/Dto/service/XJPageResult.cs
index 1e23b03..2ed4287 100644
--- a/MES.Service/Dto/service/XJPageResult.cs
+++ b/MES.Service/Dto/service/XJPageResult.cs
@@ -19,4 +19,8 @@
public string? ItemModel { get; set; }
public string? itemCj { get; set; }
public string? ItemCode { get; set; }
+
+ public string? ReleaseNo { get; set; }
+
+ public decimal? SearchIndex { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/service/QC/MesOqcItemsDetect02Manager.cs b/MES.Service/service/QC/MesOqcItemsDetect02Manager.cs
index 881ee92..f9565c0 100644
--- a/MES.Service/service/QC/MesOqcItemsDetect02Manager.cs
+++ b/MES.Service/service/QC/MesOqcItemsDetect02Manager.cs
@@ -46,12 +46,14 @@
!"鏈畬鎴�".Equals(queryObj.result),
(a, b, c, d, e) => a.FcheckResu != null && a.Fsubmit == 1)
.WhereIF(id > 0, (a, b, c, d, e) => a.Id == id)
- .WhereIF(StringUtil.IsNotNullOrEmpty(queryObj.createUser),
+ .WhereIF(StringUtil.IsNotNullOrEmpty(queryObj.createUser) && queryObj.SearchIndex != null,
(a, b, c, d, e) => c.Fname.Contains(queryObj.createUser))
.WhereIF(StringUtil.IsNotNullOrEmpty(queryObj.ItemNo),
(a, b, c, d, e) => b.ItemNo.Contains(queryObj.ItemNo))
.WhereIF(StringUtil.IsNotNullOrEmpty(queryObj.ItemName),
(a, b, c, d, e) => b.ItemName.Contains(queryObj.ItemName))
+ .WhereIF(StringUtil.IsNotNullOrEmpty(queryObj.ReleaseNo),
+ (a, b, c, d, e) => a.ReleaseNo.Contains(queryObj.ReleaseNo))
.OrderByDescending((a, b, c, d, e) => a.Id)
.Select((a, b, c, d, e) => new MesOqcItemsDetect02()
{
--
Gitblit v1.9.3