From d57a4d61a81e2e27b09c4c9560358efb668f349d Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周一, 19 5月 2025 09:12:37 +0800 Subject: [PATCH] 增加 扩展查询方法 --- HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs | 238 +++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 197 insertions(+), 41 deletions(-) diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs index 334b107..ded7054 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs @@ -1,9 +1,13 @@ +using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockOrderDetail; +using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord; using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterialStocks; using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsTask; using CMS.Plugin.HIAWms.Application.Contracts.Services; +using CMS.Plugin.HIAWms.Domain.Shared.Enums; using CMS.Plugin.HIAWms.Domain.Shared.WmsMaterialStocks; using CMS.Plugin.HIAWms.Domain.WmsAreas; using CMS.Plugin.HIAWms.Domain.WmsContainers; +using CMS.Plugin.HIAWms.Domain.WmsInOutStockRecord; using CMS.Plugin.HIAWms.Domain.WmsMaterials; using CMS.Plugin.HIAWms.Domain.WmsMaterialStocks; using CMS.Plugin.HIAWms.Domain.WmsPlaces; @@ -11,8 +15,10 @@ using CmsQueryExtensions; using CmsQueryExtensions.Extension; using Microsoft.Extensions.DependencyInjection; +using SqlKata; using System.Linq.Expressions; using System.Text.Json; +using System.Threading.Tasks; using Volo.Abp; using Volo.Abp.Application.Dtos; using Volo.Abp.Data; @@ -29,6 +35,8 @@ private readonly IWmsContainerRepository _wmscontainerRepository; private readonly IWmsPlaceRepository _wmsplaceRepository; private readonly IWmsAreaRepository _wmsareaRepository; + private readonly IWmsInOutStockRecordAppService _wmspInOutStockRecordAppService; + private readonly IWmsInOutStockRecordRepository _wmsInOutStockRecordRepository; private readonly IServiceProvider _serviceProvider; /// <summary> @@ -41,7 +49,10 @@ IWmsPlaceRepository wmsplaceRepository, IWmsAreaRepository wmsareaRepository , - IServiceProvider serviceProvider) + IServiceProvider serviceProvider, + IWmsInOutStockRecordAppService wmspInOutStockRecordAppService, + IWmsInOutStockRecordRepository wmsInOutStockRecordRepository + ) { _wmsmaterialstockRepository = wmsmaterialstockRepository; _wmsMaterialRepository = wmsMaterialRepository; @@ -49,6 +60,8 @@ _wmsplaceRepository = wmsplaceRepository; _wmsareaRepository = wmsareaRepository; _serviceProvider = serviceProvider; + _wmspInOutStockRecordAppService = wmspInOutStockRecordAppService; + _wmsInOutStockRecordRepository = wmsInOutStockRecordRepository; } /// <inheritdoc /> @@ -58,7 +71,7 @@ } /// <inheritdoc /> - public virtual async Task<PagedResultDto<WmsMaterialStockDto>> GetListAsync(GetWmsMaterialStocksInput input) + public virtual async Task<PagedResultDto<WmsMaterialStockDto>> GetListAsync(GetWmsMaterialStockInput input) { Check.NotNull(input, nameof(input)); @@ -67,15 +80,17 @@ input.Sorting = nameof(WmsMaterialStock.Sort); } - var specification = new WmsMaterialStockSpecification(input.Name); - var stock = ObjectMapper.Map<GetWmsMaterialStocksInput, WmsMaterialStock>(input); - var count = await _wmsmaterialstockRepository.GetCountAsync(stock, input.StartTime, input.EndTime, input.Filter, specification); - var list = await _wmsmaterialstockRepository.GetListAsync(stock, input.StartTime, input.EndTime, input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification); + //鍔ㄦ�佹瀯閫犳煡璇㈡潯浠� + var whereConditions = DynamicGetQueryParams(input); + + var stock = ObjectMapper.Map<GetWmsMaterialStockInput, WmsMaterialStock>(input); + var count = await _wmsmaterialstockRepository.GetCountAsync(whereConditions); + var list = await _wmsmaterialstockRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount); return new PagedResultDto<WmsMaterialStockDto>(count, ObjectMapper.Map<List<WmsMaterialStock>, List<WmsMaterialStockDto>>(list)); } - public async Task<PagedResultDto<WmsMaterialStockDto>> GetStockDetailAsync(GetWmsMaterialStocksInput input) + public async Task<PagedResultDto<WmsMaterialStockDto>> GetStockDetailAsync(GetWmsMaterialStockInput input) { Check.NotNull(input, nameof(input)); @@ -93,8 +108,40 @@ var count = await _wmsmaterialstockRepository.GetDetailCountAsync(whereConditions); var list = await _wmsmaterialstockRepository.GetStockDetailListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount); + var result = list + .GroupBy(x => x.PlaceNo) // 鎸夊簱浣嶅彿鍒嗙粍 + .SelectMany(g => g + .OrderBy(x => x.InStockTime) // 鎸夊叆搴撴椂闂存帓搴� + .Select((x, index) => new WmsMaterialStockDto + { + MaterialId = x.MaterialId, + MaterialBatch = x.MaterialBatch, + MaterialModel = x.MaterialModel, + MaterialName = x.MaterialName, + MaterialNo = x.MaterialNo, + CheckStatus = x.CheckStatus, + ContainerNo = x.ContainerNo, + ContainerType = x.ContainerType, + StockNumber = x.StockNumber, + SupplierCode = x.SupplierCode, + PlaceNo = x.PlaceNo, + PlaceStatus = x.PlaceStatus, + StorageTypeNo = x.StorageTypeNo, + AreaCode = x.AreaCode, + AreaName = x.AreaName, + IsLock = x.IsLock, + Id = x.Id, + EmptyContainer = x.EmptyContainer, + InStockTime = x.InStockTime, + RedundantField1 = x.RedundantField1, + RedundantField2 = x.RedundantField2, + RedundantField3 = x.RedundantField3, + Remark = x.Remark, + OrderInPlace = index+1 - return new PagedResultDto<WmsMaterialStockDto>(count, ObjectMapper.Map<List<WmsMaterialStock>, List<WmsMaterialStockDto>>(list)); + })).ToList(); + + return new PagedResultDto<WmsMaterialStockDto>(count, result); } /// <summary> @@ -102,17 +149,17 @@ /// </summary> /// <param name="input">杈撳叆鍙傛暟</param> /// <returns></returns> - private FunReturnResultModel<Expression<Func<WmsMaterialStock, bool>>> DynamicGetQueryParams(GetWmsMaterialStocksInput input) + private FunReturnResultModel<Expression<Func<WmsMaterialStock, bool>>> DynamicGetQueryParams(GetWmsMaterialStockInput input) { //鍔ㄦ�佹瀯閫犳煡璇㈡潯浠� - var whereConditions = WhereConditionsExtensions.GetWhereConditions<WmsMaterialStock, GetWmsMaterialStocksInput>(input); + var whereConditions = WhereConditionsExtensions.GetWhereConditions<WmsMaterialStock, GetWmsMaterialStockInput>(input); if (!whereConditions.IsSuccess) { throw new Exception("鍔ㄦ�佹瀯閫犳煡璇㈡潯浠跺け璐�:" + whereConditions.ErrMsg); } //涔熷彲鍐嶆鑷畾涔夋瀯寤烘煡璇㈡潯浠� - Expression<Func<WmsMaterialStock, bool>> extendExpression = a => a.IsDeleted == false ; + Expression<Func<WmsMaterialStock, bool>> extendExpression = a => a.IsDeleted == false; // 浣跨敤 System.Linq.PredicateBuilder 鐨� And var pres = (System.Linq.Expressions.Expression<Func<WmsMaterialStock, bool>>)(whereConditions.data); whereConditions.data = System.Linq.PredicateBuilder.And(pres, extendExpression); @@ -128,31 +175,51 @@ using var uow = unitOfWorkManager.Begin(requiresNew: true); await CheckCreateOrUpdateDtoAsync(input); - //var exist = await _wmsmaterialstockRepository.NameExistAsync(input.MaterialNo); - //if (exist) - //{ - // throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.MaterialNo]); - //} - var material = await _wmsMaterialRepository.FindByNameAsync(input.MaterialNo); + var materialModel = await _wmsMaterialRepository.FindByModelAsync(input.MaterialModel); + if(materialModel == null) + { + throw new UserFriendlyException("鐗╂枡鍨嬪彿涓嶅瓨鍦�"); + } + + var material = await _wmsMaterialRepository.FindByNameAsync(materialModel.MaterialNo); if (material == null) { throw new UserFriendlyException("鐗╂枡淇℃伅涓嶅瓨鍦�"); } - var container = await _wmscontainerRepository.FindByNameAsync(input.ContainerNo); + var palceInfo = await _wmsplaceRepository.FindByNameAsync(input.PlaceNo); + //if (container == null) //{ // throw new UserFriendlyException("鎵樼洏淇℃伅涓嶅瓨鍦�"); //} + input.ContainerNo = string.IsNullOrEmpty(input.ContainerNo) ? "TP_" + DateTime.Now.ToString("yyMMddHHmmssfff") : input.ContainerNo; var wmsmaterialstock = ObjectMapper.Map<WmsMaterialStockCreateDto, WmsMaterialStock>(input); input.MapExtraPropertiesTo(wmsmaterialstock, MappingPropertyDefinitionChecks.None); wmsmaterialstock.MaterialId = Guid.NewGuid().ToString("N"); + wmsmaterialstock.MaterialNo = material.MaterialNo; wmsmaterialstock.MaterialName = material.MaterialName; - wmsmaterialstock.ContainerStatus = Domain.Shared.Enums.ContainerStatusEnum.KUWEI; - wmsmaterialstock.ContainerType = container == null ? Domain.Shared.Enums.ContainerTypeEnum.XUNI : container.ContainerType; - wmsmaterialstock.StorageTypeNo = Domain.Shared.Enums.PlaceTypeEnum.XUNIKUWEI; - wmsmaterialstock.PlaceStatus = Domain.Shared.Enums.PlaceStatusEnum.DAIRU; + var wmsmaterialstockList = await _wmsmaterialstockRepository.GetStockListAsync(new WmsMaterialStock { PlaceNo = input.PlaceNo }); + if (wmsmaterialstockList.Count > 0) + { + if (wmsmaterialstock.StorageTypeNo == PlaceTypeEnum.YUANLIAOKUWEI) + { + wmsmaterialstock.ContainerNo = wmsmaterialstockList[0].ContainerNo; + input.ContainerNo = wmsmaterialstockList[0].ContainerNo; + } + if (wmsmaterialstockList[0].MaterialNo != material.MaterialNo) + { + throw new UserFriendlyException("褰撳墠搴撲綅宸插瓨鏀惧埆鐨勭墿鏂�"); + } + } + + var container = await _wmscontainerRepository.FindByNameAsync(input.ContainerNo); + + wmsmaterialstock.ContainerStatus = ContainerStatusEnum.KUWEI; + wmsmaterialstock.ContainerType = container == null ? ContainerTypeEnum.XUNI : container.ContainerType; + wmsmaterialstock.StorageTypeNo = PlaceTypeEnum.XUNIKUWEI; + wmsmaterialstock.PlaceStatus = PlaceStatusEnum.DAIRU; if (!string.IsNullOrEmpty(input.PlaceNo)) { var place = await _wmsplaceRepository.FindByNameAsync(input.PlaceNo); @@ -166,24 +233,17 @@ throw new UserFriendlyException("搴撲綅搴撳尯淇℃伅涓嶅瓨鍦�"); } - wmsmaterialstock.PlaceStatus = Domain.Shared.Enums.PlaceStatusEnum.CUNHUO; + wmsmaterialstock.PlaceStatus = PlaceStatusEnum.CUNHUO; wmsmaterialstock.StorageTypeNo = place.StorageTypeNo; wmsmaterialstock.AreaCode = place.AreaCode; wmsmaterialstock.AreaName = area.AreaName; - place.PlaceStatus = Domain.Shared.Enums.PlaceStatusEnum.CUNHUO; + place.PlaceStatus = PlaceStatusEnum.CUNHUO; place.Islock = input.IsLock; await _wmsplaceRepository.UpdateAsync(place); } - var wmsmaterialstockList = await _wmsmaterialstockRepository.GetStockListAsync(new WmsMaterialStock { PlaceNo = input.PlaceNo }); - if (wmsmaterialstockList.Count > 0) - { - if (wmsmaterialstockList[0].MaterialNo != input.MaterialNo) - { - throw new UserFriendlyException("褰撳墠搴撲綅宸插瓨鏀惧埆鐨勭墿鏂�"); - } - } + var maxSort = await _wmsmaterialstockRepository.GetMaxSortAsync(); var sort = input.Sort ?? maxSort; @@ -195,6 +255,7 @@ wmsmaterialstock.InStockTime = DateTime.Now; var stockList = new List<WmsMaterialStock>(); + var recordList = new List<WmsInOutStockRecord>(); for (int i = 0; i < input.StockNumber; i++) { var stock = new WmsMaterialStock(); @@ -203,15 +264,34 @@ stock.MaterialId = Guid.NewGuid().ToString("N"); stock.StockNumber = 1; stockList.Add(stock); - } + // 娣诲姞搴撳瓨璁板綍 + var record = new WmsInOutStockRecord + { + TaskNo = string.IsNullOrEmpty(input.OrderNo) ? "Task_" + DateTime.Now.ToString("yyyyMMddHHmmssfff") : input.OrderNo, + OrderNo = input.OrderNo, + StockType = StockTypeEnum.InBound, + ContainerNo = stock.ContainerNo, + MaterialId = stock.MaterialId, + MaterialModel = stock.MaterialModel, + MaterialName = stock.MaterialName, + MaterialNo = stock.MaterialNo, + MaterialBatch = stock.MaterialBatch, + SourcePlace = "娣诲姞搴撳瓨", + ToPlace = stock.PlaceNo, + OperateTime = DateTime.Now, + Remark = "鍏ュ簱", + }; + recordList.Add(record); + } + await _wmsInOutStockRecordRepository.InsertManyAsync(recordList); await _wmsmaterialstockRepository.InsertManyAsync(stockList); if (container == null) { container = new WmsContainer { - ContainerNo = input.ContainerNo, + ContainerNo = wmsmaterialstock.ContainerNo, ContainerType = Domain.Shared.Enums.ContainerTypeEnum.XUNI, ContainerStatus = Domain.Shared.Enums.ContainerStatusEnum.KUWEI, }; @@ -415,7 +495,7 @@ /// <inheritdoc /> public virtual async Task AdjustSortAsync(Guid id, int sort) { - var list = await _wmsmaterialstockRepository.GetListAsync(null, null, null, nameof(WmsMaterialStock.Sort)); + var list = await _wmsmaterialstockRepository.GetListAsync(null, "", 0, 999); if (list != null && list.Any()) { var initSort = 1; @@ -595,7 +675,7 @@ } /// <inheritdoc /> - public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsMaterialStocksInput input) + public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsMaterialStockInput input) { Check.NotNull(input, nameof(input)); @@ -604,9 +684,9 @@ input.Sorting = nameof(WmsMaterialStock.Sort); } - var specification = new WmsMaterialStockSpecification(input.Name); - var stock = ObjectMapper.Map<GetWmsMaterialStocksInput, WmsMaterialStock>(input); - var list = await _wmsmaterialstockRepository.GetListAsync(stock, input.StartTime, input.EndTime, input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true); + var whereConditions = DynamicGetQueryParams(input); + var stock = ObjectMapper.Map<GetWmsMaterialStockInput, WmsMaterialStock>(input); + var list = await _wmsmaterialstockRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount); var result = ObjectMapper.Map<List<WmsMaterialStock>, List<WmsMaterialStockDto>>(list); var sheets = new Dictionary<string, object> @@ -625,9 +705,85 @@ protected Task CheckCreateOrUpdateDtoAsync(WmsMaterialStockCreateOrUpdateDtoBase input) { Check.NotNull(input, nameof(input)); - Check.NotNullOrWhiteSpace(input.MaterialNo, "缂栧彿", WmsMaterialStockConsts.MaxCodeLength); - Check.NotNullOrWhiteSpace(input.MaterialName, "鍚嶇О", WmsMaterialStockConsts.MaxNameLength); + //Check.NotNullOrWhiteSpace(input.MaterialNo, "缂栧彿", WmsMaterialStockConsts.MaxCodeLength); + //Check.NotNullOrWhiteSpace(input.MaterialName, "鍚嶇О", WmsMaterialStockConsts.MaxNameLength); Check.Length(input.Remark, "澶囨敞", WmsMaterialStockConsts.MaxRemarkLength); return Task.CompletedTask; } + + + /// <summary> + /// 鏍规嵁鏉′欢鑾峰彇鍑哄叆搴撳崟鎹鎯呭垪琛� + /// </summary> + /// <param name="whereConditions"></param> + /// <param name="cancellationToken"></param> + /// <returns></returns> + public async Task<List<WmsMaterialStock>> GetListByFilterAsync(Expression<Func<WmsMaterialStock, bool>> whereConditions, CancellationToken cancellationToken = default) + { + return await _wmsmaterialstockRepository.GetListByFilterAsync(whereConditions); + } + + /// <summary> + /// 鏍规嵁鏉′欢鑾峰彇鍗曚釜鍑哄叆搴撳崟鎹鎯� + /// </summary> + /// <param name="whereConditions"></param> + /// <param name="isMultipleThrowException">鏄惁鏌ヨ鍑哄鏉″氨鎶ラ敊</param> + /// <param name="cancellationToken"></param> + /// <returns></returns> + /// <exception cref="UserFriendlyException"></exception> + public async Task<WmsMaterialStock> GetSingleByFilterAsync(Expression<Func<WmsMaterialStock, bool>> whereConditions, bool is鈥婱ultipleThrowException = false, CancellationToken cancellationToken = default) + { + return await _wmsmaterialstockRepository.GetSingleByFilterAsync(whereConditions, is鈥婱ultipleThrowException); + } + + /// <summary> + /// 鏍规嵁鏉′欢鑾峰彇鍑哄叆搴撳崟鎹鎯呭垪琛� + /// </summary> + /// <param name="input"></param> + /// <returns></returns> + public virtual async Task<List<WmsMaterialStockDto>> FindListByFilterAsync(GetWmsMaterialStockInput input, CancellationToken cancellationToken = default) + { + Check.NotNull(input, nameof(input)); + + if (input.Sorting.IsNullOrWhiteSpace()) + { + input.Sorting = nameof(WmsMaterialStock.Sort); + } + + #region 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠� + + //鍔ㄦ�佹瀯閫犳煡璇㈡潯浠� + var whereConditions = DynamicGetQueryParams(input); + + #endregion + + var list = await _wmsmaterialstockRepository.GetListByFilterAsync(whereConditions?.data); + + return new List<WmsMaterialStockDto>(ObjectMapper.Map<List<WmsMaterialStock>, List<WmsMaterialStockDto>>(list)); + } + /// <summary> + /// 鏍规嵁鏉′欢鑾峰彇鍗曚釜鍑哄叆搴撳崟鎹鎯� + /// </summary> + /// <param name="input"></param> + /// <returns></returns> + public virtual async Task<WmsMaterialStockDto> FindSingleByFilterAsync(GetWmsMaterialStockInput input, CancellationToken cancellationToken = default) + { + Check.NotNull(input, nameof(input)); + + if (input.Sorting.IsNullOrWhiteSpace()) + { + input.Sorting = nameof(WmsMaterialStock.Sort); + } + + #region 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠� + + //鍔ㄦ�佹瀯閫犳煡璇㈡潯浠� + var whereConditions = DynamicGetQueryParams(input); + + #endregion + + var dataObj = await _wmsmaterialstockRepository.GetSingleByFilterAsync(whereConditions?.data); + + return (ObjectMapper.Map<WmsMaterialStock, WmsMaterialStockDto>(dataObj)); + } } -- Gitblit v1.9.3