From 1b8d10dbb20b513be61556021f8f471e506d92c3 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 08 十月 2024 09:48:57 +0800
Subject: [PATCH] 1
---
MES.Service/service/QC/RKJService.cs | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/MES.Service/service/QC/RKJService.cs b/MES.Service/service/QC/RKJService.cs
index 9acf1c2..00b78f9 100644
--- a/MES.Service/service/QC/RKJService.cs
+++ b/MES.Service/service/QC/RKJService.cs
@@ -629,6 +629,7 @@
.Select((a, b, c, ca, m, da, z) => new QsItemOqcReq
{
BillNo = a.BillNo,
+ Fsubmit = a.Fsubmit,
Remarks = a.Remarks,
Id = a.Id,
CreateDate = a.CreateDate,
@@ -846,12 +847,13 @@
private bool isRk(int? gid)
{
var db = SqlSugarHelper.GetInstance();
- return db.Queryable<QsItemOqcReq, MesInvItemIns, MesInvItemInCDetails2>(
- (a, b, c) => new JoinQueryInfos(
+ return db.Queryable<QsItemOqcReq, MesInvItemIns, MesInvItemInCDetails2,MesInvItemStocks>(
+ (a, b, c,d) => new JoinQueryInfos(
JoinType.Inner, a.BillNo == b.BillNo,
- JoinType.Inner, b.Id == c.ItemInId
+ JoinType.Inner, b.Id == c.ItemInId,
+ JoinType.Inner,c.ItemBarcode == d.ItemBarcode
))
- .Where((a, b, c) => a.Id == gid)
+ .Where((a, b, c,d) => a.Id == gid)
.Count() > 0;
}
}
\ No newline at end of file
--
Gitblit v1.9.3