From 26bccee691f9144e40a32c8a036d779a2d7bf01b Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期一, 25 八月 2025 20:00:08 +0800
Subject: [PATCH] 平板入库检、巡检、首检新增销售订单号字段
---
MES.Service/service/QC/XJService.cs | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/MES.Service/service/QC/XJService.cs b/MES.Service/service/QC/XJService.cs
index 54a24cd..0ae4b41 100644
--- a/MES.Service/service/QC/XJService.cs
+++ b/MES.Service/service/QC/XJService.cs
@@ -123,12 +123,13 @@
var query = db
.Queryable<QsQaItemXj, Womdaa, MesLine,
- MesItems, SysUser>((s, a, c, b, us) =>
+ MesItems, SysUser,Womcaa>((s, a, c, b, us,ca) =>
new JoinQueryInfos(
JoinType.Inner, s.BillNo == a.Daa001,
JoinType.Left, a.Daa015 == c.LineNo,
JoinType.Left, s.ItemId == b.Id,
- JoinType.Left, us.Fcode == s.CreateBy
+ JoinType.Left, us.Fcode == s.CreateBy,
+ JoinType.Left, ca.Caa020 == a.Daa021
)
)
//.WhereIF(lineNo != null && lineNo.Length > 0,
@@ -142,8 +143,8 @@
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
!"鏈畬鎴�".Equals(queryObj.result),
(s, a, c, b, us) => s.SubmitStatus == 1)
- .WhereIF(id > 0, (s, a, c, b, us) => s.Id == id)
- .Select((s, a, c, b, us) => new QsQaItemXj
+ .WhereIF(id > 0, (s, a, c, b, us,ca) => s.Id == id)
+ .Select((s, a, c, b, us,ca) => new QsQaItemXj
{
Daa020 = c.LineNo,
Id = s.Id,
@@ -159,7 +160,8 @@
ItemModel = b.ItemModel,
CheckBy = s.CheckBy,
CheckResult = s.CheckResult,
- Remarks = s.Remarks
+ Remarks = s.Remarks,
+ SaleOrder = ca.Caa015
}).OrderBy(s => s.CreateDate, OrderByType.Desc);
var items = query.ToPageList(queryObj.PageIndex, queryObj.Limit,
ref totalCount);
--
Gitblit v1.9.3