From c53a461aef16902ca78cdb7bd0c62305e2fee809 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 29 七月 2025 19:23:04 +0800
Subject: [PATCH] Update OQC search API functionality
---
MESApplication/Controllers/QC/MesOqcItemsDetect02Controller.cs | 4 +---
MES.Service/service/QC/MesOqcItemsDetect02Manager.cs | 6 ++++++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/MES.Service/service/QC/MesOqcItemsDetect02Manager.cs b/MES.Service/service/QC/MesOqcItemsDetect02Manager.cs
index 2c069f7..881ee92 100644
--- a/MES.Service/service/QC/MesOqcItemsDetect02Manager.cs
+++ b/MES.Service/service/QC/MesOqcItemsDetect02Manager.cs
@@ -46,6 +46,12 @@
!"鏈畬鎴�".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),
+ (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))
.OrderByDescending((a, b, c, d, e) => a.Id)
.Select((a, b, c, d, e) => new MesOqcItemsDetect02()
{
diff --git a/MESApplication/Controllers/QC/MesOqcItemsDetect02Controller.cs b/MESApplication/Controllers/QC/MesOqcItemsDetect02Controller.cs
index a2c2071..f293ee1 100644
--- a/MESApplication/Controllers/QC/MesOqcItemsDetect02Controller.cs
+++ b/MESApplication/Controllers/QC/MesOqcItemsDetect02Controller.cs
@@ -219,10 +219,8 @@
{
try
{
- dynamic resultInfos = new ExpandoObject();
var (item, totalCount) = m.GetPage(queryObj);
- var tbBillList =
- resultInfos.tbBillList = item;
+ var tbBillList = item;
return new ResponseResult
{
status = 0,
--
Gitblit v1.9.3