From 5de35354e8dfcb4933350d0d1b645d400bcf23ab Mon Sep 17 00:00:00 2001 From: sjz <1240968267@qq.com> Date: 星期二, 22 七月 2025 15:30:09 +0800 Subject: [PATCH] 优化多组织 --- MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs b/MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs index fd320ee..a0f092d 100644 --- a/MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs +++ b/MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs @@ -117,10 +117,11 @@ public List<MesInvItemInCDetails> GetInvItemInCDetails(decimal? pid) { - var result = Db.Queryable<MesInvItemInCDetails, MesItems, MesUnit>( - (g, c, d) => new JoinQueryInfos( + var result = Db + .Queryable<MesInvItemInCDetails, MesItems, MesUnit>((g, c, d) => + new JoinQueryInfos( JoinType.Left, - g.ItemId == c.Id && g.Company == c.Company && + g.ItemNo == c.ItemNo && g.Company == c.Company && g.Factory == c.Factory, JoinType.Inner, d.Id == Convert.ToDecimal(c.ItemUnit) ) @@ -231,18 +232,17 @@ if (invItemIns.Status == 1) throw new Exception("鍏ュ簱鍗曞凡瀹℃牳锛屼笉鑳介噸澶嶆帹閫�"); var materials = Db.Queryable<MesInvItemInCItems, MesItems, MesUnit, - MesInvItemArnDetail>( - (g, c, d, a) => new JoinQueryInfos( - JoinType.Left, - g.ItemId == c.Id && g.Company == c.Company && - g.Factory == c.Factory, JoinType.Inner, - d.Id == Convert.ToDecimal(c.ItemUnit), - JoinType.Inner, - a.Ebeln == g.WorkNo && a.WorkLine == g.EbelnLineNo - && g.CbillNo == a.CbillNo - ) - ).Where((g, c, d, a) => g.BillNo == billNo).Select<Material>( - (g, c, d, a) => new Material + MesInvItemArnDetail>((g, c, d, a) => new JoinQueryInfos( + JoinType.Left, + g.ItemNo == c.ItemNo && g.Company == c.Company && + g.Factory == c.Factory, JoinType.Inner, + d.Id == Convert.ToDecimal(c.ItemUnit), + JoinType.Inner, + a.Ebeln == g.WorkNo && a.WorkLine == g.EbelnLineNo + && g.CbillNo == a.CbillNo + ) + ).Where((g, c, d, a) => g.BillNo == billNo) + .Select<Material>((g, c, d, a) => new Material { FstockId = g.DepotCode, FuintId = d.Fnumber, -- Gitblit v1.9.3