From 04c86459ab6b656ea7d121e924d8d28ca96ac117 Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期四, 20 三月 2025 18:34:54 +0800
Subject: [PATCH] 人员表bug修复
---
MES.Service/service/QC/SJService.cs | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/MES.Service/service/QC/SJService.cs b/MES.Service/service/QC/SJService.cs
index b88c92d..0dd735c 100644
--- a/MES.Service/service/QC/SJService.cs
+++ b/MES.Service/service/QC/SJService.cs
@@ -57,6 +57,11 @@
StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
!"鏈畬鎴�".Equals(queryObj.Result),
a => a.Result != "鏈畬鎴�")
+ //鍔犵瓫閫夋潯浠�,鏍规嵁渚涘簲鍟嗭紝鐗╂枡缂栫爜锛岀墿鏂欏悕绉版悳绱�
+ //.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.Daa003.ToLower().Contains(queryObj.SearchValue.ToLower())
+ || a.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower())))
.OrderBy(a => a.BillNo, OrderByType.Desc)
.ToPageList(queryObj.PageIndex, queryObj.Limit);
@@ -92,18 +97,26 @@
// result = "鏈娴�"
// }).ToList();
// }
- public List<QsItemIpiItem> SetQSItems(string itemNo)
+ public List<QsItemIpiItem> SetQSItems(string itemNo,string lineNo)
{
var db = SqlSugarHelper.GetInstance();
- var count = db.Queryable<MesQa>().Where(s => s.QsType == "1"
- && s.ItemNo == itemNo && s.Fsubmit == 1).Count();
- if (count <= 0) return new List<QsItemIpiItem>();
+ //鏍规嵁绾夸綋缂栧彿鑾峰彇宸ュ簭ID
+
+
+ decimal? procid = db.Queryable<MesLine>().Where(s => s.LineNo == lineNo).Select(s => s.ProcId).First();
+
+ if (procid == null) { procid = 99999999; };
+
+ var count = db.Queryable<MesQa>().Where(s => s.QsType == "1"
+ && s.ItemNo == itemNo && s.Fsubmit == 1 && s.procid == procid).Count();
+
+ if (count <= 0) return [];
return db
.Queryable<MesQualityStandard>()
- .Where(b => b.QsType == "1" && b.ItemNo == itemNo).Select(
+ .Where(b => b.QsType == "1" && b.ItemNo == itemNo && b.ProcId == procid).Select(
b => new QsItemIpiItem
{
ProjName = b.ProjName,
--
Gitblit v1.9.3