From c9d9aacd884e9d730d47982e7f65ecc1bb836268 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 16 八月 2024 17:54:52 +0800
Subject: [PATCH] 修改三个检验，适配WOMDAA表
---
MES.Service/service/QC/SuspendService.cs | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/MES.Service/service/QC/SuspendService.cs b/MES.Service/service/QC/SuspendService.cs
index bc6fbef..b1db17d 100644
--- a/MES.Service/service/QC/SuspendService.cs
+++ b/MES.Service/service/QC/SuspendService.cs
@@ -6,20 +6,20 @@
public class SuspendService
{
- private readonly string[] statusArray = ["鐢熶骇", "寰呬骇", "鏆傚仠"];
+ private readonly string[] statusArray = ["寮�宸�", "寰呭紑宸�"];
public List<SysDepartment> getDept()
{
var db = SqlSugarHelper.GetInstance();
//return db.Queryable<SysDepartment>().ToList();
return db
- .Queryable<MesSchemeResult, MesLine, QsQaItemXj, SysDepartment>(
+ .Queryable<Womdaa, MesLine, QsQaItemXj, SysDepartment>(
(a, b, c, d) =>
- new JoinQueryInfos(JoinType.Left, a.LineNo == b.LineNo,
- JoinType.Inner, a.BillNo == c.BillNo,
+ new JoinQueryInfos(JoinType.Left, a.Daa002 == b.Id.ToString(),
+ JoinType.Inner, a.Daa001 == c.BillNo,
JoinType.Left, b.Departmentcode == d.Departmentcode))
- .Where((a, b, c, d) => a.PmoveMk == 0 && b.LineName != null &&
- statusArray.Contains(a.ProcStatus))
+ .Where((a, b, c, d) => b.LineName != null &&
+ statusArray.Contains(a.Daa018))
.GroupBy((a, b, c, d) => new
{
b.Departmentcode, d.Departmentname
@@ -34,20 +34,20 @@
public List<MesLine> GetLines(string deptCode)
{
var db = SqlSugarHelper.GetInstance();
- var mesLines = db.Queryable<MesSchemeResult, MesLine, QsQaItemXj>(
+ var mesLines = db.Queryable<Womdaa, MesLine, QsQaItemXj>(
(a, b, c) =>
- new JoinQueryInfos(JoinType.Left, a.LineNo == b.LineNo,
- JoinType.Inner, a.BillNo == c.BillNo))
+ new JoinQueryInfos(JoinType.Left, a.Daa002 == b.Id.ToString(),
+ JoinType.Inner, a.Daa001 == c.BillNo))
.Where((a, b, c) => b.LineName != null &&
- statusArray.Contains(a.ProcStatus)
+ statusArray.Contains(a.Daa018)
&& b.Departmentcode == deptCode)
.GroupBy((a, b, c) => new
{
- a.LineNo, b.LineName
+ b.LineNo, b.LineName
})
.Select((a, b, c) => new MesLine
{
- LineNo = a.LineNo,
+ LineNo = b.LineNo,
LineName = b.LineName
}).ToList();
--
Gitblit v1.9.3