From 252edd99e9094bc8cd1c08be71e6f93e49dfce94 Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周五, 16 5月 2025 11:05:05 +0800 Subject: [PATCH] 2222 --- PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/CallMaterialOrderAppService.cs | 63 +++++++++++++++++++++++-------- 1 files changed, 46 insertions(+), 17 deletions(-) diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/CallMaterialOrderAppService.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/CallMaterialOrderAppService.cs index ed7b19f..440d4f5 100644 --- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/CallMaterialOrderAppService.cs +++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/CallMaterialOrderAppService.cs @@ -18,16 +18,16 @@ /// </summary> public class CallMaterialOrderAppService : CMSPluginAppService, ICallMaterialOrderAppService { - private readonly ICallMaterialOrderRepository callMaterialOrderRepository; + private readonly ICallMaterialOrderRepository _callMaterialOrderRepository; private readonly SharedService _sharedService; private readonly IServiceProvider _serviceProvider; /// <summary> /// Initializes a new instance of the <see cref="CallMaterialOrderAppService"/> class. /// </summary> /// <param name="CallMaterialOrderRepository">The task job repository.</param> - public CallMaterialOrderAppService(ICallMaterialOrderRepository _CallMaterialOrderRepository, SharedService sharedService, IServiceProvider serviceProvider) + public CallMaterialOrderAppService(ICallMaterialOrderRepository callMaterialOrderRepository, SharedService sharedService, IServiceProvider serviceProvider) { - callMaterialOrderRepository = _CallMaterialOrderRepository; + _callMaterialOrderRepository = callMaterialOrderRepository; _sharedService = sharedService; _serviceProvider = serviceProvider; } @@ -39,12 +39,17 @@ /// <returns></returns> public virtual async Task<CallMaterialOrderDto> GetAsync(Guid id) { - return ObjectMapper.Map<CallMaterialOrder, CallMaterialOrderDto>(await callMaterialOrderRepository.GetAsync(id)); + return ObjectMapper.Map<CallMaterialOrder, CallMaterialOrderDto>(await _callMaterialOrderRepository.GetAsync(id)); } public virtual async Task CallMaterialByDataIdentifier(Guid id) { await _sharedService.CallMaterialByDataIdentifier(id, _serviceProvider); + } + + public virtual async Task<CallMaterialOrder> FindByWmsTaskNoAsync(string wmsTaskNo) + { + return await _callMaterialOrderRepository.FindByWmsTaskNoAsync(wmsTaskNo); } /// <summary> @@ -68,8 +73,8 @@ #endregion - var count = await callMaterialOrderRepository.GetCountAsync(whereConditions); - var list = await callMaterialOrderRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount); + var count = await _callMaterialOrderRepository.GetCountAsync(whereConditions); + var list = await _callMaterialOrderRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount); return new PagedResultDto<CallMaterialOrderDto>(count, ObjectMapper.Map<List<CallMaterialOrder>, List<CallMaterialOrderDto>>(list)); } @@ -107,20 +112,20 @@ { await CheckCreateOrUpdateDtoAsync(input); - var exist = await callMaterialOrderRepository.NameExistAsync(input.DataIdentifier); + var exist = await _callMaterialOrderRepository.NameExistAsync(input.DataIdentifier); if (exist) { throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.DataIdentifier]); } - var maxSort = await callMaterialOrderRepository.GetMaxSortAsync(); + var maxSort = await _callMaterialOrderRepository.GetMaxSortAsync(); var sort = input.Sort ?? maxSort; var insertObj = ObjectMapper.Map<CallMaterialOrderCreateDto, CallMaterialOrder>(input); insertObj.Sort = sort; input.MapExtraPropertiesTo(insertObj, MappingPropertyDefinitionChecks.None); - await callMaterialOrderRepository.InsertAsync(insertObj); + await _callMaterialOrderRepository.InsertAsync(insertObj); //if (input.Sort.HasValue && insertObj.Sort != maxSort) //{ @@ -141,8 +146,8 @@ { await CheckCreateOrUpdateDtoAsync(input); - var updateObj = await callMaterialOrderRepository.GetAsync(id); - var exist = await callMaterialOrderRepository.NameExistAsync(input.DataIdentifier, updateObj.Id); + var updateObj = await _callMaterialOrderRepository.GetAsync(id); + var exist = await _callMaterialOrderRepository.NameExistAsync(input.DataIdentifier, updateObj.Id); if (exist) { throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.DataIdentifier]); @@ -160,7 +165,7 @@ updateObj.Remark = input.Remark; - await callMaterialOrderRepository.UpdateAsync(updateObj); + await _callMaterialOrderRepository.UpdateAsync(updateObj); return ObjectMapper.Map<CallMaterialOrder, CallMaterialOrderDto>(updateObj); } @@ -212,7 +217,7 @@ /// <returns></returns> public virtual Task DeleteAsync(Guid id) { - return callMaterialOrderRepository.DeleteAsync(id); + return _callMaterialOrderRepository.DeleteAsync(id); } /// <summary> @@ -236,7 +241,7 @@ /// <returns></returns> public virtual async Task AdjustSortAsync(Guid id, int sort) { - var list = await callMaterialOrderRepository.GetListAsync(null, nameof(CallMaterialOrder.Sort)); + var list = await _callMaterialOrderRepository.GetListAsync(null, nameof(CallMaterialOrder.Sort)); if (list != null && list.Any()) { var initSort = 1; @@ -263,7 +268,7 @@ } } - await callMaterialOrderRepository.UpdateManyAsync(list); + await _callMaterialOrderRepository.UpdateManyAsync(list); } /// <summary> @@ -308,7 +313,7 @@ throw new UserFriendlyException(errorMsg); } - var oldCallMaterialOrder = await callMaterialOrderRepository.FindByNameAsync(impItem.DataIdentifier); + var oldCallMaterialOrder = await _callMaterialOrderRepository.FindByNameAsync(impItem.DataIdentifier); if (oldCallMaterialOrder != null) { var callMaterialOrderUpdateDto = new CallMaterialOrderUpdateDto @@ -395,7 +400,7 @@ #endregion - var list = await callMaterialOrderRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount, includeDetails: true); + var list = await _callMaterialOrderRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount, includeDetails: true); var result = ObjectMapper.Map<List<CallMaterialOrder>, List<CallMaterialOrderDto>>(list); var sheets = new Dictionary<string, object> @@ -421,4 +426,28 @@ return Task.CompletedTask; } + + /// <summary> + /// 鏍规嵁鏉′欢鑾峰彇鍙枡鍗曡〃鍒楄〃 + /// </summary> + /// <param name="whereConditions"></param> + /// <param name="cancellationToken"></param> + /// <returns></returns> + public async Task<List<CallMaterialOrder>> GetListByFilterAsync(Expression<Func<CallMaterialOrder, bool>> whereConditions, CancellationToken cancellationToken = default) + { + return await _callMaterialOrderRepository.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<CallMaterialOrder> GetSingleByFilterAsync(Expression<Func<CallMaterialOrder, bool>> whereConditions, bool is鈥婱ultipleThrowException = false, CancellationToken cancellationToken = default) + { + return await _callMaterialOrderRepository.GetSingleByFilterAsync(whereConditions, is鈥婱ultipleThrowException); + } } -- Gitblit v1.9.3