From 4fe0fa8f1703a5d815e310d2084e69481c19273d Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期二, 09 十二月 2025 16:05:22 +0800
Subject: [PATCH] OQC加字段
---
MES.Service/service/QC/MesOqcItemsDetect02Manager.cs | 4 ++++
MES.Service/Modes/MesOqcItemsDetect02.cs | 14 +++++++++++++-
MES.Service/Dto/service/XJPageResult.cs | 4 ++++
3 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/MES.Service/Dto/service/XJPageResult.cs b/MES.Service/Dto/service/XJPageResult.cs
index 2ed4287..f17ff7c 100644
--- a/MES.Service/Dto/service/XJPageResult.cs
+++ b/MES.Service/Dto/service/XJPageResult.cs
@@ -23,4 +23,8 @@
public string? ReleaseNo { get; set; }
public decimal? SearchIndex { get; set; }
+
+ public string? Sjxb { get; set; }
+
+ public string? XsDdh { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesOqcItemsDetect02.cs b/MES.Service/Modes/MesOqcItemsDetect02.cs
index 2e3896b..53fac2d 100644
--- a/MES.Service/Modes/MesOqcItemsDetect02.cs
+++ b/MES.Service/Modes/MesOqcItemsDetect02.cs
@@ -134,7 +134,19 @@
///</summary>
[SugarColumn(ColumnName = "DEPOT_ID")]
public decimal? DepotId { get; set; }
-
+
+ /// <summary>
+ /// 鐢熶骇绾跨粍
+ ///</summary>
+ [SugarColumn(ColumnName = "SJXB")]
+ public string? Sjxb { get; set; }
+
+ /// <summary>
+ /// 閿�鍞鍗曞彿
+ ///</summary>
+ [SugarColumn(ColumnName = "XS_DDH")]
+ public string? XsDdh { get; set; }
+
[SugarColumn(IsIgnore = true)]
public string? ItemName{ get; set; }
diff --git a/MES.Service/service/QC/MesOqcItemsDetect02Manager.cs b/MES.Service/service/QC/MesOqcItemsDetect02Manager.cs
index 3340241..c563acd 100644
--- a/MES.Service/service/QC/MesOqcItemsDetect02Manager.cs
+++ b/MES.Service/service/QC/MesOqcItemsDetect02Manager.cs
@@ -54,6 +54,10 @@
(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))
+ .WhereIF(StringUtil.IsNotNullOrEmpty(queryObj.Sjxb),
+ (a, b, c, d, e) => a.Sjxb.Contains(queryObj.Sjxb))
+ .WhereIF(StringUtil.IsNotNullOrEmpty(queryObj.XsDdh),
+ (a, b, c, d, e) => a.XsDdh.Contains(queryObj.XsDdh))
.OrderByDescending((a, b, c, d, e) => a.Id)
.Select((a, b, c, d, e) => new MesOqcItemsDetect02()
{
--
Gitblit v1.9.3