From 9568c4770cd0c0da3e3d47ff54f5852f5c6652ef Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Fri, 29 Dec 2023 11:32:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs | 13 +++++++++++-- src/WMS.Web.Domain/Values/ResultCodes.cs | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs index 0ff4055d..46847aa8 100644 --- a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs +++ b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs @@ -247,13 +247,22 @@ namespace WMS.Web.Domain.Services { _logger.LogInformation($"移箱:{JsonConvert.SerializeObject(dto)} 是否上架:{IsUp} 操作人:{loginInfo.UserInfo.StaffId}"); //1.下架时 需要验证箱是否在库存里 + var boxIds = dto.Select(s => s.BoxId).ToList(); + var boxList = await _boxInventoryRepositories.GetList(boxIds); if (!IsUp) { - var boxIds = dto.Select(s => s.BoxId).ToList(); - var boxList = await _boxInventoryRepositories.GetList(boxIds); if (boxIds.Count() != boxList.Count()) return Result.ReFailure(ResultCodes.BoxInventoryNoDataError); } + else + { + //上架时 箱子不能在库存里 + if (boxList.Count() > 0) + { + var boxs = await _boxRepositories.GetEntityList(boxList.Select(s => s.BoxId).ToList()); + return Result.ReFailure($"箱号{ string.Join(",", boxs.Select(s => s.BoxBillNo))} 已上架", 343433); + } + } List entityList = new List(); foreach (var d in dto) { diff --git a/src/WMS.Web.Domain/Values/ResultCodes.cs b/src/WMS.Web.Domain/Values/ResultCodes.cs index b69f95ab..b614171e 100644 --- a/src/WMS.Web.Domain/Values/ResultCodes.cs +++ b/src/WMS.Web.Domain/Values/ResultCodes.cs @@ -66,6 +66,7 @@ namespace WMS.Web.Domain.Values public static ValueTuple BoxInventoryHaveInventoryError = (800013, "箱号已上架入库"); public static ValueTuple InventoryInOutDetailsWriteError = (800014, "写入物料收发明细失败！"); public static ValueTuple InventoryDetailsWriteError = (800014, "写入即时库存明细失败！"); + public static ValueTuple MoveInventoryError = (800015, "箱已经上架,不能重复上架"); public static ValueTuple SerialNumbersNoData = (610000, "序列号不存在"); public static ValueTuple SerialNumbersBoxError = (610002, "序列号已经绑定箱"); From 38f9633191b0a782225d278d3f13fe7e7db1c970 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Fri, 29 Dec 2023 14:30:19 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 15 ---------- .../Dto/Erp/TakeStock/ErpTakeStockSaveDto.cs | 30 +++++++++---------- .../Services/TakeStockService.cs | 6 ++-- 3 files changed, 18 insertions(+), 33 deletions(-) diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index fdf94ddb..d2c77baf 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -1291,26 +1291,11 @@ 仓位ID - - - 盘点前数量（wms系统数量） - - 盘点实际数量（实际仓库数量） - - - 盘盈数量 - - - - - 盘亏数量 - - 备注 diff --git a/src/WMS.Web.Core/Dto/Erp/TakeStock/ErpTakeStockSaveDto.cs b/src/WMS.Web.Core/Dto/Erp/TakeStock/ErpTakeStockSaveDto.cs index 0019ee79..9bfef6fd 100644 --- a/src/WMS.Web.Core/Dto/Erp/TakeStock/ErpTakeStockSaveDto.cs +++ b/src/WMS.Web.Core/Dto/Erp/TakeStock/ErpTakeStockSaveDto.cs @@ -109,26 +109,26 @@ namespace WMS.Web.Core.Dto.Erp.TakeStock /// [JsonProperty("FStockLocId")] public ErpSubStockDto SubStockId { get; set; } - /// - /// 盘点前数量（wms系统数量） - /// - [JsonProperty("FAcctQty")] - public decimal BeforeQty { get; set; } + ///// + ///// 盘点前数量（wms系统数量） + ///// + //[JsonProperty("FAcctQty")] + //public decimal BeforeQty { get; set; } /// /// 盘点实际数量（实际仓库数量） /// [JsonProperty("FCountQty")] public decimal AfterQty { get; set; } - /// - /// 盘盈数量 - /// - [JsonProperty("FGainQty")] - public decimal FinalQty { get; set; } - /// - /// 盘亏数量 - /// - [JsonProperty("FLossQty")] - public decimal LossQty { get; set; } + ///// + ///// 盘盈数量 + ///// + //[JsonProperty("FGainQty")] + //public decimal FinalQty { get; set; } + ///// + ///// 盘亏数量 + ///// + //[JsonProperty("FLossQty")] + //public decimal LossQty { get; set; } /// /// 备注 /// diff --git a/src/WMS.Web.Domain/Services/TakeStockService.cs b/src/WMS.Web.Domain/Services/TakeStockService.cs index 9324043f..11812294 100644 --- a/src/WMS.Web.Domain/Services/TakeStockService.cs +++ b/src/WMS.Web.Domain/Services/TakeStockService.cs @@ -218,10 +218,10 @@ namespace WMS.Web.Domain.Services UnitId = new ErpNumberDto(unitNumber), //物料带出来 StockId = new ErpNumberDto(d.StockCode), SubStockId = new ErpSubStockDto(d.StockCode, d.Erp_SubStockCode), - BeforeQty = d.BeforeQty, + //BeforeQty = d.BeforeQty, AfterQty = d.AfterQty, - FinalQty = entity.ResultType == TakeStockType.Profit ? d.FinalQty : 0, - LossQty = entity.ResultType == TakeStockType.Loss ? d.FinalQty : 0, + //FinalQty = entity.ResultType == TakeStockType.Profit ? d.FinalQty : 0, + //LossQty = entity.ResultType == TakeStockType.Loss ? d.FinalQty : 0, Fnote = d.Remark }); } From 2e2806c3b0ff4f27a824c6b175a1b2c515fa8454 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Fri, 29 Dec 2023 14:46:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Domain/Services/TakeStockService.cs | 3 --- .../Configuration/RepositoryDbContext.cs | 5 +++++ src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/WMS.Web.Domain/Services/TakeStockService.cs b/src/WMS.Web.Domain/Services/TakeStockService.cs index 11812294..0c6b4929 100644 --- a/src/WMS.Web.Domain/Services/TakeStockService.cs +++ b/src/WMS.Web.Domain/Services/TakeStockService.cs @@ -218,10 +218,7 @@ namespace WMS.Web.Domain.Services UnitId = new ErpNumberDto(unitNumber), //物料带出来 StockId = new ErpNumberDto(d.StockCode), SubStockId = new ErpSubStockDto(d.StockCode, d.Erp_SubStockCode), - //BeforeQty = d.BeforeQty, AfterQty = d.AfterQty, - //FinalQty = entity.ResultType == TakeStockType.Profit ? d.FinalQty : 0, - //LossQty = entity.ResultType == TakeStockType.Loss ? d.FinalQty : 0, Fnote = d.Remark }); } diff --git a/src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs b/src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs index 1350cc1c..97abbe82 100644 --- a/src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs +++ b/src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs @@ -49,6 +49,11 @@ namespace WMS.Web.Repositories.Configuration { ent.ToTable("t_wms_movebox_record"); ent.HasKey(x => x.Id); + + ent.HasMany(p => p.Details) + .WithOne() + .HasForeignKey(p => p.Fid) + .OnDelete(DeleteBehavior.Cascade); }); //移箱明细 builder.Entity(ent => diff --git a/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs b/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs index 86430325..fa2ae799 100644 --- a/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs +++ b/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs @@ -101,7 +101,7 @@ namespace WMS.Web.Repositories _transaction.Commit(); return true; } - catch + catch(Exception ex) { if (_transaction != null) _transaction.Rollback();