From 469d5fa02a63b78079e5da1a8d569e562bc5a36e Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期一, 24 二月 2025 10:34:44 +0800
Subject: [PATCH] 来料检添加搜索查询功能
---
StandardPda/MES.Service/service/QC/LljService.cs | 13 +++++++++++--
StandardPda/MES.Service/Dto/service/XJPageResult.cs | 4 ++++
StandardPda/MES.Service/Modes/MesQaItemsDetectDetail12.cs | 2 +-
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/StandardPda/MES.Service/Dto/service/XJPageResult.cs b/StandardPda/MES.Service/Dto/service/XJPageResult.cs
index 0f9859d..6eb7485 100644
--- a/StandardPda/MES.Service/Dto/service/XJPageResult.cs
+++ b/StandardPda/MES.Service/Dto/service/XJPageResult.cs
@@ -8,4 +8,8 @@
public string? result { get; set; }
public string? id { get; set; }
+ /// <summary>
+ /// 鎼滅储鏉′欢锛屾牴鎹鏉′欢绛涢�変緵搴斿晢 鐗╂枡缂栫爜 鐗╂枡鍚嶇О鐨勬暟鎹�
+ /// </summary>
+ public string? SearchValue { get; set; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Modes/MesQaItemsDetectDetail12.cs b/StandardPda/MES.Service/Modes/MesQaItemsDetectDetail12.cs
index e1ea363..89bbddd 100644
--- a/StandardPda/MES.Service/Modes/MesQaItemsDetectDetail12.cs
+++ b/StandardPda/MES.Service/Modes/MesQaItemsDetectDetail12.cs
@@ -14,7 +14,7 @@
/// <summary>
///
///</summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+ [SugarColumn(ColumnName = "ID",OracleSequenceName = "SEQ_QM_ID", IsPrimaryKey = true)]
public decimal Id { get; set; }
/// <summary>
diff --git a/StandardPda/MES.Service/service/QC/LljService.cs b/StandardPda/MES.Service/service/QC/LljService.cs
index e0dda16..fd7a432 100644
--- a/StandardPda/MES.Service/service/QC/LljService.cs
+++ b/StandardPda/MES.Service/service/QC/LljService.cs
@@ -4,6 +4,7 @@
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.util;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
using SqlSugar;
using DbType = System.Data.DbType;
@@ -45,6 +46,12 @@
itemIds is { Length: > 0 },
(a, b, c) => itemIds.Contains(a.ItemId))
.WhereIF(id > 0, (a, b, c) => a.Id == id)
+ //鍔犵瓫閫夋潯浠�,鏍规嵁渚涘簲鍟嗭紝鐗╂枡缂栫爜锛岀墿鏂欏悕绉版悳绱�
+ //.WhereIF(queryObj.SearchValue!=null && queryObj.SearchValue!="", (a) => a.SuppName == queryObj.SearchValue|| a.ItemName == queryObj.SearchValue || a.ItemNo == queryObj.SearchValue )
+ .WhereIF(queryObj.SearchValue != null && queryObj.SearchValue != "",
+ (a) => (a.SuppName.ToLower().Contains(queryObj.SearchValue.ToLower())
+ || a.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower())
+ || a.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower())))
.OrderByDescending((a, b, c) => a.Id)
.Select((a, b, c, d,e) => new LtsLlj
{
@@ -264,7 +271,8 @@
a.FspecRequ,
a.FreQty,
a.CheckQyt,
- a.FcheckResu
+ a.FcheckResu,
+ a.FcheckItemDesc
}).Select((a, b) => new MesQaItemsDetectDetail5
{
Id = a.Id,
@@ -283,7 +291,8 @@
Factory = "1000",
Company = "1000",
FenterQty = SqlFunc.AggregateCount(b.Id),
- FcheckResu = a.FcheckResu
+ FcheckResu = a.FcheckResu,
+ FcheckItemDesc=a.FcheckItemDesc
}).ToList();
}
--
Gitblit v1.9.3