From f1deb7b024e17cba204de5fcb0dac15801436b90 Mon Sep 17 00:00:00 2001
From: sjz <1240968267@qq.com>
Date: 星期一, 28 七月 2025 20:56:41 +0800
Subject: [PATCH] 多组织修改
---
MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs b/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs
index 0aab9dd..205cfea 100644
--- a/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs
+++ b/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs
@@ -21,14 +21,15 @@
public List<MesInvItemArnDetail> GetDetails(WarehouseQuery query)
{
// 鏌ヨ
- return Db.Queryable<MesInvItemArnDetail, MesItems, MesUnit>(
- (c, t, u) => new object[]
+ return Db.Queryable<MesInvItemArnDetail, MesItems, MesUnit>((c, t, u) =>
+ new object[]
{
JoinType.Left,
c.ItemNo == t.ItemNo && c.Company == t.Company &&
c.Factory == t.Factory,
JoinType.Left,
- t.Fpurchaseunitid == u.Id.ToString() && 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,17 +60,17 @@
// 鏌ヨ
var result = Db
.Queryable<MesQaItemsDetect01, MesInvItemArn, MesInvItemArnDetail,
- 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.ToString(),
- JoinType.Inner, z.ReleaseNo == a.ReleaseNo
- })
+ 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.ToString(),
+ JoinType.Inner, z.ReleaseNo == a.ReleaseNo
+ })
.Where((a, d, b, c, t, z) => a.FngHandle == "閫�璐�" &&
z.FcheckResu == "涓嶅悎鏍�" &&
query.ItemArnDetailIds.Contains(b.Id))
--
Gitblit v1.9.3