From 795fa3a0ce15e32463a444c2b3fc1468596afba2 Mon Sep 17 00:00:00 2001
From: sjz <1240968267@qq.com>
Date: 星期二, 18 三月 2025 13:41:48 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~sjz/YC
---
MES.Service/service/QC/SuspendService.cs | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/MES.Service/service/QC/SuspendService.cs b/MES.Service/service/QC/SuspendService.cs
index b1db17d..ce48de9 100644
--- a/MES.Service/service/QC/SuspendService.cs
+++ b/MES.Service/service/QC/SuspendService.cs
@@ -15,7 +15,8 @@
return db
.Queryable<Womdaa, MesLine, QsQaItemXj, SysDepartment>(
(a, b, c, d) =>
- new JoinQueryInfos(JoinType.Left, a.Daa002 == b.Id.ToString(),
+ 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) => b.LineName != null &&
@@ -36,7 +37,8 @@
var db = SqlSugarHelper.GetInstance();
var mesLines = db.Queryable<Womdaa, MesLine, QsQaItemXj>(
(a, b, c) =>
- new JoinQueryInfos(JoinType.Left, a.Daa002 == b.Id.ToString(),
+ 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.Daa018)
--
Gitblit v1.9.3