From 0ac65b10a59bcca5b22bcf03086c8aaa36a8a525 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期四, 12 六月 2025 20:42:41 +0800
Subject: [PATCH] 1，签收送货单接口，添加签收人；2.来料检接口，添加到货时间字段
---
StandardPda/MES.Service/service/QC/SuspendService.cs | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/StandardPda/MES.Service/service/QC/SuspendService.cs b/StandardPda/MES.Service/service/QC/SuspendService.cs
index ce48de9..2c690c0 100644
--- a/StandardPda/MES.Service/service/QC/SuspendService.cs
+++ b/StandardPda/MES.Service/service/QC/SuspendService.cs
@@ -13,17 +13,18 @@
var db = SqlSugarHelper.GetInstance();
//return db.Queryable<SysDepartment>().ToList();
return db
- .Queryable<Womdaa, MesLine, QsQaItemXj, SysDepartment>(
- (a, b, c, d) =>
- new JoinQueryInfos(JoinType.Left,
- a.Daa002 == b.Id.ToString(),
- JoinType.Inner, a.Daa001 == c.BillNo,
- JoinType.Left, b.Departmentcode == d.Departmentcode))
+ .Queryable<Womdaa, MesLine, QsQaItemXj,
+ SysDepartment>((a, b, c, d) =>
+ 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 &&
statusArray.Contains(a.Daa018))
.GroupBy((a, b, c, d) => new
{
- b.Departmentcode, d.Departmentname
+ b.Departmentcode,
+ d.Departmentname
})
.Select((a, b, c, d) => new SysDepartment
{
@@ -35,17 +36,17 @@
public List<MesLine> GetLines(string deptCode)
{
var db = SqlSugarHelper.GetInstance();
- var mesLines = db.Queryable<Womdaa, MesLine, QsQaItemXj>(
- (a, b, c) =>
- new JoinQueryInfos(JoinType.Left,
- a.Daa002 == b.Id.ToString(),
- JoinType.Inner, a.Daa001 == c.BillNo))
+ var mesLines = db.Queryable<Womdaa, MesLine, QsQaItemXj>((a, b, c) =>
+ 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)
&& b.Departmentcode == deptCode)
.GroupBy((a, b, c) => new
{
- b.LineNo, b.LineName
+ b.LineNo,
+ b.LineName
})
.Select((a, b, c) => new MesLine
{
--
Gitblit v1.9.3