From dee0ef5f3461fad4648cd511ec15c5e1f74f5966 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Fri, 15 Nov 2024 13:31:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=A2=9E=E5=8A=A0=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 | Bin 275696 -> 277406 bytes src/WMS.Web.Domain/Services/InStockService.cs | 26 ++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index d8c45de7677f475fb542aeb5b4d8e561575c2727..9ffb06c88e00d140b25364194cadf54359cc4f88 100644 GIT binary patch delta 15504 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 delta 13805 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.ReFailure(ResultCodes.BoxOutStockTaskBoxError); } } + var all_boxIds = dto.Details.Select(s => s.BoxId).ToList(); + //2.1判断箱是否上架过了 + var boxInventoryList = await _boxInventoryRepositories.GetList(all_boxIds); + foreach (var bid in all_boxIds) + { + var boxInventory = boxInventoryList.FirstOrDefault(f => f.BoxId == bid); + if (boxInventory != null) + { + var box = await _boxRepositories.Get(bid); + if (box == null) return Result.ReFailure(ResultCodes.BoxIsTrueShelf); + return Result.ReFailure($"{box.BoxBillNo} 箱号已上架入库", 80000); + } + } //1.获取物料集合和组织集合和供应商的集合 var materials = new List(); @@ -507,6 +520,19 @@ namespace WMS.Web.Domain.Services { x.Details.RemoveAll(t => t.Qty == 0); }); + + var all_boxIds = dto.Boxs.Select(s => s.BoxId).ToList(); + //2.1判断箱是否上架过了 + var boxInventoryList = await _boxInventoryRepositories.GetList(all_boxIds); + foreach (var b in dto.Boxs) + { + var boxInventory = boxInventoryList.FirstOrDefault(f => f.BoxId == b.BoxId); + if (boxInventory != null) + { + return Result.ReFailure($"{b.BoxBillNo} 箱号已上架入库", 80000); + } + } + //1.获取来源单 var task = await _inStockTaskRepositories.Get(dto.TaskId); if (task == null)