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/SJService.cs | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/MES.Service/service/QC/SJService.cs b/MES.Service/service/QC/SJService.cs
index 6b6cf31..555ec39 100644
--- a/MES.Service/service/QC/SJService.cs
+++ b/MES.Service/service/QC/SJService.cs
@@ -48,11 +48,14 @@
//if (StringUtil.IsNotNullOrEmpty(queryObj.StatusUser))
// lineNo = _baseService.getUserLineNo(queryObj.StatusUser);
- var data = db.Queryable<SJPageResult, Womdaa, Womcaa> ((a,
- da,ca) =>
+ var data = db.Queryable<SJPageResult, Womdaa, Womcaa, SysDepartment, MesUserDepartmentQc,MesItems> ((a,
+ da,ca,d,dq,i) =>
new JoinQueryInfos(
JoinType.Left, Convert.ToDecimal(a.Pbaid) == da.Id, // 鍏宠仈宸ュ崟淇℃伅
- JoinType.Left, da.Daa021 == ca.Caa020//浠诲姟鍗曪紝鐢ㄤ簬鏌ヨ閿�鍞鍗曞彿
+ JoinType.Left, da.Daa021 == ca.Caa020,//浠诲姟鍗曪紝鐢ㄤ簬鏌ヨ閿�鍞鍗曞彿
+ JoinType.Left, d.Departmentid == Convert.ToDecimal(da.Daa013),//鏌ヨ杞﹂棿
+ JoinType.Left, dq.Departmentcode == d.Departmentcode,//鏌ヨ鐢ㄦ埛鏉冮檺
+ JoinType.Left, i.Id == Convert.ToDecimal(da.Daa002)//鏌ヨ鐢ㄦ埛鏉冮檺
))
//.WhereIF(lineNo != null && lineNo.Length > 0,
// a => lineNo.Contains(a.line))
@@ -67,7 +70,17 @@
StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
!"鏈畬鎴�".Equals(queryObj.Result),
a => a.FSubmit == "1")
- .Select((a, da, ca) => new SJPageResult
+ //鍖归厤鏉冮檺
+ .WhereIF(!string.IsNullOrEmpty(queryObj.LoginUser),
+ (a, da, ca, d, dq) => dq.Usercode == queryObj.LoginUser)
+ //鍖归厤鎼滅储瀛楃涓�
+ .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue),
+ (a, da, ca, d, dq,i) =>
+ a.BillNo.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((a, da, ca, d, dq) => new SJPageResult
{
Id = a.Id,
BillNo = a.BillNo,
@@ -91,9 +104,8 @@
Daa004 = a.Daa004,
Daa008 = a.Daa008,
LineName = a.LineName,
-
- // 鏄犲皠棰濆鐨勫瓧娈碉紙閿�鍞鍗曞彿锛�
- SaleOrder = ca.Caa015
+ SaleOrder = ca.Caa015,
+ DepartName = d.Departmentname
})
.OrderBy(a => a.CreateTime, OrderByType.Desc);
var items = data.ToPageList(queryObj.PageIndex, queryObj.Limit,ref totalCount);
--
Gitblit v1.9.3