diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index b585d74f..b4882bb5 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -2441,11 +2441,6 @@ 类型:1为入库,2为出库 - - - 出入库存-方式(详情见枚举值):必填;1-box按箱,2-product按产品 - - 箱ID diff --git a/src/WMS.Web.Core/Dto/Inventory/BoxInventoryBackGenerateDto.cs b/src/WMS.Web.Core/Dto/Inventory/BoxInventoryBackGenerateDto.cs index 4bd2624b..d0ec80a2 100644 --- a/src/WMS.Web.Core/Dto/Inventory/BoxInventoryBackGenerateDto.cs +++ b/src/WMS.Web.Core/Dto/Inventory/BoxInventoryBackGenerateDto.cs @@ -14,10 +14,10 @@ namespace WMS.Web.Core.Dto.Inventory /// public int InventoryInOutType { get; set; } - /// - /// 出入库存-方式(详情见枚举值):必填;1-box按箱,2-product按产品 - /// - public int InventoryInOutMethod { get; set; } + ///// + ///// 出入库存-方式(详情见枚举值):必填;1-box按箱,2-product按产品-------弃用 + ///// + //public int InventoryInOutMethod { get; set; } /// /// 箱ID diff --git a/src/WMS.Web.Domain/Services/BoxInventoryService.cs b/src/WMS.Web.Domain/Services/BoxInventoryService.cs index 7af88853..a85c24f0 100644 --- a/src/WMS.Web.Domain/Services/BoxInventoryService.cs +++ b/src/WMS.Web.Domain/Services/BoxInventoryService.cs @@ -233,7 +233,7 @@ namespace WMS.Web.Domain.Services OrgCode = dtoData.OrgCode, StockCode = dtoData.StockCode, SubStockId = dtoData.SubStockId, - InventoryInOutMethod = (int)dtoData.Method, + //InventoryInOutMethod = (int)dtoData.Method, InventoryInOutType = dtoData.Type == BackRecordType.OutstockOn ? (int)InventoryInOutType.In : (int)InventoryInOutType.Out }).ToList(); @@ -922,27 +922,27 @@ namespace WMS.Web.Domain.Services addEntity.Details = _mapper.Map>(dto.Details); #region 序列号处理 - if (dto.InventoryInOutMethod == (int)InventoryInOutMethod.Box) + /////按箱的-弃用了 + //if (dto.InventoryInOutMethod == (int)InventoryInOutMethod.Box) + //{ + // //当前箱的序列号 + // var current_box_serNums = serialNumbers.Where(t => t.BoxId == dto.BoxId).ToList(); + // //赋值序列号 + // addEntity.Details.ForEach(x => + // { + // var current_box_mat_serNums = current_box_serNums.Where(m => m.MaterialId == x.MaterialId).Select(t => t.SerialNumber).ToList(); + // x.SerialNumbers.AddRange(current_box_mat_serNums); + // }); + //} + + //赋值序列号 + addEntity.Details.ForEach(x => { - //当前箱的序列号 - var current_box_serNums = serialNumbers.Where(t => t.BoxId == dto.BoxId).ToList(); - //赋值序列号 - addEntity.Details.ForEach(x => - { - var current_box_mat_serNums = current_box_serNums.Where(m => m.MaterialId == x.MaterialId).Select(t => t.SerialNumber).ToList(); - x.SerialNumbers.AddRange(current_box_mat_serNums); - }); - } - else - { - //赋值序列号 - addEntity.Details.ForEach(x => - { - var current_box_mat_serNums = dto.Details.Where(m => m.MaterialId == x.MaterialId).FirstOrDefault(); - if (current_box_mat_serNums != null && current_box_mat_serNums.MaterialId == x.MaterialId) - x.SerialNumbers.AddRange(current_box_mat_serNums.SerialNumbers); - }); - } + var current_box_mat_serNums = dto.Details.Where(m => m.MaterialId == x.MaterialId).FirstOrDefault(); + if (current_box_mat_serNums != null && current_box_mat_serNums.MaterialId == x.MaterialId) + x.SerialNumbers.AddRange(current_box_mat_serNums.SerialNumbers); + }); + #endregion add_entitys.Add(addEntity); } @@ -970,27 +970,27 @@ namespace WMS.Web.Domain.Services } #region 序列号处理 - if (dto.InventoryInOutMethod == (int)InventoryInOutMethod.Box) + /////按箱的-弃用了 + //if (dto.InventoryInOutMethod == (int)InventoryInOutMethod.Box) + //{ + // //当前箱的序列号 + // var current_box_serNums = serialNumbers.Where(t => t.BoxId == dto.BoxId).ToList(); + // //赋值序列号 + // update_entity.Details.ForEach(x => + // { + // var current_box_mat_serNums = current_box_serNums.Where(m => m.MaterialId == x.MaterialId).Select(t => t.SerialNumber).ToList(); + // x.SerialNumbers.AddRange(current_box_mat_serNums); + // }); + //} + + //赋值序列号 + update_entity.Details.ForEach(x => { - //当前箱的序列号 - var current_box_serNums = serialNumbers.Where(t => t.BoxId == dto.BoxId).ToList(); - //赋值序列号 - update_entity.Details.ForEach(x => - { - var current_box_mat_serNums = current_box_serNums.Where(m => m.MaterialId == x.MaterialId).Select(t => t.SerialNumber).ToList(); - x.SerialNumbers.AddRange(current_box_mat_serNums); - }); - } - else - { - //赋值序列号 - update_entity.Details.ForEach(x => - { - var current_box_mat_serNums = dto.Details.Where(m => m.MaterialId == x.MaterialId).FirstOrDefault(); - if (current_box_mat_serNums != null && current_box_mat_serNums.MaterialId == x.MaterialId) - x.SerialNumbers.AddRange(current_box_mat_serNums.SerialNumbers); - }); - } + var current_box_mat_serNums = dto.Details.Where(m => m.MaterialId == x.MaterialId).FirstOrDefault(); + if (current_box_mat_serNums != null && current_box_mat_serNums.MaterialId == x.MaterialId) + x.SerialNumbers.AddRange(current_box_mat_serNums.SerialNumbers); + }); + #endregion update_entitys.Add(update_entity);