From 7d410c1f0d4e36f8281ce2277f355c9abf1c231b Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周五, 16 5月 2025 16:19:36 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/CallMaterialOrderAppService.cs | 658 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 338 insertions(+), 320 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 440d4f5..bf336a6 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/CallMaterialOrderAppService.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/CallMaterialOrderAppService.cs
@@ -1,140 +1,129 @@
-using CMS.Plugin.PipeLineLems.Application.Contracts.Dtos.CallMaterialOrder;
-using CMS.Plugin.PipeLineLems.Application.Contracts.Services;
-using CMS.Plugin.PipeLineLems.Domain.Shared;
-using CmsQueryExtensions;
-using CMS.Plugin.PipeLineLems.Domain.CallMaterialOrder;
-using CmsQueryExtensions.Extension;
-using System.Linq.Expressions;
-using Volo.Abp;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Data;
-using Volo.Abp.ObjectExtending;
-using Volo.Abp.ObjectMapping;
-
-namespace CMS.Plugin.PipeLineLems.Application.Implements;
-
+using CMS.Plugin.PipeLineLems.Application.Contracts.Dtos.CallMaterialOrder;
+using CMS.Plugin.PipeLineLems.Application.Contracts.Services;
+using CMS.Plugin.PipeLineLems.Domain.Shared;
+using CmsQueryExtensions;
+using CMS.Plugin.PipeLineLems.Domain.CallMaterialOrder;
+using CmsQueryExtensions.Extension;
+using System.Linq.Expressions;
+using Volo.Abp;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Data;
+using Volo.Abp.ObjectExtending;
+using Volo.Abp.ObjectMapping;
+using CmsQueryExtensions.Entitys;
+
+namespace CMS.Plugin.PipeLineLems.Application.Implements;
+
/// <summary>
/// 鍙枡鍗曡〃搴旂敤鏈嶅姟
/// </summary>
-public class CallMaterialOrderAppService : CMSPluginAppService, ICallMaterialOrderAppService
-{
- private readonly ICallMaterialOrderRepository _callMaterialOrderRepository;
- private readonly SharedService _sharedService;
- private readonly IServiceProvider _serviceProvider;
+public class CallMaterialOrderAppService : CMSPluginAppService, ICallMaterialOrderAppService
+{
+ private readonly ICallMaterialOrderRepository _callMaterialOrderRepository;
+
/// <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)
- {
- _callMaterialOrderRepository = callMaterialOrderRepository;
- _sharedService = sharedService;
- _serviceProvider = serviceProvider;
- }
-
+ public CallMaterialOrderAppService(ICallMaterialOrderRepository callMaterialOrderRepository)
+ {
+ _callMaterialOrderRepository = callMaterialOrderRepository;
+ }
+
/// <summary>
/// 鑾峰彇鎸囧畾鍙枡鍗曡〃
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- public virtual async Task<CallMaterialOrderDto> GetAsync(Guid 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);
- }
-
+ public virtual async Task<CallMaterialOrderDto> GetAsync(Guid id)
+ {
+ return ObjectMapper.Map<CallMaterialOrder, CallMaterialOrderDto>(await _callMaterialOrderRepository.GetAsync(id));
+ }
+
/// <summary>
/// 鍒嗛〉鑾峰彇鍙枡鍗曡〃
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- public virtual async Task<PagedResultDto<CallMaterialOrderDto>> GetListAsync(GetCallMaterialOrderInput input)
- {
- Check.NotNull(input, nameof(input));
-
- if (input.Sorting.IsNullOrWhiteSpace())
- {
- input.Sorting = nameof(CallMaterialOrder.Sort);
- }
-
+ public virtual async Task<PagedResultDto<CallMaterialOrderDto>> GetListAsync(GetCallMaterialOrderInput input)
+ {
+ Check.NotNull(input, nameof(input));
+
+ if (input.Sorting.IsNullOrWhiteSpace())
+ {
+ input.Sorting = nameof(CallMaterialOrder.Sort);
+ }
+
#region 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
-
+
//鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
- var whereConditions = DynamicGetQueryParams(input);
-
- #endregion
-
- 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));
- }
-
+ var whereConditions = DynamicGetQueryParams(input);
+
+ #endregion
+
+ 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));
+ }
+
/// <summary>
/// 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
/// </summary>
/// <param name="input">杈撳叆鍙傛暟</param>
/// <returns></returns>
- private FunReturnResultModel<Expression<Func<CallMaterialOrder, bool>>> DynamicGetQueryParams(GetCallMaterialOrderInput input)
- {
+ private FunReturnResultModel<Expression<Func<CallMaterialOrder, bool>>> DynamicGetQueryParams(GetCallMaterialOrderInput input)
+ {
//鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
- var whereConditions = WhereConditionsExtensions.GetWhereConditions<CallMaterialOrder, GetCallMaterialOrderInput>(input);
- if (!whereConditions.IsSuccess)
- {
- throw new Exception("鍔ㄦ�佹瀯閫犳煡璇㈡潯浠跺け璐�:" + whereConditions.ErrMsg);
- }
-
+ var whereConditions = WhereConditionsExtensions.GetWhereConditions<CallMaterialOrder, GetCallMaterialOrderInput>(input);
+ if (!whereConditions.IsSuccess)
+ {
+ throw new Exception("鍔ㄦ�佹瀯閫犳煡璇㈡潯浠跺け璐�:" + whereConditions.ErrMsg);
+ }
+
//涔熷彲鍐嶆鑷畾涔夋瀯寤烘煡璇㈡潯浠�
- Expression<Func<CallMaterialOrder, bool>> extendExpression = a => a.IsDeleted == false;
+ Expression<Func<CallMaterialOrder, bool>> extendExpression = a => a.IsDeleted == false;
// 浣跨敤 System.Linq.PredicateBuilder 鐨� And
- var pres = (System.Linq.Expressions.Expression<Func<CallMaterialOrder, bool>>)(whereConditions.data);
- whereConditions.data = System.Linq.PredicateBuilder.And(pres, extendExpression);
-
- return whereConditions;
- }
-
+ var pres = (System.Linq.Expressions.Expression<Func<CallMaterialOrder, bool>>)(whereConditions.data);
+ whereConditions.data = System.Linq.PredicateBuilder.And(pres, extendExpression);
+
+ return whereConditions;
+ }
+
/// <summary>
/// 鏂板缓鍙枡鍗曡〃
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
/// <exception cref="UserFriendlyException"></exception>
- public virtual async Task<CallMaterialOrderDto> CreateAsync(CallMaterialOrderCreateDto input)
- {
- await CheckCreateOrUpdateDtoAsync(input);
-
- var exist = await _callMaterialOrderRepository.NameExistAsync(input.DataIdentifier);
- if (exist)
- {
- throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.DataIdentifier]);
- }
-
- 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);
-
+ public virtual async Task<CallMaterialOrderDto> CreateAsync(CallMaterialOrderCreateDto input)
+ {
+ await CheckCreateOrUpdateDtoAsync(input);
+
+ var exist = await _callMaterialOrderRepository.NameExistAsync(input.DataIdentifier);
+ if (exist)
+ {
+ throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.DataIdentifier]);
+ }
+
+ 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);
+
+ insertObj.CreatorName = input.CreatorName;//鍒涘缓浜�
+ await _callMaterialOrderRepository.InsertAsync(insertObj);
+
//if (input.Sort.HasValue && insertObj.Sort != maxSort)
//{
// await AdjustSortAsync(insertObj.Id, insertObj.Sort);
//}
-
- return ObjectMapper.Map<CallMaterialOrder, CallMaterialOrderDto>(insertObj);
- }
-
+
+ return ObjectMapper.Map<CallMaterialOrder, CallMaterialOrderDto>(insertObj);
+ }
+
/// <summary>
/// 鏇存柊鍙枡鍗曡〃
/// </summary>
@@ -142,302 +131,331 @@
/// <param name="input"></param>
/// <returns></returns>
/// <exception cref="UserFriendlyException"></exception>
- public virtual async Task<CallMaterialOrderDto> UpdateAsync(Guid id, CallMaterialOrderUpdateDto input)
- {
- await CheckCreateOrUpdateDtoAsync(input);
-
- 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]);
- }
-
- updateObj.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
- input.MapExtraPropertiesTo(updateObj, MappingPropertyDefinitionChecks.None);
-
- updateObj.DataIdentifier = input.DataIdentifier;
+ public virtual async Task<CallMaterialOrderDto> UpdateAsync(Guid id, CallMaterialOrderUpdateDto input)
+ {
+ await CheckCreateOrUpdateDtoAsync(input);
+
+ 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]);
+ }
+
+ updateObj.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
+ input.MapExtraPropertiesTo(updateObj, MappingPropertyDefinitionChecks.None);
+
+ updateObj.DataIdentifier = input.DataIdentifier;
updateObj.MaterialMode = input.MaterialMode;
+ updateObj.MaterialBatch = input.MaterialBatch;
updateObj.CallMaterialStatus = input.CallMaterialStatus;
updateObj.Quantity = input.Quantity;
updateObj.WmsRetResult = input.WmsRetResult;
updateObj.WmsTaskNo = input.WmsTaskNo;
updateObj.Remark = input.Remark;
-
-
- await _callMaterialOrderRepository.UpdateAsync(updateObj);
-
- return ObjectMapper.Map<CallMaterialOrder, CallMaterialOrderDto>(updateObj);
- }
-
+
+
+ updateObj.LastModifierName = input.LastModifierName;//淇敼浜�
+
+ await _callMaterialOrderRepository.UpdateAsync(updateObj);
+
+ return ObjectMapper.Map<CallMaterialOrder, CallMaterialOrderDto>(updateObj);
+ }
+
/// <summary>
/// 鍏嬮殕鍙枡鍗曡〃
/// </summary>
/// <param name="ids"></param>
/// <returns></returns>
- public async Task<List<CallMaterialOrderDto>> CloneAsync(IEnumerable<Guid> ids)
- {
+ public async Task<List<CallMaterialOrderDto>> CloneAsync(IEnumerable<Guid> ids, MyCurrentUser myCurrentUser)
+ {
//var callMaterialOrders = new List<CallMaterialOrder>();
//if (ids != null)
//{
- // var sort = await callMaterialOrderRepository.GetMaxSortAsync();
+ // var sort = await _callMaterialOrderRepository.GetMaxSortAsync();
// foreach (var id in ids)
// {
- // var CallMaterialOrder = await callMaterialOrderRepository.FindAsync(id);
+ // var CallMaterialOrder = await _callMaterialOrderRepository.FindAsync(id);
// if (CallMaterialOrder != null)
// {
// var name = CallMaterialOrder.Name + CallMaterialOrderConsts.CloneTag;
// var notExist = false;
// while (!notExist)
// {
- // var exist = await callMaterialOrderRepository.NameExistAsync(name);
+ // var exist = await _callMaterialOrderRepository.NameExistAsync(name);
// if (exist || callMaterialOrders.Any(x => x.Name == name))
// {
// name += CallMaterialOrderConsts.CloneTag;
// continue;
// }
-
+
// notExist = true;
// }
-
- // //CallMaterialOrder = await callMaterialOrderRepository.InsertAsync(CallMaterialOrder.Clone(GuidGenerator.Create(), name, sort++));
+
+ // //CallMaterialOrder = await _callMaterialOrderRepository.InsertAsync(CallMaterialOrder.Clone(GuidGenerator.Create(), name, sort++));
// callMaterialOrders.Add(CallMaterialOrder);
// }
// }
//}
-
+
//return ObjectMapper.Map<List<CallMaterialOrder>, List<CallMaterialOrderDto>>(callMaterialOrders);
- return new List<CallMaterialOrderDto>();
- }
-
+ return new List<CallMaterialOrderDto>();
+ }
+
/// <summary>
/// 鍒犻櫎鍗曚釜鍙枡鍗曡〃
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- public virtual Task DeleteAsync(Guid id)
- {
- return _callMaterialOrderRepository.DeleteAsync(id);
- }
-
+ public virtual Task DeleteAsync(Guid id)
+ {
+ return _callMaterialOrderRepository.DeleteAsync(id);
+ }
+
/// <summary>
/// 鍒犻櫎澶氫釜鍙枡鍗曡〃
/// </summary>
/// <param name="ids"></param>
/// <returns></returns>
- public async Task DeleteManyAsync(IEnumerable<Guid> ids)
- {
- foreach (var id in ids)
- {
- await DeleteAsync(id);
- }
- }
-
+ public async Task DeleteManyAsync(IEnumerable<Guid> ids, MyCurrentUser myCurrentUser)
+ {
+ foreach (var id in ids)
+ {
+ await DeleteAsync(id);
+ }
+ }
+
+ /// <summary>
+ /// 鐗╃悊鍒犻櫎鍙枡鍗曡〃
+ /// </summary>
+ /// <param name="id">涓婚敭ID</param>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ public virtual async Task DeletePermanentlyAsync(Guid id, MyCurrentUser myCurrentUser, CancellationToken cancellationToken = default)
+ {
+ _callMaterialOrderRepository.DeletePermanentlyAsync(id);
+ }
+
+ /// <summary>
+ /// 鎵归噺鐗╃悊鍒犻櫎鍙枡鍗曡〃锛堢洿鎺ュ垹闄わ紝涓嶈蒋鍒犻櫎锛�
+ /// </summary>
+ /// <param name="ids">瑕佸垹闄ょ殑涓婚敭ID鍒楄〃</param>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ public virtual async Task BatchDeletePermanentlyAsync(IEnumerable<Guid> ids, MyCurrentUser myCurrentUser, CancellationToken cancellationToken = default)
+ {
+ _callMaterialOrderRepository.BatchDeletePermanentlyAsync(ids);
+ }
+
/// <summary>
/// 璋冩暣鎺掑簭鍙枡鍗曡〃
/// </summary>
/// <param name="id"></param>
/// <param name="sort"></param>
/// <returns></returns>
- public virtual async Task AdjustSortAsync(Guid id, int sort)
- {
- var list = await _callMaterialOrderRepository.GetListAsync(null, nameof(CallMaterialOrder.Sort));
- if (list != null && list.Any())
- {
- var initSort = 1;
- list.ForEach(x => x.AdjustSort(initSort++));
- var entity = list.FirstOrDefault(x => x.Id == id);
- if (entity != null)
- {
- if (sort == 1)
- {
- list.Where(x => x.Id != id).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
- }
- else if (entity.Sort > sort)
- {
- list.Where(x => x.Id != id && x.Sort >= sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
- list.Where(x => x.Id != id && x.Sort < sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort - 1));
- }
- else if (entity.Sort < sort)
- {
- list.Where(x => x.Id != id && x.Sort > sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
- list.Where(x => x.Id != id && x.Sort <= sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort - 1));
- }
-
- entity.AdjustSort(sort);
- }
- }
-
- await _callMaterialOrderRepository.UpdateManyAsync(list);
- }
-
+ public virtual async Task AdjustSortAsync(Guid id, int sort)
+ {
+ var list = await _callMaterialOrderRepository.GetListAsync(null, nameof(CallMaterialOrder.Sort));
+ if (list != null && list.Any())
+ {
+ var initSort = 1;
+ list.ForEach(x => x.AdjustSort(initSort++));
+ var entity = list.FirstOrDefault(x => x.Id == id);
+ if (entity != null)
+ {
+ if (sort == 1)
+ {
+ list.Where(x => x.Id != id).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
+ }
+ else if (entity.Sort > sort)
+ {
+ list.Where(x => x.Id != id && x.Sort >= sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
+ list.Where(x => x.Id != id && x.Sort < sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort - 1));
+ }
+ else if (entity.Sort < sort)
+ {
+ list.Where(x => x.Id != id && x.Sort > sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
+ list.Where(x => x.Id != id && x.Sort <= sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort - 1));
+ }
+
+ entity.AdjustSort(sort);
+ }
+ }
+
+ await _callMaterialOrderRepository.UpdateManyAsync(list);
+ }
+
/// <summary>
/// 瀵煎叆鍙枡鍗曡〃
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
/// <exception cref="UserFriendlyException"></exception>
- public async Task ImportAsync(CallMaterialOrdersImportModel input)
- {
- Check.NotNull(input, nameof(input));
-
- var callMaterialOrderCreateDtos = new List<(int RowIndex, CallMaterialOrderCreateDto Item)>();
- var callMaterialOrderUpdateDtos = new List<(int RowIndex, Guid Id, CallMaterialOrderUpdateDto Item)>();
- var importItems = input.CallMaterialOrders;
-
- if (importItems != null && importItems.Any())
- {
+ public async Task ImportAsync(CallMaterialOrdersImportModel input, MyCurrentUser myCurrentUser)
+ {
+ Check.NotNull(input, nameof(input));
+
+ var callMaterialOrderCreateDtos = new List<(int RowIndex, CallMaterialOrderCreateDto Item)>();
+ var callMaterialOrderUpdateDtos = new List<(int RowIndex, Guid Id, CallMaterialOrderUpdateDto Item)>();
+ var importItems = input.CallMaterialOrders;
+
+ if (importItems != null && importItems.Any())
+ {
#region 瀵煎叆鏍￠獙
-
+
// 鍒ゆ柇鍚嶇О鏄惁閲嶅锛屽苟杈撳嚭绗嚑琛岄噸澶�
- var duplicateCallMaterialOrders = importItems.GroupBy(x => x.DataIdentifier).Where(x => x.Count() > 1).ToList();
- if (duplicateCallMaterialOrders?.Any() == true)
- {
- var duplicateCallMaterialOrderMsgs = duplicateCallMaterialOrders.Select(x => $"绗� {string.Join(",", x.Select(x => x.RowIndex))} 琛岋細{x.Key} 鍚嶇О閲嶅");
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝 {string.Join(",", duplicateCallMaterialOrderMsgs)}锛岀粓姝㈠鍏�";
- throw new UserFriendlyException(errorMsg);
- }
-
- #endregion
-
- foreach (var impItem in importItems)
- {
- if (impItem.DataIdentifier.IsNullOrWhiteSpace())
- {
- continue;
- }
-
- if (impItem.DataIdentifier.IsNullOrWhiteSpace())
- {
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊impItem.RowIndex}琛岋細CallMaterialOrder鍚嶇О涓嶈兘涓虹┖";
- throw new UserFriendlyException(errorMsg);
- }
-
- var oldCallMaterialOrder = await _callMaterialOrderRepository.FindByNameAsync(impItem.DataIdentifier);
- if (oldCallMaterialOrder != null)
- {
- var callMaterialOrderUpdateDto = new CallMaterialOrderUpdateDto
- {
+ var duplicateCallMaterialOrders = importItems.GroupBy(x => x.DataIdentifier).Where(x => x.Count() > 1).ToList();
+ if (duplicateCallMaterialOrders?.Any() == true)
+ {
+ var duplicateCallMaterialOrderMsgs = duplicateCallMaterialOrders.Select(x => $"绗� {string.Join(",", x.Select(x => x.RowIndex))} 琛岋細{x.Key} 鍚嶇О閲嶅");
+ var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝 {string.Join(",", duplicateCallMaterialOrderMsgs)}锛岀粓姝㈠鍏�";
+ throw new UserFriendlyException(errorMsg);
+ }
+
+ #endregion
+
+ foreach (var impItem in importItems)
+ {
+ if (impItem.DataIdentifier.IsNullOrWhiteSpace())
+ {
+ continue;
+ }
+
+ if (impItem.DataIdentifier.IsNullOrWhiteSpace())
+ {
+ var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊impItem.RowIndex}琛岋細CallMaterialOrder鍚嶇О涓嶈兘涓虹┖";
+ throw new UserFriendlyException(errorMsg);
+ }
+
+ var oldCallMaterialOrder = await _callMaterialOrderRepository.FindByNameAsync(impItem.DataIdentifier);
+ if (oldCallMaterialOrder != null)
+ {
+ var callMaterialOrderUpdateDto = new CallMaterialOrderUpdateDto
+ {
DataIdentifier = impItem.DataIdentifier,
- MaterialMode = impItem.MaterialMode,
- CallMaterialStatus = impItem.CallMaterialStatus,
- Quantity = impItem.Quantity,
- WmsRetResult = impItem.WmsRetResult,
- WmsTaskNo = impItem.WmsTaskNo,
- Remark = impItem.Remark,
-
- };
-
- callMaterialOrderUpdateDtos.Add((impItem.RowIndex, oldCallMaterialOrder.Id, callMaterialOrderUpdateDto));
- }
- else
- {
- var callMaterialOrderCreateDto = new CallMaterialOrderCreateDto
- {
+MaterialMode = impItem.MaterialMode,
+MaterialBatch = impItem.MaterialBatch,
+CallMaterialStatus = impItem.CallMaterialStatus,
+Quantity = impItem.Quantity,
+WmsRetResult = impItem.WmsRetResult,
+WmsTaskNo = impItem.WmsTaskNo,
+Remark = impItem.Remark,
+
+ };
+
+ callMaterialOrderUpdateDtos.Add((impItem.RowIndex, oldCallMaterialOrder.Id, callMaterialOrderUpdateDto));
+ }
+ else
+ {
+ var callMaterialOrderCreateDto = new CallMaterialOrderCreateDto
+ {
DataIdentifier = impItem.DataIdentifier,
- MaterialMode = impItem.MaterialMode,
- CallMaterialStatus = impItem.CallMaterialStatus,
- Quantity = impItem.Quantity,
- WmsRetResult = impItem.WmsRetResult,
- WmsTaskNo = impItem.WmsTaskNo,
- Remark = impItem.Remark,
-
- };
-
- callMaterialOrderCreateDtos.Add((impItem.RowIndex, callMaterialOrderCreateDto));
- }
- }
- }
-
+MaterialMode = impItem.MaterialMode,
+MaterialBatch = impItem.MaterialBatch,
+CallMaterialStatus = impItem.CallMaterialStatus,
+Quantity = impItem.Quantity,
+WmsRetResult = impItem.WmsRetResult,
+WmsTaskNo = impItem.WmsTaskNo,
+Remark = impItem.Remark,
+
+ };
+
+ callMaterialOrderCreateDtos.Add((impItem.RowIndex, callMaterialOrderCreateDto));
+ }
+ }
+ }
+
// 鏂板
- foreach (var callMaterialOrderDto in callMaterialOrderCreateDtos)
- {
- try
- {
- await CreateAsync(callMaterialOrderDto.Item);
- }
- catch (Exception e)
- {
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊callMaterialOrderDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
- throw new UserFriendlyException(errorMsg);
- }
- }
-
+ foreach (var callMaterialOrderDto in callMaterialOrderCreateDtos)
+ {
+ try
+ {
+ callMaterialOrderDto.Item.CreatorName = myCurrentUser.UserAccount;//鍒涘缓浜�
+ await CreateAsync(callMaterialOrderDto.Item);
+ }
+ catch (Exception e)
+ {
+ var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊callMaterialOrderDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
+ throw new UserFriendlyException(errorMsg);
+ }
+ }
+
// 鏇存柊
- foreach (var callMaterialOrderDto in callMaterialOrderUpdateDtos)
- {
- try
- {
- await UpdateAsync(callMaterialOrderDto.Id, callMaterialOrderDto.Item);
- }
- catch (Exception e)
- {
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊callMaterialOrderDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
- throw new UserFriendlyException(errorMsg);
- }
- }
- }
-
+ foreach (var callMaterialOrderDto in callMaterialOrderUpdateDtos)
+ {
+ try
+ {
+ callMaterialOrderDto.Item.LastModifierName = myCurrentUser.UserAccount;//淇敼浜�
+ await UpdateAsync(callMaterialOrderDto.Id, callMaterialOrderDto.Item);
+ }
+ catch (Exception e)
+ {
+ var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊callMaterialOrderDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
+ throw new UserFriendlyException(errorMsg);
+ }
+ }
+ }
+
/// <summary>
/// 瀵煎嚭鍙枡鍗曡〃
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetCallMaterialOrderInput input)
- {
- Check.NotNull(input, nameof(input));
-
- if (input.Sorting.IsNullOrWhiteSpace())
- {
- input.Sorting = nameof(CallMaterialOrder.Sort);
- }
-
+ public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetCallMaterialOrderInput input)
+ {
+ Check.NotNull(input, nameof(input));
+
+ if (input.Sorting.IsNullOrWhiteSpace())
+ {
+ input.Sorting = nameof(CallMaterialOrder.Sort);
+ }
+
#region 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
-
+
//鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
- var whereConditions = DynamicGetQueryParams(input);
-
- #endregion
-
-
- 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>
- {
- ["閰嶇疆"] = ExportHelper.ConvertListToExportData(result),
- };
-
- var fileName = "鍙枡鍗�";
- return (sheets, fileName);
- }
-
+ var whereConditions = DynamicGetQueryParams(input);
+
+ #endregion
+
+
+ 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>
+ {
+ ["閰嶇疆"] = ExportHelper.ConvertListToExportData(result),
+ };
+
+ var fileName = "鍙枡鍗�";
+ return (sheets, fileName);
+ }
+
/// <summary>
/// 鏍￠獙鍙枡鍗曡〃锛屽綋鏂板缓鎴栨洿鏂版椂
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- protected Task CheckCreateOrUpdateDtoAsync(CallMaterialOrderCreateOrUpdateDtoBase input)
- {
- Check.NotNull(input, nameof(input));
- Check.NotNullOrWhiteSpace(input.DataIdentifier, "鍘熸枡鏍囪瘑", 256);
+ protected Task CheckCreateOrUpdateDtoAsync(CallMaterialOrderCreateOrUpdateDtoBase input)
+ {
+ Check.NotNull(input, nameof(input));
+ Check.NotNullOrWhiteSpace(input.DataIdentifier, "鍘熸枡鏍囪瘑", 256);
Check.NotNull(input.CallMaterialStatus, "鍙枡鐘舵��");
Check.NotNull(input.Quantity, "鍙枡鏁伴噺");
-
- return Task.CompletedTask;
- }
-
- /// <summary>
+
+ 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);
- }
-
+ public async Task<List<CallMaterialOrder>> GetListByFilterAsync(Expression<Func<CallMaterialOrder, bool>> whereConditions, CancellationToken cancellationToken = default)
+ {
+ return await _callMaterialOrderRepository.GetListByFilterAsync(whereConditions);
+ }
+
/// <summary>
/// 鏍规嵁鏉′欢鑾峰彇鍗曚釜鍙枡鍗曡〃
/// </summary>
@@ -446,8 +464,8 @@
/// <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);
- }
-}
+ 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