From 86ca5eb9801696334d870d61b2f553cf4bdbb376 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Thu, 21 Mar 2024 09:33:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 | Bin 233732 -> 233732 bytes .../Services/ChangeMoveBoxService.cs | 8 +++++++- src/WMS.Web.Domain/Values/ResultCodes.cs | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index afea2aa2baac50e7ea07a5a44a5fc50bdad0fc4a..72bcebc65bbcc0eb36e881bd0eb1fe20306e248d 100644 GIT binary patch delta 29060 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 s.SrcBoxId).Distinct().ToList(); var destIds = dto.Select(s => s.DestBoxId).Distinct().ToList(); var boxs = await _boxInventoryRepositories.GetList(srcIds); + var destIds_boxs = await _boxInventoryRepositories.GetList(destIds); var serialNumbers = dto.SelectMany(s => s.Details).SelectMany(s => s.SerialNumbers).ToList(); var serialNumberList = await _serialNumbersRepositories.GetEntityList(serialNumbers); @@ -99,6 +100,11 @@ namespace WMS.Web.Domain.Services var sCount = serialNumberList.Where(w => s.Contains(w.SerialNumber) && w.BoxId != 0).Count(); if (sCount > 0) return Result.ReFailure(ResultCodes.SerialNumbersBoxError); + + var dest_box = destIds_boxs.FirstOrDefault(f => f.BoxId == d.DestBoxId); + if (dest_box != null) + return Result.ReFailure(ResultCodes.BoxInventoryChangeBoxError); + } else { @@ -324,6 +330,6 @@ namespace WMS.Web.Domain.Services return Result.ReSuccess(); } - + } } diff --git a/src/WMS.Web.Domain/Values/ResultCodes.cs b/src/WMS.Web.Domain/Values/ResultCodes.cs index dec9dcfd..9a5b8fb9 100644 --- a/src/WMS.Web.Domain/Values/ResultCodes.cs +++ b/src/WMS.Web.Domain/Values/ResultCodes.cs @@ -75,6 +75,8 @@ namespace WMS.Web.Domain.Values public static ValueTuple InventoryInOutDetailsWriteError = (800014, "写入物料收发明细失败!"); public static ValueTuple InventoryDetailsWriteError = (800014, "写入即时库存明细失败!"); public static ValueTuple MoveInventoryError = (800015, "箱已经上架,不能重复上架"); + public static ValueTuple BoxInventoryChangeBoxError = (800016, "箱已上架不支持再次装箱"); + public static ValueTuple SerialNumbersNoData = (610000, "序列号不存在"); public static ValueTuple SerialNumbersBoxError = (610002, "序列号已经绑定箱");