From 6436164235ca9823edce52accf042456c42bbb99 Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期四, 28 八月 2025 18:15:36 +0800
Subject: [PATCH] 发货通知单备注字段更新
---
MES.Service/service/QC/RKJService.cs | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/MES.Service/service/QC/RKJService.cs b/MES.Service/service/QC/RKJService.cs
index 886d05b..32b0285 100644
--- a/MES.Service/service/QC/RKJService.cs
+++ b/MES.Service/service/QC/RKJService.cs
@@ -522,14 +522,16 @@
var query = db
- .Queryable<QsItemOqcReq, MesItems, Womdaa, MesLine, SysUser,Womcaa>((a, b,
- da, c, us, ca) =>
+ .Queryable<QsItemOqcReq, MesItems, Womdaa, MesLine, SysUser,Womcaa, SysDepartment,MesUserDepartmentQc>((a, b,
+ da, c, us, ca, d, dq) =>
new JoinQueryInfos(
JoinType.Left, a.ItemNo == b.ItemNo, // 鍏宠仈鐗╂枡淇℃伅
JoinType.Left, a.BillNo == da.Daa001, // 鍏宠仈宸ュ崟淇℃伅
- JoinType.Left, da.Daa021 == ca.Caa020,//浠诲姟鍗曪紝鐢ㄤ簬鏌ヨ閿�鍞鍗曞彿
JoinType.Left, da.Daa015 == c.LineNo, // 鍏宠仈宸ュ崟淇℃伅
- JoinType.Left, us.Fcode == a.CreateBy // 鍏宠仈宸ュ崟淇℃伅
+ JoinType.Left, us.Fcode == a.CreateBy, // 鍏宠仈宸ュ崟淇℃伅
+ JoinType.Left, da.Daa021 == ca.Caa020,//浠诲姟鍗曪紝鐢ㄤ簬鏌ヨ閿�鍞鍗曞彿
+ JoinType.Left, d.Departmentid == Convert.ToDecimal(da.Daa013),//鏌ヨ杞﹂棿
+ JoinType.Left, dq.Departmentcode == d.Departmentcode//鏌ヨ鐢ㄦ埛鏉冮檺
))
// 鐢ㄦ埛绾夸綋杩囨护鏉′欢
//.WhereIF(lineNo != null && lineNo.Length > 0 && !"PL017".Equals(queryObj.createUser),
@@ -544,12 +546,17 @@
(a, b, da, c, us) => a.Fsubmit == 1)
// 鎼滅储鏉′欢锛堢墿鏂欏悕绉�/缂栧彿锛�
.WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue),
- (a, b, da, c, us) =>
+ (a, b, da, c, us,ca) =>
b.ItemName.ToLower()
.Contains(queryObj.SearchValue.ToLower()) ||
+ ca.Caa015.ToLower()
+ .Contains(queryObj.SearchValue.ToLower()) ||
a.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower()))
+ // 鏂板锛氱敤鎴穋ode杩囨护
+ .WhereIF(!string.IsNullOrEmpty(queryObj.LoginUser),
+ (a, b, da, c, us, ca, d, dq) => dq.Usercode == queryObj.LoginUser)
// 鏌ヨ瀛楁
- .Select((a, b, da, c, us, ca) => new QsItemOqcReq
+ .Select((a, b, da, c, us, ca,d,dq) => new QsItemOqcReq
{
Id = a.Id,
BillNo = a.BillNo,
@@ -568,7 +575,8 @@
Fsubmit = a.Fsubmit,
Quantity = da.Daa008,
LineNo = c.LineName,
- SaleOederNo = ca.Caa015
+ SaleOrderNo = ca.Caa015,
+ DepartName = d.Departmentname
})
// 鎺掑簭
.OrderBy(a => a.CreateDate, OrderByType.Desc);
--
Gitblit v1.9.3