From b2bc0cccd77524b3ba1f05d5f7854324ce62ba2e Mon Sep 17 00:00:00 2001
From: wbc <2597324127@qq.com>
Date: 星期三, 12 二月 2025 18:12:14 +0800
Subject: [PATCH] 泰莱姆首检巡检添加
---
MES.Service/service/QC/XJService.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/MES.Service/service/QC/XJService.cs b/MES.Service/service/QC/XJService.cs
index 01603a2..cc2ff82 100644
--- a/MES.Service/service/QC/XJService.cs
+++ b/MES.Service/service/QC/XJService.cs
@@ -47,7 +47,7 @@
return db.Queryable<Womdaa>()
.Where(a =>
a.Daa001 == daa001 &&
- statusArray.Contains(a.Daa018))
+ a.Daa018 != "瀹屽伐")
.ToList();
}
@@ -58,7 +58,7 @@
return db.Queryable<Womdaa, MesLine>((a, b) =>
new JoinQueryInfos(JoinType.Left, a.Daa015 == b.LineNo))
.Where((a, b) => b.LineName != null &&
- statusArray.Contains(a.Daa018))
+ a.Daa018 != "瀹屽伐")
.GroupBy((a, b) => new
{
b.LineNo, b.LineName
@@ -78,7 +78,7 @@
.Where((a, b) =>
a.Daa015 == daa020 &&
b.ItemNo == item &&
- statusArray.Contains(a.Daa018))
+ a.Daa018 != "瀹屽伐")
.Select<Womdaa>(a => new Womdaa
{
Id = a.Id,
@@ -93,16 +93,16 @@
var db = SqlSugarHelper.GetInstance();
return db.Queryable<Womdaa, MesItems>((a, b) =>
new JoinQueryInfos(JoinType.Inner, a.Daa002 == b.Id.ToString()))
- .Where((a, b) => statusArray.Contains(a.Daa018) &&
+ .Where((a, b) => a.Daa018 != "瀹屽伐" &&
a.Daa015 == lineNo)
.OrderBy((a, b) => b.ItemName)
.Select<MesItems>((a, b) =>
new MesItems
{
- Id = b.Id,
+ ItemId = b.ItemId,
ItemNo = b.ItemNo,
ItemName = b.ItemName,
- ItemModel = b.ItemModel,
+ ItemModel = b.ItemModel
}).ToList();
}
@@ -157,19 +157,19 @@
}
- public List<QsQaItemXj01> setJYItem(string itemNo)
+ public List<QsQaItemXj01> setJYItem(decimal itemId)
{
var db = SqlSugarHelper.GetInstance();
var count = db.Queryable<MesQa>().Where(s => s.QsType == "2"
- && s.ItemNo == itemNo && s.Fsubmit == 1).Count();
+ && s.ItemId == itemId && s.Fsubmit == 1).Count();
if (count <= 0) return new List<QsQaItemXj01>();
return db
.Queryable<MesQualityStandard>()
.Where(b => b.QsType == "2"
- && b.ItemNo == itemNo).Select(
+ && b.ItemId == itemId).Select(
b => new QsQaItemXj01
{
ProjName = b.ProjName,
--
Gitblit v1.9.3