From 0e860de56fbf7ac66b9563fb946055207f09f9d6 Mon Sep 17 00:00:00 2001
From: lg <999544862qq.com>
Date: 星期四, 15 八月 2024 10:25:43 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/StandardPda
---
MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs b/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs
index c827092..49ad635 100644
--- a/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs
+++ b/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs
@@ -59,17 +59,19 @@
// 鏌ヨ
var result = Db
.Queryable<MesQaItemsDetect01, MesInvItemArn, MesInvItemArnDetail,
- MesItems, MesUnit>(
- (a, d, b, c, t) => new object[]
+ MesItems, MesUnit,MesQaItemsDetectDetail5>(
+ (a, d, b, c, t,z) => new object[]
{
JoinType.Inner, d.BillNo == a.LotNo,
JoinType.Inner, d.Id == b.Mid && b.ItemNo == a.ItemNo,
JoinType.Inner,
a.ItemNo == c.ItemNo && a.Company == c.Company &&
a.Factory == c.Factory,
- JoinType.Inner, c.Fpurchaseunitid == t.Id
+ JoinType.Inner, c.Fpurchaseunitid == t.Id,
+ JoinType.Inner, z.ReleaseNo == a.ReleaseNo
})
- .Where((a, d, b, c, t) => a.FngHandle == "閫�璐�" &&
+ .Where((a, d, b, c, t,z) => a.FngHandle == "閫�璐�" &&
+ z.FcheckResu == "涓嶅悎鏍�" &&
query.ItemArnDetailIds.Contains(b.Id))
.Select((a, d, b, c, t) => new Material
{
--
Gitblit v1.9.3