From 00a72fff219241eb5b0405a066cc859d07cf7735 Mon Sep 17 00:00:00 2001 From: 啊鑫 <t2856754968@163.com> Date: 星期三, 17 九月 2025 10:23:44 +0800 Subject: [PATCH] 1111 --- service/Warehouse/MesInvItemOutsManager.cs | 53 +++++++++++++++++++++++++++-------------------------- 1 files changed, 27 insertions(+), 26 deletions(-) diff --git a/service/Warehouse/MesInvItemOutsManager.cs b/service/Warehouse/MesInvItemOutsManager.cs index 5fd556a..413e251 100644 --- a/service/Warehouse/MesInvItemOutsManager.cs +++ b/service/Warehouse/MesInvItemOutsManager.cs @@ -68,11 +68,11 @@ if (!isValid) throw new ApplicationException("GUID杞崲閿欒"); - var mesInvItemOutItemsList = Db - .Queryable<MesInvItemOutItems, MesItems>((c, s) => new object[] - { - JoinType.Inner, c.ItemId == s.Id - }).Where((c, s) => c.ItemOutId == parsedGuid) + var mesInvItemOutItemsList = Db.Queryable<MesInvItemOutItems, MesItems>( + (c, s) => new object[] + { + JoinType.Inner, c.ItemId == s.Id + }).Where((c, s) => c.ItemOutId == parsedGuid) .Select<MesInvItemOutItems>((c, s) => new MesInvItemOutItems { Guid = c.Guid, @@ -272,8 +272,8 @@ foreach (var j in itemOutItems) { // 鏍¢獙瀛愯〃瀵瑰簲閲囪喘璁㈠崟鐨勪緵搴斿晢缂栫爜 - var c_SuppNo = Db.Queryable<MesRohIn, MesSupplier>((roh, supp) => - new JoinQueryInfos( + var c_SuppNo = Db.Queryable<MesRohIn, MesSupplier>( + (roh, supp) => new JoinQueryInfos( JoinType.Left, roh.Supplier == supp.Id.ToString() )) @@ -392,7 +392,8 @@ it.Status == 1) .ToPageList(1, 20); - var ItemOutNos = data5.FindAll(a => a.Nflag == null || a.Nflag == 0); + var ItemOutNos = data5.FindAll(a => a.Nflag == null || a.Nflag == 0) + .ToList(); return ItemOutNos; } @@ -432,12 +433,13 @@ var mesInvItemOutCDetailsList = Db .Queryable<MesInvItemOutCDetails, MesInvItemBarcodes, MesItems, - MesDepots>((b, bar, c, d) => new - JoinQueryInfos( - JoinType.Left, b.ItemBarcode == bar.ItemBarcode, - JoinType.Left, b.ItemId == c.Id, - JoinType.Left, b.DepotId == d.DepotId - )) + MesDepots>( + (b, bar, c, d) => new + JoinQueryInfos( + JoinType.Left, b.ItemBarcode == bar.ItemBarcode, + JoinType.Left, b.ItemId == c.Id, + JoinType.Left, b.DepotId == d.DepotId + )) .Where((b, bar, c, d) => b.ItemOutId == parsedGuid) .Select((b, bar, c, d) => new MesInvItemOutCDetails { @@ -504,15 +506,15 @@ var materials = Db .Queryable<MesInvItemOuts, MesInvItemOutItems, - MesItems, MesUnit, MesInvItemArnDetail, MesDepots>((a, b, c, d, - e, f) => new JoinQueryInfos( - JoinType.Left, a.Guid == b.ItemOutId, - JoinType.Left, b.ItemId == c.Id, - JoinType.Left, d.Id.ToString() == c.ItemUnit, - JoinType.Left, - e.CbillNo == b.WorkNo && e.ItemId == b.ItemId, - JoinType.Left, f.DepotId == a.DepotId - )).Where((a, b, c, d, e, f) => b.Guid == guid) + MesItems, MesUnit, MesInvItemArnDetail, MesDepots>( + (a, b, c, d, e, f) => new JoinQueryInfos( + JoinType.Left, a.Guid == b.ItemOutId, + JoinType.Left, b.ItemId == c.Id, + JoinType.Left, d.Id.ToString() == c.ItemUnit, + JoinType.Left, + e.CbillNo == b.WorkNo && e.ItemId == b.ItemId, + JoinType.Left, f.DepotId == a.DepotId + )).Where((a, b, c, d, e, f) => b.Guid == guid) .Select<Material>((a, b, c, d, e, f) => new Material { FMaterialId = c.ItemNo, @@ -719,9 +721,8 @@ C_STOCKNUM = c_mes_inv_item_stocks.Quantity.Value; // Calculate the total and completed quantities for the item - var quantities = db - .Queryable<MesInvItemOutItems, MesInvItemOuts>((s, d) => - new object[] + var quantities = db.Queryable<MesInvItemOutItems, MesInvItemOuts>( + (s, d) => new object[] { JoinType.Left, s.ItemOutId == d.Guid }) -- Gitblit v1.9.3