From f31edb8fa31c6608d34d303e750890f7eea1930b Mon Sep 17 00:00:00 2001
From: sjz <1240968267@qq.com>
Date: 星期二, 26 八月 2025 14:08:02 +0800
Subject: [PATCH] 首检获取检验项目前 删除原有检验项
---
MES.Service/service/QC/RKJService.cs | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/MES.Service/service/QC/RKJService.cs b/MES.Service/service/QC/RKJService.cs
index a5aa607..bb14c83 100644
--- a/MES.Service/service/QC/RKJService.cs
+++ b/MES.Service/service/QC/RKJService.cs
@@ -522,13 +522,14 @@
var query = db
- .Queryable<QsItemOqcReq, MesItems, Womdaa, MesLine, SysUser>((a, b,
- da, c, us) =>
+ .Queryable<QsItemOqcReq, MesItems, Womdaa, MesLine, SysUser,Womcaa>((a, b,
+ da, c, us, ca) =>
new JoinQueryInfos(
JoinType.Left, a.ItemNo == b.ItemNo, // 鍏宠仈鐗╂枡淇℃伅
JoinType.Left, a.BillNo == da.Daa001, // 鍏宠仈宸ュ崟淇℃伅
JoinType.Left, da.Daa015 == c.LineNo, // 鍏宠仈宸ュ崟淇℃伅
- JoinType.Left, us.Fcode == a.CreateBy // 鍏宠仈宸ュ崟淇℃伅
+ JoinType.Left, us.Fcode == a.CreateBy, // 鍏宠仈宸ュ崟淇℃伅
+ JoinType.Left, da.Daa021 == ca.Caa020//浠诲姟鍗曪紝鐢ㄤ簬鏌ヨ閿�鍞鍗曞彿
))
// 鐢ㄦ埛绾夸綋杩囨护鏉′欢
//.WhereIF(lineNo != null && lineNo.Length > 0 && !"PL017".Equals(queryObj.createUser),
@@ -548,7 +549,7 @@
.Contains(queryObj.SearchValue.ToLower()) ||
a.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower()))
// 鏌ヨ瀛楁
- .Select((a, b, da, c, us) => new QsItemOqcReq
+ .Select((a, b, da, c, us, ca) => new QsItemOqcReq
{
Id = a.Id,
BillNo = a.BillNo,
@@ -566,7 +567,8 @@
Daa015 = da.Daa015, // 宸ュ崟绾夸綋
Fsubmit = a.Fsubmit,
Quantity = da.Daa008,
- LineNo = c.LineName
+ LineNo = c.LineName,
+ SaleOrderNo = ca.Caa015
})
// 鎺掑簭
.OrderBy(a => a.CreateDate, OrderByType.Desc);
--
Gitblit v1.9.3