diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 6a5aa918..9539d957 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -2135,6 +2135,21 @@ 采购上架-请求对象 + + + 组织编码 + + + + + 仓库编码 + + + + + 仓位ID + + 明细 @@ -2165,26 +2180,6 @@ 供应商 - - - 组织 - - - - - 组织编码：仓位-仓库-带出 - - - - - 仓库编码 - - - - - 仓位ID - - 对应金蝶的明细ID diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 62a1916b..e4bb7017 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -521,6 +521,26 @@ 备注 + + + 组织ID + + + + + 组织编码 + + + + + 仓库编码 + + + + + 仓位ID + + 明细 @@ -585,31 +605,11 @@ 供应商ID - - - 组织ID - - - - - 组织编码 - - 物料ID - - - 仓库编码 - - - - - 仓位ID - - 数量 @@ -863,6 +863,51 @@ 明细备注 + + + wms入库单-汇总明细 + + + + + ID + + + + + 入库单ID + + + + + 任务单ID + + + + + 来源单号 + + + + + 供应商ID + + + + + 物料ID + + + + + 数量 + + + + + 序列号集 + + wms即时库存明细表 @@ -1974,6 +2019,14 @@ + + + 批量添加：入库汇总明细 + + + + + 箱与任务单绑定（收货）关系表-仓储接口 @@ -2324,7 +2377,7 @@ - + 入库单-箱库存的变更 @@ -2672,6 +2725,13 @@ + + + 获取组织ID + + + + 获取供应商名称 @@ -3449,7 +3509,7 @@ - + 入库单-箱库存的变更 @@ -4008,6 +4068,14 @@ + + + 获取组织id + + + + + 获取供应商名称 diff --git a/src/WMS.Web.Core/Dto/InStock/PurchaseShelfRequest.cs b/src/WMS.Web.Core/Dto/InStock/PurchaseShelfRequest.cs index f85c0b4d..c43d9e52 100644 --- a/src/WMS.Web.Core/Dto/InStock/PurchaseShelfRequest.cs +++ b/src/WMS.Web.Core/Dto/InStock/PurchaseShelfRequest.cs @@ -10,7 +10,18 @@ namespace WMS.Web.Core.Dto.InStock /// public class PurchaseShelfRequest { - + /// + /// 组织编码 + /// + public string OrgCode { get; set; } + /// + /// 仓库编码 + /// + public string StockCode { get; set; } + /// + /// 仓位ID + /// + public int SubStockId { get; set; } /// /// 明细 diff --git a/src/WMS.Web.Core/Dto/InStock/SaveInStockDetailsRequest.cs b/src/WMS.Web.Core/Dto/InStock/SaveInStockDetailsRequest.cs index 85762fbe..bf84e36c 100644 --- a/src/WMS.Web.Core/Dto/InStock/SaveInStockDetailsRequest.cs +++ b/src/WMS.Web.Core/Dto/InStock/SaveInStockDetailsRequest.cs @@ -33,28 +33,28 @@ namespace WMS.Web.Core.Dto.InStock /// [Required(ErrorMessage = "供应商不能为空")] public int SupplierId { get; set; } - /// - /// 组织 - /// - [Required(ErrorMessage = "组织不能为空")] - public int OrgId { get; set; } + ///// + ///// 组织 + ///// + //[Required(ErrorMessage = "组织不能为空")] + //public int OrgId { get; set; } - /// - /// 组织编码：仓位-仓库-带出 - /// - [Required(ErrorMessage = "组织不能为空")] - public string OrgCode { get; set; } + ///// + ///// 组织编码：仓位-仓库-带出 + ///// + //[Required(ErrorMessage = "组织不能为空")] + //public string OrgCode { get; set; } - /// - /// 仓库编码 - /// - [Required(ErrorMessage = "仓库不能为空")] - public string StockCode { get; set; } - /// - /// 仓位ID - /// - [Required(ErrorMessage = " 仓位不能为空")] - public int SubStockId { get; set; } + ///// + ///// 仓库编码 + ///// + //[Required(ErrorMessage = "仓库不能为空")] + //public string StockCode { get; set; } + ///// + ///// 仓位ID + ///// + //[Required(ErrorMessage = " 仓位不能为空")] + //public int SubStockId { get; set; } /// /// 对应金蝶的明细ID diff --git a/src/WMS.Web.Domain/Entitys/InStock.cs b/src/WMS.Web.Domain/Entitys/InStock.cs index ee8d05dd..ad9803d6 100644 --- a/src/WMS.Web.Domain/Entitys/InStock.cs +++ b/src/WMS.Web.Domain/Entitys/InStock.cs @@ -57,8 +57,22 @@ namespace WMS.Web.Domain.Entitys /// 备注 /// public string Remark { get; set; } - - + /// + /// 组织ID + /// + public int OrgId { get; set; } + /// + /// 组织编码 + /// + public string OrgCode { get; set; } + /// + /// 仓库编码 + /// + public string StockCode { get; set; } + /// + /// 仓位ID + /// + public int SubStockId { get; set; } /// /// 明细 /// diff --git a/src/WMS.Web.Domain/Entitys/InStockDetails.cs b/src/WMS.Web.Domain/Entitys/InStockDetails.cs index 4dfdc470..aff29acc 100644 --- a/src/WMS.Web.Domain/Entitys/InStockDetails.cs +++ b/src/WMS.Web.Domain/Entitys/InStockDetails.cs @@ -43,26 +43,26 @@ namespace WMS.Web.Domain.Entitys /// 供应商ID /// public int SupplierId { get; set; } - /// - /// 组织ID - /// - public int OrgId { get; set; } - /// - /// 组织编码 - /// - public string OrgCode { get; set; } + ///// + ///// 组织ID + ///// + //public int OrgId { get; set; } + ///// + ///// 组织编码 + ///// + //public string OrgCode { get; set; } /// /// 物料ID /// public int MaterialId { get; set; } - /// - /// 仓库编码 - /// - public string StockCode { get; set; } - /// - /// 仓位ID - /// - public int SubStockId { get; set; } + ///// + ///// 仓库编码 + ///// + //public string StockCode { get; set; } + ///// + ///// 仓位ID + ///// + //public int SubStockId { get; set; } /// /// 数量 /// diff --git a/src/WMS.Web.Domain/Entitys/InStockTotalDetails.cs b/src/WMS.Web.Domain/Entitys/InStockTotalDetails.cs new file mode 100644 index 00000000..884b7e40 --- /dev/null +++ b/src/WMS.Web.Domain/Entitys/InStockTotalDetails.cs @@ -0,0 +1,53 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using System.Text; + +namespace WMS.Web.Domain.Entitys +{ + /// + /// wms入库单-汇总明细 + /// + [Serializable] + [Table("t_wms_instock_total_details")] + public class InStockTotalDetails + { + /// + /// ID + /// + public int Id { get; set; } + /// + /// 入库单ID + /// + public int InStockId { get; set; } + + /// + /// 任务单ID + /// + public int TaskId { get; set; } + + /// + /// 来源单号 + /// + public string SourceBillNo { get; set; } + /// + /// 供应商ID + /// + public int SupplierId { get; set; } + + /// + /// 物料ID + /// + public int MaterialId { get; set; } + + /// + /// 数量 + /// + public decimal Qty { get; set; } + + /// + /// 序列号集 + /// + public List SerialNumbers { get; set; } = new List(); + } +} diff --git a/src/WMS.Web.Domain/IService/IBoxInventoryService.cs b/src/WMS.Web.Domain/IService/IBoxInventoryService.cs index 838dd8b2..d2983dd8 100644 --- a/src/WMS.Web.Domain/IService/IBoxInventoryService.cs +++ b/src/WMS.Web.Domain/IService/IBoxInventoryService.cs @@ -59,7 +59,7 @@ namespace WMS.Web.Domain.IService /// /// /// - Task GenerateInStockBox(List dtoDatas, bool isTransaction); + Task GenerateInStockBox(InStock dtoDatas, bool isTransaction); /// /// 出库单-箱库存的变更 diff --git a/src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs b/src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs index 3d611bde..418852f7 100644 --- a/src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs +++ b/src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs @@ -73,6 +73,13 @@ namespace WMS.Web.Domain.IService.Public /// string GetOrgName(List erpOrgs, string orgCode); + /// + /// 获取组织ID + /// + /// + /// + int GetOrgId(List erpOrgs, string orgCode); + /// /// 获取供应商名称 /// diff --git a/src/WMS.Web.Domain/Infrastructure/IInStockRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IInStockRepositories.cs index 92c8a36d..717308d3 100644 --- a/src/WMS.Web.Domain/Infrastructure/IInStockRepositories.cs +++ b/src/WMS.Web.Domain/Infrastructure/IInStockRepositories.cs @@ -42,5 +42,13 @@ namespace WMS.Web.Domain.Infrastructure /// /// Task GetInfo(int id); + + /// + /// 批量添加：入库汇总明细 + /// + /// + /// + /// + Task AddRangeTotalDetails(List entitys, bool isTransaction = true); } } diff --git a/src/WMS.Web.Domain/Mappers/InStockMapper.cs b/src/WMS.Web.Domain/Mappers/InStockMapper.cs index 717f7e48..47eb2c3d 100644 --- a/src/WMS.Web.Domain/Mappers/InStockMapper.cs +++ b/src/WMS.Web.Domain/Mappers/InStockMapper.cs @@ -35,6 +35,8 @@ namespace WMS.Web.Domain.Mappers CreateMap().ReverseMap(); CreateMap().ReverseMap(); + CreateMap(); + CreateMap(); CreateMap(); diff --git a/src/WMS.Web.Domain/Services/BoxInventoryService.cs b/src/WMS.Web.Domain/Services/BoxInventoryService.cs index f8924fb1..780fd273 100644 --- a/src/WMS.Web.Domain/Services/BoxInventoryService.cs +++ b/src/WMS.Web.Domain/Services/BoxInventoryService.cs @@ -440,33 +440,31 @@ namespace WMS.Web.Domain.Services /// /// /// - public async Task GenerateInStockBox(List dtoDatas, bool isTransaction) + public async Task GenerateInStockBox(InStock dtoData, bool isTransaction) { //1.判断来源数据是否存在 - if (dtoDatas == null || dtoDatas.Count == 0) + if (dtoData == null) return Result.ReFailure(ResultCodes.InventoryNoSourceError); //物料收发明细dtos var InventoryInOutDetailsGenerateDtoList = new List(); - #region 按箱 - //2.组装-按箱入库 - var dtoDatas_details_Method_box = dtoDatas.Where(x => x.Method == InventoryInOutMethod.Box).SelectMany(x => x.Details).ToList(); - var generateDtoList_Metod_Box = dtoDatas_details_Method_box.GroupBy(x => new { x.BoxId, x.OrgCode, x.StockCode, x.SubStockId }) + //2.组装-按箱和按产品入库 + var generateDtoList = dtoData.Details.GroupBy(x => new { x.BoxId }) .Select(x => new BoxInventoryGenerateDto() { BoxId = x.Key.BoxId, - OrgCode = x.Key.OrgCode, - StockCode = x.Key.StockCode, - SubStockId = x.Key.SubStockId, - InventoryInOutMethod = (int)InventoryInOutMethod.Box, + OrgCode = dtoData.OrgCode, + StockCode = dtoData.StockCode, + SubStockId = dtoData.SubStockId, + InventoryInOutMethod = (int)dtoData.Method, InventoryInOutType = (int)InventoryInOutType.In }).ToList(); //2.1.遍历：组装明细 - generateDtoList_Metod_Box.ForEach(x => + generateDtoList.ForEach(x => { - foreach (var detItem in dtoDatas_details_Method_box) + foreach (var detItem in dtoData.Details) { //2.1箱是当前的 if (detItem.BoxId == x.BoxId) @@ -480,63 +478,21 @@ namespace WMS.Web.Domain.Services } } }); - #endregion - - #region 按产品 - //3.组装-按产品入库 - var dtoDatas_details_Method_Product = dtoDatas.Where(x => x.Method == InventoryInOutMethod.Product).SelectMany(x => x.Details).ToList(); - var generateDtoList_Metod_Product = dtoDatas_details_Method_Product.GroupBy(x => new { x.BoxId, x.OrgCode, x.StockCode, x.SubStockId }) - .Select(x => new BoxInventoryGenerateDto() - { - BoxId = x.Key.BoxId, - OrgCode = x.Key.OrgCode, - StockCode = x.Key.StockCode, - SubStockId = x.Key.SubStockId, - InventoryInOutMethod = (int)InventoryInOutMethod.Product, - InventoryInOutType = (int)InventoryInOutType.In - }).ToList(); - - //3.1.遍历：组装明细 - generateDtoList_Metod_Product.ForEach(x => - { - foreach (var detItem in dtoDatas_details_Method_Product) - { - //3.1箱是当前的 - if (detItem.BoxId == x.BoxId) - { - //3.2组装明细 - var det = new BoxInventoryGenerateDetailsDto(); - det.MaterialId = detItem.MaterialId; - det.Qty = detItem.Qty; - det.SerialNumbers = detItem.SerialNumbers; - x.Details.Add(det); - } - } - }); - #endregion - - //整合一起 - var generateDtoList = new List(); - generateDtoList.AddRange(generateDtoList_Metod_Box); - generateDtoList.AddRange(generateDtoList_Metod_Product); //提交处理 var result = await this.ExeInStockBox(generateDtoList, isTransaction); if (!result.IsSuccess) return result; //5.组装物料收发明细dto - foreach (var item in dtoDatas.SelectMany(x => x.Details).ToList()) + foreach (var item in dtoData.Details) { - var entity = dtoDatas.Where(x => x.Id == item.Fid).FirstOrDefault(); - if (entity != null) - { - var inventoryInOutDet = _inventoryInOutDetailsService.GenerateDto( - item.BoxId, item.MaterialId, - item.OrgCode, item.StockCode, - item.SubStockId, InStockTypeConvert(entity.Type), - item.SourceBillNo, item.Qty, InventoryInOutType.In); - InventoryInOutDetailsGenerateDtoList.Add(inventoryInOutDet); - } + var inventoryInOutDet = _inventoryInOutDetailsService.GenerateDto( + item.BoxId, item.MaterialId, + dtoData.OrgCode, dtoData.StockCode, + dtoData.SubStockId, InStockTypeConvert(dtoData.Type), + item.SourceBillNo, item.Qty, InventoryInOutType.In); + InventoryInOutDetailsGenerateDtoList.Add(inventoryInOutDet); + } //5.提交物料收发明细：新增 if (InventoryInOutDetailsGenerateDtoList.Count != 0) @@ -565,16 +521,16 @@ namespace WMS.Web.Domain.Services var InventoryInOutDetailsGenerateDtoList = new List(); //找出所有的箱库存 - var boxIds = dtoData.Details.SelectMany(x => x.BoxsDetails).GroupBy(x=>x.BoxId).Select(x => x.Key).ToList(); + var boxIds = dtoData.Details.SelectMany(x => x.BoxsDetails).GroupBy(x => x.BoxId).Select(x => x.Key).ToList(); var boxInventorys = await _boxInventoryRepositories.GetList(boxIds); //判断箱库存是否存在 foreach (var bid in boxIds) { - var isHaveBoxInvetory= boxInventorys.Where(x => x.BoxId == bid).Any(); + var isHaveBoxInvetory = boxInventorys.Where(x => x.BoxId == bid).Any(); if (!isHaveBoxInvetory) return Result.ReFailure(ResultCodes.BoxInventoryNoDataError); } - + //2.组装 var generateDtoList = dtoData.Details.SelectMany(x => x.BoxsDetails).GroupBy(x => new { x.BoxId }) @@ -590,7 +546,7 @@ namespace WMS.Web.Domain.Services { //从箱库存找到：组织、仓库、仓位、进行赋值； var current_box_invetory = boxInventorys.Where(t => t.BoxId == x.BoxId).FirstOrDefault(); - if (current_box_invetory != null && current_box_invetory.BoxId==x.BoxId) + if (current_box_invetory != null && current_box_invetory.BoxId == x.BoxId) { x.OrgCode = current_box_invetory.OrgCode; x.StockCode = current_box_invetory.StockCode; @@ -1439,7 +1395,7 @@ namespace WMS.Web.Domain.Services /// /// /// - private async Task ExeOutStockBox(List dtoDatas,List boxInventorys, bool isTransaction) + private async Task ExeOutStockBox(List dtoDatas, List boxInventorys, bool isTransaction) { //1.判断来源数据是否存在 if (dtoDatas == null || dtoDatas.Count == 0) diff --git a/src/WMS.Web.Domain/Services/InStockService.cs b/src/WMS.Web.Domain/Services/InStockService.cs index 03e117cb..fee412ac 100644 --- a/src/WMS.Web.Domain/Services/InStockService.cs +++ b/src/WMS.Web.Domain/Services/InStockService.cs @@ -9,6 +9,7 @@ using System.Threading.Tasks; using WMS.Web.Core.Dto; using WMS.Web.Core.Dto.ChangeBoxRecord; using WMS.Web.Core.Dto.Erp; +using WMS.Web.Core.Dto.Erp.Org; using WMS.Web.Core.Dto.InStock; using WMS.Web.Core.Dto.InStockTask; using WMS.Web.Core.Dto.Inventory; @@ -217,8 +218,19 @@ namespace WMS.Web.Domain.Services /// private async Task ShelfSave(PurchaseShelfRequest dto, InstockType type, LoginInDto loginInfo, bool isTransaction = true) { + // 组织集合 + var orgs = new List(); + var orgs_result = await _erpService.BillQueryForOrg(); + if (orgs_result.IsSuccess) + orgs = orgs_result.Data.ToList(); + var currentOrg= orgs.Where(x => x.Number == dto.OrgCode).FirstOrDefault(); + var entity = new InStock(); entity.Type = type; + entity.OrgId = currentOrg == null ? 0 : currentOrg.Id; + entity.StockCode = dto.StockCode; + entity.OrgCode = dto.OrgCode; + entity.SubStockId = dto.SubStockId; entity.Method = InventoryInOutMethod.Box; entity.Details = _mapper.Map>(dto.Details); entity.Create(loginInfo.UserInfo.StaffId); @@ -242,6 +254,22 @@ namespace WMS.Web.Domain.Services if (entity == null) return Result.ReFailure(ResultCodes.DateWriteError); + //处理添加入库汇总明细 + var totalDetails = dto.Details.GroupBy(x => new { x.TaskId, x.SourceBillNo, x.SupplierId, x.MaterialId }) + .Select(x => new InStockTotalDetails + { + InStockId= entity.Id, + TaskId=x.Key.TaskId, + SourceBillNo=x.Key.SourceBillNo, + SupplierId=x.Key.SupplierId, + MaterialId=x.Key.MaterialId, + Qty=x.Sum(t=>t.Qty), + SerialNumbers= x.SelectMany(t=>t.SerialNumbers).ToList() + }).ToList(); + + var isSuccess= await _inStockRepositories.AddRangeTotalDetails(totalDetails, isTransaction); + if (!isSuccess) + return Result.ReFailure(ResultCodes.DateWriteError); //同步金蝶后，反写任务单的已交数量 var taskIds = dto.Details.GroupBy(x => x.TaskId).Select(x => x.Key).ToList(); var tasks = await _inStockTaskRepositories.GetList(taskIds); @@ -262,7 +290,7 @@ namespace WMS.Web.Domain.Services task.Shelf(loginInfo.UserInfo.StaffId); } - var isSuccess = await _inStockTaskRepositories.UpdateRange(tasks, isTransaction); + isSuccess = await _inStockTaskRepositories.UpdateRange(tasks, isTransaction); if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError); } @@ -273,9 +301,7 @@ namespace WMS.Web.Domain.Services return serialNumber_result; //箱库存变动 - var dtoDatas = new List(); - dtoDatas.Add(entity); - var boxInventoryResult = await _boxInventoryService.GenerateInStockBox(dtoDatas, isTransaction); + var boxInventoryResult = await _boxInventoryService.GenerateInStockBox(entity, isTransaction); if (!boxInventoryResult.IsSuccess) return boxInventoryResult; @@ -306,6 +332,10 @@ namespace WMS.Web.Domain.Services //2.生成:入库单 var entity = new InStock(); entity.Type = task.Type; + entity.OrgId = task.Details.Select(x => x.OrgId).FirstOrDefault(); + entity.StockCode = dto.StockCode; + entity.OrgCode = dto.OrgCode; + entity.SubStockId = dto.SubStockId; entity.Method = dto.ShelfMethod == (int)ShelfMethod.Box ? InventoryInOutMethod.Box : InventoryInOutMethod.Product; entity.Details = new List(); @@ -321,10 +351,10 @@ namespace WMS.Web.Domain.Services item.TaskId = dto.TaskId; item.SourceBillNo = task.SourceBillNo; item.BoxId = box.BoxId; - item.SubStockId = dto.SubStockId; - item.StockCode = dto.StockCode; - item.OrgCode = dto.OrgCode; - item.OrgId = task.Details.Select(x => x.OrgId).FirstOrDefault(); + //item.SubStockId = dto.SubStockId; + //item.StockCode = dto.StockCode; + //item.OrgCode = dto.OrgCode; + //item.OrgId = task.Details.Select(x => x.OrgId).FirstOrDefault(); }); //3.3添加到临时集合中 temps.AddRange(dets); @@ -356,6 +386,22 @@ namespace WMS.Web.Domain.Services if (entity == null) return Result.ReFailure(ResultCodes.DateWriteError); + //处理添加入库汇总明细 + var totalDetails = dto.Boxs.SelectMany(x=>x.Details).GroupBy(x => new { x.MaterialId }) + .Select(x => new InStockTotalDetails + { + InStockId = entity.Id, + TaskId =dto.TaskId, + SourceBillNo = task.SourceBillNo, + MaterialId = x.Key.MaterialId, + Qty = x.Sum(t => t.Qty), + SerialNumbers = x.SelectMany(t => t.SerialNumbers).ToList() + }).ToList(); + + var isSuccess = await _inStockRepositories.AddRangeTotalDetails(totalDetails, isTransaction); + if (!isSuccess) + return Result.ReFailure(ResultCodes.DateWriteError); + //同步金蝶后，反写任务单的已交数量 if (task != null) { @@ -422,9 +468,7 @@ namespace WMS.Web.Domain.Services return serialNumber_result; //箱库存变动 - var dtoDatas = new List(); - dtoDatas.Add(entity); - var boxInventoryResult = await _boxInventoryService.GenerateInStockBox(dtoDatas, isTransaction); + var boxInventoryResult = await _boxInventoryService.GenerateInStockBox(entity, isTransaction); if (!boxInventoryResult.IsSuccess) return boxInventoryResult; diff --git a/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs b/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs index 20c884bd..5ddf95bc 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs @@ -168,6 +168,18 @@ namespace WMS.Web.Domain.Services.Public return org == null ? "" : org.Name; } + /// + /// 获取组织id + /// + /// + /// + /// + public int GetOrgId(List erpOrgs, string orgCode) + { + var org = erpOrgs.Where(x => x.Number == orgCode).FirstOrDefault(); + return org == null ? 0 : org.Id; + } + /// /// 获取供应商名称 /// diff --git a/src/WMS.Web.Domain/Services/SerialNumberService.cs b/src/WMS.Web.Domain/Services/SerialNumberService.cs index 86ef5f8b..d7c9eb13 100644 --- a/src/WMS.Web.Domain/Services/SerialNumberService.cs +++ b/src/WMS.Web.Domain/Services/SerialNumberService.cs @@ -321,7 +321,7 @@ namespace WMS.Web.Domain.Services { var box = boxList.FirstOrDefault(f => f.Id == entity.BoxId); var instockDetail = inStock.Details.FirstOrDefault(f => f.MaterialId == entity.MaterialId); - var subStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, instockDetail.SubStockId); + var subStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, inStock.SubStockId); //修改序列号和箱绑定关系 entity.InStock(instockDetail.SourceBillNo, inStock.Type); diff --git a/src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs b/src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs index ef38acf1..b43a62e3 100644 --- a/src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs +++ b/src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs @@ -200,6 +200,18 @@ namespace WMS.Web.Repositories.Configuration c => c.Aggregate(0, (a, v) => HashCode.Combine(a, v.GetHashCode())), c => (List)c.ToList())); }); + builder.Entity(ent => + { + ent.ToTable("t_wms_instock_total_details"); + ent.HasKey(x => x.Id); + ent.Property(f => f.SerialNumbers).HasConversion( + v => JsonConvert.SerializeObject(v), + v => JsonConvert.DeserializeObject>(v), + new ValueComparer>( + (c1, c2) => c1.SequenceEqual(c2), + c => c.Aggregate(0, (a, v) => HashCode.Combine(a, v.GetHashCode())), + c => (List)c.ToList())); + }); # endregion #region 入库任务单 @@ -335,6 +347,8 @@ namespace WMS.Web.Repositories.Configuration public DbSet TakeStockDetails { get; set; } public DbSet Instock { get; set; } public DbSet InStockDetails { get; set; } + public DbSet InStockTotalDetails { get; set; } + public DbSet InStockTask { get; set; } public DbSet InstockTaskBox { get; set; } public DbSet InStockTaskBoxDetails { get; set; } diff --git a/src/WMS.Web.Repositories/InStockRepositories.cs b/src/WMS.Web.Repositories/InStockRepositories.cs index db217993..1c2d89ad 100644 --- a/src/WMS.Web.Repositories/InStockRepositories.cs +++ b/src/WMS.Web.Repositories/InStockRepositories.cs @@ -80,8 +80,12 @@ namespace WMS.Web.Repositories if (!string.IsNullOrEmpty(dto.MaterialNumber)) materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).ToList(); - var query=_context.InStockDetails - .GroupJoin(_context.Instock, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders }) + //var query=_context.InStockDetails + // .GroupJoin(_context.Instock, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders }) + // .SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order }) + // .Where(adv => 1 == 1); + var query = _context.InStockTotalDetails + .GroupJoin(_context.Instock, detail => detail.InStockId, order => order.Id, (detail, orders) => new { detail, orders }) .SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order }) .Where(adv => 1 == 1); @@ -99,12 +103,12 @@ namespace WMS.Web.Repositories query = query.Where(w => w.detail.SupplierId == dto.SupplierId.Value); if (dto.OrgId.HasValue) - query = query.Where(w => w.detail.OrgId == dto.OrgId.Value); + query = query.Where(w => w.order.OrgId == dto.OrgId.Value); if (!string.IsNullOrEmpty(dto.StockCode)) { var splitStrs = dto.StockCode.Split("_$"); - query = query.Where(w => w.detail.StockCode == splitStrs[0] && w.detail.OrgCode == splitStrs[1]); + query = query.Where(w => w.order.StockCode == splitStrs[0] && w.order.OrgCode == splitStrs[1]); } if (dto.Type.HasValue) @@ -126,11 +130,11 @@ namespace WMS.Web.Repositories Type=s.order.Type.GetRemark(), SourceBillNo=s.detail.SourceBillNo, Supplier= _erpBasicDataExtendService.GetSupplierName(suppliers, s.detail.SupplierId), - Org = _erpBasicDataExtendService.GetOrgName(orgs, s.detail.OrgId), + Org = _erpBasicDataExtendService.GetOrgName(orgs, s.order.OrgId), MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId), MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId), Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId), - Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.detail.StockCode+s.detail.OrgCode), + Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.order.StockCode+s.order.OrgCode), Qty =s.detail.Qty, Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId), CreateTime =s.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"), @@ -215,5 +219,35 @@ namespace WMS.Web.Repositories }; return response; } + + /// + /// 批量添加:入库汇总明细 + /// + /// + /// + /// + public async Task AddRangeTotalDetails(List entitys, bool isTransaction = true) + { + IDbContextTransaction _transaction = null; + if (isTransaction) + _transaction = _context.Database.BeginTransaction(); + try + { + if (entitys != null && entitys.Count != 0) + { + await _context.InStockTotalDetails.AddRangeAsync(entitys); + await _context.SaveChangesAsync(); + } + if (_transaction != null) + _transaction.Commit(); + return true; + } + catch + { + if (_transaction != null) + _transaction.Rollback(); + return false; + } + } } }