From af8a3bd6decd62c60993fa2a4d51866eb4d255de Mon Sep 17 00:00:00 2001
From: 如洲 陈 <1278080563@qq.com>
Date: 星期二, 30 九月 2025 11:09:52 +0800
Subject: [PATCH] 首检巡检入库检验优化
---
MES.Service/service/QC/XJService.cs | 12 ++++++++++++
MES.Service/Modes/QsItemOqcReq.cs | 6 ++++++
MES.Service/service/QC/RKJService.cs | 12 ++++++++++++
3 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/MES.Service/Modes/QsItemOqcReq.cs b/MES.Service/Modes/QsItemOqcReq.cs
index 3d9cc8e..5261638 100644
--- a/MES.Service/Modes/QsItemOqcReq.cs
+++ b/MES.Service/Modes/QsItemOqcReq.cs
@@ -153,4 +153,10 @@
[SugarColumn(IsIgnore = true)] public string? LineNo { get; set; }
[SugarColumn(IsIgnore = true)] public decimal? Quantity { get; set; }
+
+ /// <summary>
+ /// 閫佹鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "JYNUM")]
+ public decimal? Jynum { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/service/QC/RKJService.cs b/MES.Service/service/QC/RKJService.cs
index f1b75b0..ce5f074 100644
--- a/MES.Service/service/QC/RKJService.cs
+++ b/MES.Service/service/QC/RKJService.cs
@@ -373,6 +373,11 @@
v => v.Fsubmit == 1)
.WhereIF(queryObj.fsubmit.HasValue && queryObj.fsubmit.Value == 0,
v => SqlFunc.IsNull(v.Fsubmit, 0) != 1)
+ .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue),
+ v => v.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
+ v.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
+ v.ReleaseNo.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
+ v.BillNo.ToLower().Contains(queryObj.SearchValue.ToLower()))
.Select(v => new QsItemOqcReq
{
Id = v.Id,
@@ -397,6 +402,7 @@
Quantity = v.Quantity
})
.OrderBy(v => v.CreateDate, OrderByType.Desc)
+ .OrderBy(v => v.FcheckDate, OrderByType.Desc)
.ToPageList(queryObj.PageIndex, queryObj.Limit);
}
@@ -422,6 +428,11 @@
v => v.Fsubmit == 1)
.WhereIF(queryObj.fsubmit.HasValue && queryObj.fsubmit.Value == 0,
v => SqlFunc.IsNull(v.Fsubmit, 0) != 1)
+ .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue),
+ v => v.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
+ v.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
+ v.ReleaseNo.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
+ v.BillNo.ToLower().Contains(queryObj.SearchValue.ToLower()))
.Select(v => new QsItemOqcReq
{
Id = v.Id,
@@ -446,6 +457,7 @@
Quantity = v.Quantity
})
.OrderBy(v => v.CreateDate, OrderByType.Desc)
+ .OrderBy(v => v.FcheckDate, OrderByType.Desc)
.ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
return (data, totalCount);
diff --git a/MES.Service/service/QC/XJService.cs b/MES.Service/service/QC/XJService.cs
index 23b9feb..a6dc2aa 100644
--- a/MES.Service/service/QC/XJService.cs
+++ b/MES.Service/service/QC/XJService.cs
@@ -114,6 +114,12 @@
.WhereIF(queryObj.fsubmit.HasValue && queryObj.fsubmit.Value == 0,
(s, a, c, b) => SqlFunc.IsNull(s.Fsubmit, 0) != 1)
.WhereIF(id > 0, (s, a, c, b) => s.Id == id)
+ .WhereIF(!string.IsNullOrEmpty(queryObj.lineNo), (s, a, c, b) => c.LineNo == queryObj.lineNo)
+ .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue),
+ (s, a, c, b) => s.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
+ s.BillNo.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
+ s.ReleaseNo.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
+ b.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower()))
.Select((s, a, c, b) => new QsQaItemXj
{
Daa020 = c.LineNo,
@@ -168,6 +174,12 @@
.WhereIF(queryObj.fsubmit.HasValue && queryObj.fsubmit.Value == 0,
(s, a, c, b) => SqlFunc.IsNull(s.Fsubmit, 0) != 1)
.WhereIF(id > 0, (s, a, c, b) => s.Id == id)
+ .WhereIF(!string.IsNullOrEmpty(queryObj.lineNo), (s, a, c, b) => c.LineNo == queryObj.lineNo)
+ .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue),
+ (s, a, c, b) => s.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
+ s.BillNo.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
+ s.ReleaseNo.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
+ b.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower()))
.Select((s, a, c, b) => new QsQaItemXj
{
Daa020 = c.LineNo,
--
Gitblit v1.9.3