From 25246d39da4b74b54a844b36d8a50752917b81cc Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 13 5月 2025 16:59:24 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs | 353 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 275 insertions(+), 78 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 4f3b9ee..6cb1570 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs
@@ -1,17 +1,23 @@
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.WmsMaterialStocks;
-using CMS.Plugin.HIAWms.Domain.Shared;
using CMS.Plugin.HIAWms.Domain.Shared.WmsMaterialStocks;
+using CMS.Plugin.HIAWms.Domain.WmsAreas;
+using CMS.Plugin.HIAWms.Domain.WmsContainers;
+using CMS.Plugin.HIAWms.Domain.WmsMaterials;
+using CMS.Plugin.HIAWms.Domain.WmsMaterialStocks;
+using CMS.Plugin.HIAWms.Domain.WmsPlaces;
+using CMS.Plugin.HIAWms.Domain.WmsTask;
+using CmsQueryExtensions;
+using CmsQueryExtensions.Extension;
+using Microsoft.Extensions.DependencyInjection;
+using System.Linq.Expressions;
+using System.Text.Json;
using Volo.Abp;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Data;
using Volo.Abp.ObjectExtending;
-using CMS.Plugin.HIAWms.Domain.Shared.Util;
-using CMS.Plugin.HIAWms.Domain.WmsMaterials;
-using CMS.Plugin.HIAWms.Domain.WmsContainers;
-using CMS.Plugin.HIAWms.Domain.WmsPlaces;
-using CMS.Plugin.HIAWms.Domain.WmsAreas;
+using Volo.Abp.Uow;
namespace CMS.Plugin.HIAWms.Application.Implements;
@@ -23,23 +29,26 @@
private readonly IWmsContainerRepository _wmscontainerRepository;
private readonly IWmsPlaceRepository _wmsplaceRepository;
private readonly IWmsAreaRepository _wmsareaRepository;
+ private readonly IServiceProvider _serviceProvider;
/// <summary>
/// Initializes a new instance of the <see cref="WmsMaterialStockAppService"/> class.
/// </summary>
/// <param name="wmsmaterialstockRepository">The task job repository.</param>
- public WmsMaterialStockAppService(IWmsMaterialStockRepository wmsmaterialstockRepository,
- IWmsMaterialRepository wmsMaterialRepository,
- IWmsContainerRepository wmscontainerRepository,
- IWmsPlaceRepository wmsplaceRepository,
+ public WmsMaterialStockAppService(IWmsMaterialStockRepository wmsmaterialstockRepository,
+ IWmsMaterialRepository wmsMaterialRepository,
+ IWmsContainerRepository wmscontainerRepository,
+ IWmsPlaceRepository wmsplaceRepository,
IWmsAreaRepository wmsareaRepository
- )
+,
+ IServiceProvider serviceProvider)
{
_wmsmaterialstockRepository = wmsmaterialstockRepository;
_wmsMaterialRepository = wmsMaterialRepository;
_wmscontainerRepository = wmscontainerRepository;
_wmsplaceRepository = wmsplaceRepository;
_wmsareaRepository = wmsareaRepository;
+ _serviceProvider = serviceProvider;
}
/// <inheritdoc />
@@ -49,7 +58,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));
@@ -58,17 +67,99 @@
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(GetWmsMaterialStockInput input)
+ {
+ Check.NotNull(input, nameof(input));
+
+ if (input.Sorting.IsNullOrWhiteSpace())
+ {
+ input.Sorting = nameof(WmsMaterialStock.Sort);
+ }
+
+ #region 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
+
+ //鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
+ var whereConditions = DynamicGetQueryParams(input);
+
+ #endregion
+
+ 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
+
+ })).ToList();
+
+ return new PagedResultDto<WmsMaterialStockDto>(count, result);
+ }
+
+ /// <summary>
+ /// 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
+ /// </summary>
+ /// <param name="input">杈撳叆鍙傛暟</param>
+ /// <returns></returns>
+ private FunReturnResultModel<Expression<Func<WmsMaterialStock, bool>>> DynamicGetQueryParams(GetWmsMaterialStockInput 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;
+ // 浣跨敤 System.Linq.PredicateBuilder 鐨� And
+ var pres = (System.Linq.Expressions.Expression<Func<WmsMaterialStock, bool>>)(whereConditions.data);
+ whereConditions.data = System.Linq.PredicateBuilder.And(pres, extendExpression);
+
+ return whereConditions;
}
/// <inheritdoc />
public virtual async Task<WmsMaterialStockDto> CreateAsync(WmsMaterialStockCreateDto input)
{
+ using var scope = _serviceProvider.CreateScope();
+ var unitOfWorkManager = scope.ServiceProvider.GetRequiredService<IUnitOfWorkManager>();
+ using var uow = unitOfWorkManager.Begin(requiresNew: true);
await CheckCreateOrUpdateDtoAsync(input);
//var exist = await _wmsmaterialstockRepository.NameExistAsync(input.MaterialNo);
@@ -77,69 +168,114 @@
// throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.MaterialNo]);
//}
var material = await _wmsMaterialRepository.FindByNameAsync(input.MaterialNo);
- if(material == null)
+ if (material == null)
{
throw new UserFriendlyException("鐗╂枡淇℃伅涓嶅瓨鍦�");
}
- var container = await _wmscontainerRepository.FindByNameAsync(input.ContainerNo);
- if (container == null)
- {
- throw new UserFriendlyException("鎵樼洏淇℃伅涓嶅瓨鍦�");
- }
- var place = await _wmsplaceRepository.FindByNameAsync(input.PlaceNo);
- if(place == null)
- {
- throw new UserFriendlyException("搴撲綅淇℃伅涓嶅瓨鍦�");
- }
- var area = await _wmsareaRepository.FindByNameAsync(place.AreaCode);
- if(area == null)
- {
- throw new UserFriendlyException("搴撲綅搴撳尯淇℃伅涓嶅瓨鍦�");
- }
- var maxSort = await _wmsmaterialstockRepository.GetMaxSortAsync();
- var sort = input.Sort ?? maxSort;
+ var container = await _wmscontainerRepository.FindByNameAsync(input.ContainerNo);
+ //if (container == null)
+ //{
+ // throw new UserFriendlyException("鎵樼洏淇℃伅涓嶅瓨鍦�");
+ //}
+
var wmsmaterialstock = ObjectMapper.Map<WmsMaterialStockCreateDto, WmsMaterialStock>(input);
input.MapExtraPropertiesTo(wmsmaterialstock, MappingPropertyDefinitionChecks.None);
wmsmaterialstock.MaterialId = Guid.NewGuid().ToString("N");
- material.MaterialName = material.MaterialName;
+ wmsmaterialstock.MaterialName = material.MaterialName;
wmsmaterialstock.ContainerStatus = Domain.Shared.Enums.ContainerStatusEnum.KUWEI;
- wmsmaterialstock.ContainerType = container.ContainerType;
+ 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;
+ if (!string.IsNullOrEmpty(input.PlaceNo))
+ {
+ var place = await _wmsplaceRepository.FindByNameAsync(input.PlaceNo);
+ if (place == null)
+ {
+ throw new UserFriendlyException("搴撲綅淇℃伅涓嶅瓨鍦�");
+ }
+ var area = await _wmsareaRepository.FindByNameAsync(place.AreaCode);
+ if (area == null)
+ {
+ throw new UserFriendlyException("搴撲綅搴撳尯淇℃伅涓嶅瓨鍦�");
+ }
- wmsmaterialstock.PlaceStatus = Domain.Shared.Enums.PlaceStatusEnum.CUNHUO;
- wmsmaterialstock.StorageTypeNo = place.StorageTypeNo;
- wmsmaterialstock.AreaCode = place.AreaCode;
- wmsmaterialstock.AreaName = area.AreaName;
+ wmsmaterialstock.PlaceStatus = Domain.Shared.Enums.PlaceStatusEnum.CUNHUO;
+ wmsmaterialstock.StorageTypeNo = place.StorageTypeNo;
+ wmsmaterialstock.AreaCode = place.AreaCode;
+ wmsmaterialstock.AreaName = area.AreaName;
+
+ place.PlaceStatus = Domain.Shared.Enums.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;
wmsmaterialstock.MaterialModel = material.MaterialModel;
wmsmaterialstock.MaterialBatch = input.MaterialBatch;
wmsmaterialstock.Sort = sort;
wmsmaterialstock.InStockTime = DateTime.Now;
- await _wmsmaterialstockRepository.InsertAsync(wmsmaterialstock);
-
- container.ContainerStatus = Domain.Shared.Enums.ContainerStatusEnum.KUWEI;
- place.PlaceStatus = Domain.Shared.Enums.PlaceStatusEnum.CUNHUO;
- place.Islock = input.IsLock;
-
- await _wmscontainerRepository.UpdateAsync(container);
- await _wmsplaceRepository.UpdateAsync(place);
-
- if (input.Sort.HasValue && wmsmaterialstock.Sort != maxSort)
+ var stockList = new List<WmsMaterialStock>();
+ for (int i = 0; i < input.StockNumber; i++)
{
- await AdjustSortAsync(wmsmaterialstock.Id, wmsmaterialstock.Sort);
+ var stock = new WmsMaterialStock();
+ var json = JsonSerializer.Serialize(wmsmaterialstock);
+ stock = JsonSerializer.Deserialize<WmsMaterialStock>(json);
+ stock.MaterialId = Guid.NewGuid().ToString("N");
+ stock.StockNumber = 1;
+ stockList.Add(stock);
}
+ await _wmsmaterialstockRepository.InsertManyAsync(stockList);
+
+ if (container == null)
+ {
+ container = new WmsContainer
+ {
+ ContainerNo = input.ContainerNo,
+ ContainerType = Domain.Shared.Enums.ContainerTypeEnum.XUNI,
+ ContainerStatus = Domain.Shared.Enums.ContainerStatusEnum.KUWEI,
+ };
+ var result = await _wmscontainerRepository.InsertAsync(container);
+ }
+ else
+ {
+ container.ContainerStatus = Domain.Shared.Enums.ContainerStatusEnum.KUWEI;
+
+ await _wmscontainerRepository.UpdateAsync(container);
+ }
+
+ //if (input.Sort.HasValue && wmsmaterialstock.Sort != maxSort)
+ //{
+ // await AdjustSortAsync(wmsmaterialstock.Id, wmsmaterialstock.Sort);
+ //}
+ await uow.SaveChangesAsync();
+ await uow.CompleteAsync();
return ObjectMapper.Map<WmsMaterialStock, WmsMaterialStockDto>(wmsmaterialstock);
}
/// <inheritdoc />
public virtual async Task<WmsMaterialStockDto> UpdateAsync(Guid id, WmsMaterialStockUpdateDto input)
{
+ using var scope = _serviceProvider.CreateScope();
+ var unitOfWorkManager = scope.ServiceProvider.GetRequiredService<IUnitOfWorkManager>();
+ using var uow = unitOfWorkManager.Begin(requiresNew: true);
await CheckCreateOrUpdateDtoAsync(input);
- var wmsmaterialstock = await _wmsmaterialstockRepository.GetAsync(id);
+ var wmsmaterialstockList = await _wmsmaterialstockRepository.GetStockListAsync(new WmsMaterialStock { MaterialNo = input.MaterialNo });
//var exist = await _wmsmaterialstockRepository.NameExistAsync(input.MaterialNo, wmsmaterialstock.Id);
//if (exist)
//{
@@ -165,29 +301,53 @@
{
throw new UserFriendlyException("搴撲綅搴撳尯淇℃伅涓嶅瓨鍦�");
}
- wmsmaterialstock.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
- input.MapExtraPropertiesTo(wmsmaterialstock, MappingPropertyDefinitionChecks.None);
- wmsmaterialstock.MaterialNo = input.MaterialNo;
- wmsmaterialstock.ContainerNo = input.ContainerNo;
- wmsmaterialstock.StockNumber = input.StockNumber;
- wmsmaterialstock.PlaceNo = input.PlaceNo;
- wmsmaterialstock.IsLock = input.IsLock;
- wmsmaterialstock.InStockTime = input.InStockTime;
- wmsmaterialstock.Remark = input.Remark;
- wmsmaterialstock.MaterialName = material.MaterialName;
- wmsmaterialstock.ContainerStatus = Domain.Shared.Enums.ContainerStatusEnum.KUWEI;
- wmsmaterialstock.ContainerType = container.ContainerType;
+ foreach (var wmsmaterialstock in wmsmaterialstockList)
+ {
+ if (input.StockNumber < wmsmaterialstockList.Count)
+ {
+ wmsmaterialstock.IsDeleted = true;
+ input.StockNumber += 1;
+ }
+ wmsmaterialstock.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
+ input.MapExtraPropertiesTo(wmsmaterialstock, MappingPropertyDefinitionChecks.None);
+ wmsmaterialstock.MaterialNo = input.MaterialNo;
+ wmsmaterialstock.ContainerNo = input.ContainerNo;
+ //wmsmaterialstock.StockNumber = input.StockNumber;
+ wmsmaterialstock.PlaceNo = input.PlaceNo;
+ wmsmaterialstock.IsLock = input.IsLock;
+ wmsmaterialstock.EmptyContainer = input.EmptyContainer;
+ //wmsmaterialstock.InStockTime = input.InStockTime;
+ wmsmaterialstock.Remark = input.Remark;
- wmsmaterialstock.PlaceStatus = Domain.Shared.Enums.PlaceStatusEnum.CUNHUO;
- wmsmaterialstock.StorageTypeNo = place.StorageTypeNo;
- wmsmaterialstock.AreaCode = place.AreaCode;
- wmsmaterialstock.AreaName = area.AreaName;
+ wmsmaterialstock.MaterialName = material.MaterialName;
+ wmsmaterialstock.ContainerStatus = Domain.Shared.Enums.ContainerStatusEnum.KUWEI;
+ wmsmaterialstock.ContainerType = container.ContainerType;
- wmsmaterialstock.MaterialModel = material.MaterialModel;
- wmsmaterialstock.MaterialBatch = input.MaterialBatch;
+ wmsmaterialstock.PlaceStatus = Domain.Shared.Enums.PlaceStatusEnum.CUNHUO;
+ wmsmaterialstock.StorageTypeNo = place.StorageTypeNo;
+ wmsmaterialstock.AreaCode = place.AreaCode;
+ wmsmaterialstock.AreaName = area.AreaName;
- await _wmsmaterialstockRepository.UpdateAsync(wmsmaterialstock);
+ wmsmaterialstock.MaterialModel = material.MaterialModel;
+ wmsmaterialstock.MaterialBatch = input.MaterialBatch;
+ }
+ if (input.StockNumber > wmsmaterialstockList.Count)
+ {
+ var stockList = new List<WmsMaterialStock>();
+ for (int i = 0; i < input.StockNumber - wmsmaterialstockList.Count; i++)
+ {
+ var stock = new WmsMaterialStock();
+ var json = JsonSerializer.Serialize(wmsmaterialstockList[0]);
+ stock = JsonSerializer.Deserialize<WmsMaterialStock>(json);
+ stock.MaterialId = Guid.NewGuid().ToString("N");
+ stock.StockNumber = 1;
+ stockList.Add(stock);
+ }
+ await _wmsmaterialstockRepository.InsertManyAsync(stockList);
+ }
+
+ await _wmsmaterialstockRepository.UpdateManyAsync(wmsmaterialstockList);
container.ContainerStatus = Domain.Shared.Enums.ContainerStatusEnum.KUWEI;
place.PlaceStatus = Domain.Shared.Enums.PlaceStatusEnum.CUNHUO;
@@ -196,7 +356,31 @@
await _wmscontainerRepository.UpdateAsync(container);
await _wmsplaceRepository.UpdateAsync(place);
- return ObjectMapper.Map<WmsMaterialStock, WmsMaterialStockDto>(wmsmaterialstock);
+ await uow.SaveChangesAsync();
+ await uow.CompleteAsync();
+
+ var result = wmsmaterialstockList.GroupBy(x => new { x.MaterialNo, x.PlaceNo, x.ContainerNo })
+ .Select(g => new WmsMaterialStock
+ {
+ MaterialNo = g.Key.MaterialNo,
+ MaterialName = g.First().MaterialName,
+ PlaceNo = g.Key.PlaceNo,
+ ContainerNo = g.Key.ContainerNo,
+ ContainerStatus = g.First().ContainerStatus,
+ PlaceStatus = g.First().PlaceStatus,
+ StorageTypeNo = g.First().StorageTypeNo,
+ MaterialBatch = g.First().MaterialBatch,
+ MaterialModel = g.First().MaterialModel,
+ AreaCode = g.First().AreaCode,
+ AreaName = g.First().AreaName,
+ CheckStatus = g.First().CheckStatus,
+ IsLock = g.First().IsLock,
+ EmptyContainer = g.First().EmptyContainer,
+ InStockTime = g.First().InStockTime,
+ StockNumber = g.Sum(x => x.StockNumber)
+ })
+ .FirstOrDefault();
+ return ObjectMapper.Map<WmsMaterialStock, WmsMaterialStockDto>(result);
}
/// <inheritdoc />
@@ -249,10 +433,23 @@
}
}
+ /// <summary>
+ /// 鍒犻櫎搴撳瓨
+ /// </summary>
+ /// <param name="materialNo"></param>
+ /// <returns></returns>
+ public async Task DeleteByMaterialAsync(string materialNo)
+ {
+ var wmsmaterialstockList = await _wmsmaterialstockRepository.GetStockListAsync(new WmsMaterialStock { MaterialNo = materialNo });
+ var ids = wmsmaterialstockList.Select(x => x.Id);
+ await DeleteManyAsync(ids);
+ }
+
+
/// <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;
@@ -432,7 +629,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));
@@ -441,9 +638,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>
--
Gitblit v1.9.3