From fa53abd5d374862c640da5310d0bd1bb641a0d5b Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期二, 26 八月 2025 19:15:29 +0800
Subject: [PATCH] 检验查询功能新增、检验根据车间显示单据
---
MES.Service/service/QC/XJService.cs | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/MES.Service/service/QC/XJService.cs b/MES.Service/service/QC/XJService.cs
index 0ae4b41..51d78f7 100644
--- a/MES.Service/service/QC/XJService.cs
+++ b/MES.Service/service/QC/XJService.cs
@@ -123,13 +123,16 @@
var query = db
.Queryable<QsQaItemXj, Womdaa, MesLine,
- MesItems, SysUser,Womcaa>((s, a, c, b, us,ca) =>
+ MesItems, SysUser,Womcaa,SysDepartment, MesUserDepartmentQc,MesItems>((s, a, c, b, us,ca,d,dq,i) =>
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, ca.Caa020 == a.Daa021
+ JoinType.Left, ca.Caa020 == a.Daa021,
+ JoinType.Left, d.Departmentcode == c.Departmentcode,
+ JoinType.Left, dq.Departmentcode == d.Departmentcode,//鏌ヨ鐢ㄦ埛鏉冮檺
+ JoinType.Left, i.Id == Convert.ToDecimal(a.Daa002)
)
)
//.WhereIF(lineNo != null && lineNo.Length > 0,
@@ -144,7 +147,15 @@
!"鏈畬鎴�".Equals(queryObj.result),
(s, a, c, b, us) => s.SubmitStatus == 1)
.WhereIF(id > 0, (s, a, c, b, us,ca) => s.Id == id)
- .Select((s, a, c, b, us,ca) => new QsQaItemXj
+ .WhereIF(!string.IsNullOrEmpty(queryObj.LoginUser),
+ (s, a, c, b, us, ca, d, dq) => dq.Usercode == queryObj.LoginUser)
+ .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue),
+ (s, a, c, b, us, ca, d, dq,i) =>
+ s.ReleaseNo.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
+ i.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
+ ca.Caa015.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
+ i.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower()))
+ .Select((s, a, c, b, us,ca,d) => new QsQaItemXj
{
Daa020 = c.LineNo,
Id = s.Id,
@@ -161,7 +172,9 @@
CheckBy = s.CheckBy,
CheckResult = s.CheckResult,
Remarks = s.Remarks,
- SaleOrder = ca.Caa015
+ SaleOrder = ca.Caa015,
+ DepartName = d.Departmentname
+
}).OrderBy(s => s.CreateDate, OrderByType.Desc);
var items = query.ToPageList(queryObj.PageIndex, queryObj.Limit,
ref totalCount);
--
Gitblit v1.9.3