From 1caf2d9d3f6c2ee8d58d182078d0a8468f6dbfc4 Mon Sep 17 00:00:00 2001
From: wbc <2597324127@qq.com>
Date: 星期六, 24 八月 2024 19:14:31 +0800
Subject: [PATCH] 物料接收
---
MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs b/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs
index c827092..0aab9dd 100644
--- a/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs
+++ b/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs
@@ -28,7 +28,7 @@
c.ItemNo == t.ItemNo && c.Company == t.Company &&
c.Factory == t.Factory,
JoinType.Left,
- t.Fpurchaseunitid == u.Id && t.Factory == u.Factory &&
+ t.Fpurchaseunitid == u.Id.ToString() && t.Factory == u.Factory &&
t.Company == u.Company
})
.Where((c, t, u) => c.Mid == query.id)
@@ -59,18 +59,20 @@
// 鏌ヨ
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.ToString(),
+ JoinType.Inner, z.ReleaseNo == a.ReleaseNo
})
- .Where((a, d, b, c, t) => a.FngHandle == "閫�璐�" &&
- query.ItemArnDetailIds.Contains(b.Id))
+ .Where((a, d, b, c, t, z) => a.FngHandle == "閫�璐�" &&
+ z.FcheckResu == "涓嶅悎鏍�" &&
+ query.ItemArnDetailIds.Contains(b.Id))
.Select((a, d, b, c, t) => new Material
{
FmrMode = a.Fmrmode,
--
Gitblit v1.9.3