From 5a149d626ae8bc3fa4bddbb53f8caf40f51f6da6 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 04 6月 2025 17:42:13 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkTaskAppService.cs | 789 +++++++++++++++++++++++--------------------------------
1 files changed, 334 insertions(+), 455 deletions(-)
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkTaskAppService.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkTaskAppService.cs
index 934ce7c..e85aacb 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkTaskAppService.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkTaskAppService.cs
@@ -1,129 +1,128 @@
-using CMS.Plugin.PipeLineLems.Application.Contracts.Dtos.WorkTask;
-using CMS.Plugin.PipeLineLems.Application.Contracts.Services;
-using CMS.Plugin.PipeLineLems.Domain.Shared;
-using CmsQueryExtensions;
-using CMS.Plugin.PipeLineLems.Domain.WorkTask;
-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;
-
+using CMS.Plugin.PipeLineLems.Application.Contracts.Dtos.WorkTask;
+using CMS.Plugin.PipeLineLems.Application.Contracts.Services;
+using CMS.Plugin.PipeLineLems.Domain.Shared;
+using CMS.Plugin.PipeLineLems.Domain.WorkTask;
+using CmsQueryExtensions;
+using CmsQueryExtensions.Entitys;
+using CmsQueryExtensions.Extension;
+using System.Linq.Expressions;
+using Volo.Abp;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Data;
+using Volo.Abp.ObjectExtending;
+
+namespace CMS.Plugin.PipeLineLems.Application.Implements;
+
/// <summary>
/// 浣滀笟浠诲姟琛ㄥ簲鐢ㄦ湇鍔�
/// </summary>
-public class WorkTaskAppService : CMSPluginAppService, IWorkTaskAppService
-{
- private readonly IWorkTaskRepository _workTaskRepository;
-
+public class WorkTaskAppService : CMSPluginAppService, IWorkTaskAppService
+{
+ private readonly IWorkTaskRepository _workTaskRepository;
+
/// <summary>
/// Initializes a new instance of the <see cref="WorkTaskAppService"/> class.
/// </summary>
/// <param name="WorkTaskRepository">The task job repository.</param>
- public WorkTaskAppService(IWorkTaskRepository workTaskRepository)
- {
- _workTaskRepository = workTaskRepository;
- }
-
+ public WorkTaskAppService(IWorkTaskRepository workTaskRepository)
+ {
+ _workTaskRepository = workTaskRepository;
+ }
+
/// <summary>
/// 鑾峰彇鎸囧畾浣滀笟浠诲姟琛�
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- public virtual async Task<WorkTaskDto> GetAsync(Guid id)
- {
- return ObjectMapper.Map<WorkTask, WorkTaskDto>(await _workTaskRepository.GetAsync(id));
- }
-
+ public virtual async Task<WorkTaskDto> GetAsync(Guid id)
+ {
+ return ObjectMapper.Map<WorkTask, WorkTaskDto>(await _workTaskRepository.GetAsync(id));
+ }
+
/// <summary>
/// 鍒嗛〉鑾峰彇浣滀笟浠诲姟琛�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- public virtual async Task<PagedResultDto<WorkTaskDto>> GetListAsync(GetWorkTaskInput input)
- {
- Check.NotNull(input, nameof(input));
-
- if (input.Sorting.IsNullOrWhiteSpace())
- {
- input.Sorting = nameof(WorkTask.Sort);
- }
-
+ public virtual async Task<PagedResultDto<WorkTaskDto>> GetListAsync(GetWorkTaskInput input)
+ {
+ Check.NotNull(input, nameof(input));
+
+ if (input.Sorting.IsNullOrWhiteSpace())
+ {
+ input.Sorting = nameof(WorkTask.Sort);
+ }
+
#region 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
-
+
//鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
- var whereConditions = DynamicGetQueryParams(input);
-
- #endregion
-
- var count = await _workTaskRepository.GetCountAsync(whereConditions);
- var list = await _workTaskRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount);
-
- return new PagedResultDto<WorkTaskDto>(count, ObjectMapper.Map<List<WorkTask>, List<WorkTaskDto>>(list));
- }
-
+ var whereConditions = DynamicGetQueryParams(input);
+
+ #endregion
+
+ var count = await _workTaskRepository.GetCountAsync(whereConditions);
+ var list = await _workTaskRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount);
+
+ return new PagedResultDto<WorkTaskDto>(count, ObjectMapper.Map<List<WorkTask>, List<WorkTaskDto>>(list));
+ }
+
/// <summary>
/// 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
/// </summary>
/// <param name="input">杈撳叆鍙傛暟</param>
/// <returns></returns>
- private FunReturnResultModel<Expression<Func<WorkTask, bool>>> DynamicGetQueryParams(GetWorkTaskInput input)
- {
+ private FunReturnResultModel<Expression<Func<WorkTask, bool>>> DynamicGetQueryParams(GetWorkTaskInput input)
+ {
//鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
- var whereConditions = WhereConditionsExtensions.GetWhereConditions<WorkTask, GetWorkTaskInput>(input);
- if (!whereConditions.IsSuccess)
- {
- throw new Exception("鍔ㄦ�佹瀯閫犳煡璇㈡潯浠跺け璐�:" + whereConditions.ErrMsg);
- }
-
+ var whereConditions = WhereConditionsExtensions.GetWhereConditions<WorkTask, GetWorkTaskInput>(input);
+ if (!whereConditions.IsSuccess)
+ {
+ throw new Exception("鍔ㄦ�佹瀯閫犳煡璇㈡潯浠跺け璐�:" + whereConditions.ErrMsg);
+ }
+
//涔熷彲鍐嶆鑷畾涔夋瀯寤烘煡璇㈡潯浠�
- Expression<Func<WorkTask, bool>> extendExpression = a => a.IsDeleted == false;
+ Expression<Func<WorkTask, bool>> extendExpression = a => a.IsDeleted == false;
// 浣跨敤 System.Linq.PredicateBuilder 鐨� And
- var pres = (System.Linq.Expressions.Expression<Func<WorkTask, bool>>)(whereConditions.data);
- whereConditions.data = System.Linq.PredicateBuilder.And(pres, extendExpression);
-
- return whereConditions;
- }
-
+ var pres = (System.Linq.Expressions.Expression<Func<WorkTask, 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<WorkTaskDto> CreateAsync(WorkTaskCreateDto input)
- {
- await CheckCreateOrUpdateDtoAsync(input);
-
- var exist = await _workTaskRepository.NameExistAsync(input.Son_TaskCode);
- if (exist)
- {
- throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.Son_TaskCode]);
- }
-
- var maxSort = await _workTaskRepository.GetMaxSortAsync();
- var sort = input.Sort ?? maxSort;
-
- var insertObj = ObjectMapper.Map<WorkTaskCreateDto, WorkTask>(input);
- insertObj.Sort = sort;
- input.MapExtraPropertiesTo(insertObj, MappingPropertyDefinitionChecks.None);
-
+ public virtual async Task<WorkTaskDto> CreateAsync(WorkTaskCreateDto input)
+ {
+ await CheckCreateOrUpdateDtoAsync(input);
+
+ var exist = await _workTaskRepository.NameExistAsync(input.Son_TaskCode);
+ if (exist)
+ {
+ throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.Son_TaskCode]);
+ }
+
+ var maxSort = await _workTaskRepository.GetMaxSortAsync();
+ var sort = input.Sort ?? maxSort;
+
+ var insertObj = ObjectMapper.Map<WorkTaskCreateDto, WorkTask>(input);
+ insertObj.Sort = sort;
+ input.MapExtraPropertiesTo(insertObj, MappingPropertyDefinitionChecks.None);
+
insertObj.CreatorName = input.CreatorName;//鍒涘缓浜�
- await _workTaskRepository.InsertAsync(insertObj);
-
+ await _workTaskRepository.InsertAsync(insertObj);
+
//if (input.Sort.HasValue && insertObj.Sort != maxSort)
//{
// await AdjustSortAsync(insertObj.Id, insertObj.Sort);
//}
-
- return ObjectMapper.Map<WorkTask, WorkTaskDto>(insertObj);
- }
-
+
+ return ObjectMapper.Map<WorkTask, WorkTaskDto>(insertObj);
+ }
+
/// <summary>
/// 鏇存柊浣滀笟浠诲姟琛�
/// </summary>
@@ -131,74 +130,37 @@
/// <param name="input"></param>
/// <returns></returns>
/// <exception cref="UserFriendlyException"></exception>
- public virtual async Task<WorkTaskDto> UpdateAsync(Guid id, WorkTaskUpdateDto input)
- {
- await CheckCreateOrUpdateDtoAsync(input);
-
- var updateObj = await _workTaskRepository.GetAsync(id);
- var exist = await _workTaskRepository.NameExistAsync(input.Son_TaskCode, updateObj.Id);
- if (exist)
- {
- throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.Son_TaskCode]);
- }
-
- updateObj.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
- input.MapExtraPropertiesTo(updateObj, MappingPropertyDefinitionChecks.None);
-
- updateObj.Son_TaskCode = input.Son_TaskCode;
- updateObj.TaskCode = input.TaskCode;
- updateObj.WorkPlanStatus = input.WorkPlanStatus;
- updateObj.CallMaterialStatus = input.CallMaterialStatus;
- updateObj.DataIdentifier = input.DataIdentifier;
- updateObj.MaterialMode = input.MaterialMode;
- updateObj.Length = input.Length;
- updateObj.MarkingContent = input.MarkingContent;
- updateObj.MarkingPosition = input.MarkingPosition;
- updateObj.CuttingPosition = input.CuttingPosition;
- updateObj.Quantity = input.Quantity;
- updateObj.FlangeThickness = input.FlangeThickness;
- updateObj.FlangeInnerDiameter = input.FlangeInnerDiameter;
- updateObj.WeldingHeatInput = input.WeldingHeatInput;
- updateObj.PipeAllowableStress = input.PipeAllowableStress;
- updateObj.PipeDiameter = input.PipeDiameter;
- updateObj.PipeWallThickness = input.PipeWallThickness;
- updateObj.FactoryCode = input.FactoryCode;
- updateObj.ProductCode = input.ProductCode;
- updateObj.WorkstationCode = input.WorkstationCode;
- updateObj.EquipmentCode = input.EquipmentCode;
- updateObj.ProdLineCode = input.ProdLineCode;
- updateObj.ShipNumber = input.ShipNumber;
- updateObj.ProjectNumber = input.ProjectNumber;
- updateObj.ProcessName = input.ProcessName;
- updateObj.PipeFittingCode = input.PipeFittingCode;
- updateObj.PreSerialNumber = input.PreSerialNumber;
- updateObj.PipeSpecCode = input.PipeSpecCode;
- updateObj.PipeSectionName = input.PipeSectionName;
- updateObj.OuterDiameter = input.OuterDiameter;
- updateObj.Thickness = input.Thickness;
- updateObj.Material = input.Material;
- updateObj.ProcessRouteNumber = input.ProcessRouteNumber;
- updateObj.PlannedStartTime = input.PlannedStartTime;
- updateObj.PlannedEndTime = input.PlannedEndTime;
- updateObj.TeamInfo = input.TeamInfo;
- updateObj.Timestamp = input.Timestamp;
- updateObj.Remark = input.Remark;
-
-
+ public virtual async Task<WorkTaskDto> UpdateAsync(Guid id, WorkTaskUpdateDto input)
+ {
+ await CheckCreateOrUpdateDtoAsync(input);
+
+ var updateObj = await _workTaskRepository.GetAsync(id);
+ var exist = await _workTaskRepository.NameExistAsync(input.Son_TaskCode, updateObj.Id);
+ if (exist)
+ {
+ throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.Son_TaskCode]);
+ }
+
+ updateObj.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
+ input.MapExtraPropertiesTo(updateObj, MappingPropertyDefinitionChecks.None);
+
+ // 鎵归噺璧嬪�兼墍鏈夊彲鏄犲皠瀛楁锛堥�氳繃鍖垮悕瀵硅薄锛�
+ updateObj = ObjectMapper.Map(input, updateObj); // 绛夋晥浜庢墜鍔ㄨ祴鍊兼墍鏈夊尮閰嶅瓧娈�
+
updateObj.LastModifierName = input.LastModifierName;//淇敼浜�
-
- await _workTaskRepository.UpdateAsync(updateObj);
-
- return ObjectMapper.Map<WorkTask, WorkTaskDto>(updateObj);
- }
-
+
+ await _workTaskRepository.UpdateAsync(updateObj);
+
+ return ObjectMapper.Map<WorkTask, WorkTaskDto>(updateObj);
+ }
+
/// <summary>
/// 鍏嬮殕浣滀笟浠诲姟琛�
/// </summary>
/// <param name="ids"></param>
/// <returns></returns>
- public async Task<List<WorkTaskDto>> CloneAsync(IEnumerable<Guid> ids, MyCurrentUser myCurrentUser)
- {
+ public async Task<List<WorkTaskDto>> CloneAsync(IEnumerable<Guid> ids, MyCurrentUser myCurrentUser)
+ {
//var workTasks = new List<WorkTask>();
//if (ids != null)
//{
@@ -218,317 +180,234 @@
// name += WorkTaskConsts.CloneTag;
// continue;
// }
-
+
// notExist = true;
// }
-
+
// //WorkTask = await _workTaskRepository.InsertAsync(WorkTask.Clone(GuidGenerator.Create(), name, sort++));
// workTasks.Add(WorkTask);
// }
// }
//}
-
+
//return ObjectMapper.Map<List<WorkTask>, List<WorkTaskDto>>(workTasks);
- return new List<WorkTaskDto>();
- }
-
+ return new List<WorkTaskDto>();
+ }
+
/// <summary>
/// 鍒犻櫎鍗曚釜浣滀笟浠诲姟琛�
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- public virtual Task DeleteAsync(Guid id)
- {
- return _workTaskRepository.DeleteAsync(id);
- }
-
+ public virtual Task DeleteAsync(Guid id)
+ {
+ return _workTaskRepository.DeleteAsync(id);
+ }
+
/// <summary>
/// 鍒犻櫎澶氫釜浣滀笟浠诲姟琛�
/// </summary>
/// <param name="ids"></param>
/// <returns></returns>
- public async Task DeleteManyAsync(IEnumerable<Guid> ids, MyCurrentUser myCurrentUser)
- {
- foreach (var id in ids)
- {
- await DeleteAsync(id);
- }
- }
-
- /// <summary>
+ 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)
- {
- _workTaskRepository.DeletePermanentlyAsync(id);
- }
-
+ public virtual async Task DeletePermanentlyAsync(Guid id, MyCurrentUser myCurrentUser, CancellationToken cancellationToken = default)
+ {
+ _workTaskRepository.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)
- {
- _workTaskRepository.BatchDeletePermanentlyAsync(ids);
- }
-
+ public virtual async Task BatchDeletePermanentlyAsync(IEnumerable<Guid> ids, MyCurrentUser myCurrentUser, CancellationToken cancellationToken = default)
+ {
+ _workTaskRepository.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 _workTaskRepository.GetListAsync(null, nameof(WorkTask.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 _workTaskRepository.UpdateManyAsync(list);
- }
-
+ public virtual async Task AdjustSortAsync(Guid id, int sort)
+ {
+ var list = await _workTaskRepository.GetListAsync(null, nameof(WorkTask.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 _workTaskRepository.UpdateManyAsync(list);
+ }
+
/// <summary>
/// 瀵煎叆浣滀笟浠诲姟琛�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
/// <exception cref="UserFriendlyException"></exception>
- public async Task ImportAsync(WorkTasksImportModel input, MyCurrentUser myCurrentUser)
- {
- Check.NotNull(input, nameof(input));
-
- var workTaskCreateDtos = new List<(int RowIndex, WorkTaskCreateDto Item)>();
- var workTaskUpdateDtos = new List<(int RowIndex, Guid Id, WorkTaskUpdateDto Item)>();
- var importItems = input.WorkTasks;
-
- if (importItems != null && importItems.Any())
- {
+ public async Task ImportAsync(WorkTasksImportModel input, MyCurrentUser myCurrentUser)
+ {
+ Check.NotNull(input, nameof(input));
+
+ var workTaskCreateDtos = new List<(int RowIndex, WorkTaskCreateDto Item)>();
+ var workTaskUpdateDtos = new List<(int RowIndex, Guid Id, WorkTask Item)>();
+ var importItems = input.WorkTasks;
+
+ if (importItems != null && importItems.Any())
+ {
#region 瀵煎叆鏍￠獙
-
+
// 鍒ゆ柇鍚嶇О鏄惁閲嶅锛屽苟杈撳嚭绗嚑琛岄噸澶�
- var duplicateWorkTasks = importItems.GroupBy(x => x.Son_TaskCode).Where(x => x.Count() > 1).ToList();
- if (duplicateWorkTasks?.Any() == true)
- {
- var duplicateWorkTaskMsgs = duplicateWorkTasks.Select(x => $"绗� {string.Join(",", x.Select(x => x.RowIndex))} 琛岋細{x.Key} 鍚嶇О閲嶅");
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝 {string.Join(",", duplicateWorkTaskMsgs)}锛岀粓姝㈠鍏�";
- throw new UserFriendlyException(errorMsg);
- }
-
- #endregion
-
- foreach (var impItem in importItems)
- {
- if (impItem.Son_TaskCode.IsNullOrWhiteSpace())
- {
- continue;
- }
-
- if (impItem.Son_TaskCode.IsNullOrWhiteSpace())
- {
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊impItem.RowIndex}琛岋細WorkTask鍚嶇О涓嶈兘涓虹┖";
- throw new UserFriendlyException(errorMsg);
- }
-
- var oldWorkTask = await _workTaskRepository.FindByNameAsync(impItem.Son_TaskCode);
- if (oldWorkTask != null)
- {
- var workTaskUpdateDto = new WorkTaskUpdateDto
- {
- Son_TaskCode = impItem.Son_TaskCode,
- TaskCode = impItem.TaskCode,
- WorkPlanStatus = impItem.WorkPlanStatus,
- CallMaterialStatus = impItem.CallMaterialStatus,
- DataIdentifier = impItem.DataIdentifier,
- MaterialMode = impItem.MaterialMode,
- Length = impItem.Length,
- MarkingContent = impItem.MarkingContent,
- MarkingPosition = impItem.MarkingPosition,
- CuttingPosition = impItem.CuttingPosition,
- Quantity = impItem.Quantity,
- FlangeThickness = impItem.FlangeThickness,
- FlangeInnerDiameter = impItem.FlangeInnerDiameter,
- WeldingHeatInput = impItem.WeldingHeatInput,
- PipeAllowableStress = impItem.PipeAllowableStress,
- PipeDiameter = impItem.PipeDiameter,
- PipeWallThickness = impItem.PipeWallThickness,
- FactoryCode = impItem.FactoryCode,
- ProductCode = impItem.ProductCode,
- WorkstationCode = impItem.WorkstationCode,
- EquipmentCode = impItem.EquipmentCode,
- ProdLineCode = impItem.ProdLineCode,
- ShipNumber = impItem.ShipNumber,
- ProjectNumber = impItem.ProjectNumber,
- ProcessName = impItem.ProcessName,
- PipeFittingCode = impItem.PipeFittingCode,
- PreSerialNumber = impItem.PreSerialNumber,
- PipeSpecCode = impItem.PipeSpecCode,
- PipeSectionName = impItem.PipeSectionName,
- OuterDiameter = impItem.OuterDiameter,
- Thickness = impItem.Thickness,
- Material = impItem.Material,
- ProcessRouteNumber = impItem.ProcessRouteNumber,
- PlannedStartTime = impItem.PlannedStartTime,
- PlannedEndTime = impItem.PlannedEndTime,
- TeamInfo = impItem.TeamInfo,
- Timestamp = impItem.Timestamp,
- Remark = impItem.Remark,
-
- };
-
- workTaskUpdateDtos.Add((impItem.RowIndex, oldWorkTask.Id, workTaskUpdateDto));
- }
- else
- {
- var workTaskCreateDto = new WorkTaskCreateDto
- {
- Son_TaskCode = impItem.Son_TaskCode,
- TaskCode = impItem.TaskCode,
- WorkPlanStatus = impItem.WorkPlanStatus,
- CallMaterialStatus = impItem.CallMaterialStatus,
- DataIdentifier = impItem.DataIdentifier,
- MaterialMode = impItem.MaterialMode,
- Length = impItem.Length,
- MarkingContent = impItem.MarkingContent,
- MarkingPosition = impItem.MarkingPosition,
- CuttingPosition = impItem.CuttingPosition,
- Quantity = impItem.Quantity,
- FlangeThickness = impItem.FlangeThickness,
- FlangeInnerDiameter = impItem.FlangeInnerDiameter,
- WeldingHeatInput = impItem.WeldingHeatInput,
- PipeAllowableStress = impItem.PipeAllowableStress,
- PipeDiameter = impItem.PipeDiameter,
- PipeWallThickness = impItem.PipeWallThickness,
- FactoryCode = impItem.FactoryCode,
- ProductCode = impItem.ProductCode,
- WorkstationCode = impItem.WorkstationCode,
- EquipmentCode = impItem.EquipmentCode,
- ProdLineCode = impItem.ProdLineCode,
- ShipNumber = impItem.ShipNumber,
- ProjectNumber = impItem.ProjectNumber,
- ProcessName = impItem.ProcessName,
- PipeFittingCode = impItem.PipeFittingCode,
- PreSerialNumber = impItem.PreSerialNumber,
- PipeSpecCode = impItem.PipeSpecCode,
- PipeSectionName = impItem.PipeSectionName,
- OuterDiameter = impItem.OuterDiameter,
- Thickness = impItem.Thickness,
- Material = impItem.Material,
- ProcessRouteNumber = impItem.ProcessRouteNumber,
- PlannedStartTime = impItem.PlannedStartTime,
- PlannedEndTime = impItem.PlannedEndTime,
- TeamInfo = impItem.TeamInfo,
- Timestamp = impItem.Timestamp,
- Remark = impItem.Remark,
-
- };
-
- workTaskCreateDtos.Add((impItem.RowIndex, workTaskCreateDto));
- }
- }
- }
-
+ var duplicateWorkTasks = importItems.GroupBy(x => x.Son_TaskCode).Where(x => x.Count() > 1).ToList();
+ if (duplicateWorkTasks?.Any() == true)
+ {
+ var duplicateWorkTaskMsgs = duplicateWorkTasks.Select(x => $"绗� {string.Join(",", x.Select(x => x.RowIndex))} 琛岋細{x.Key} 鍚嶇О閲嶅");
+ var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝 {string.Join(",", duplicateWorkTaskMsgs)}锛岀粓姝㈠鍏�";
+ throw new UserFriendlyException(errorMsg);
+ }
+
+ #endregion
+
+ foreach (var impItem in importItems)
+ {
+ if (impItem.Son_TaskCode.IsNullOrWhiteSpace())
+ {
+ continue;
+ }
+
+ if (impItem.Son_TaskCode.IsNullOrWhiteSpace())
+ {
+ var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊impItem.RowIndex}琛岋細WorkTask鍚嶇О涓嶈兘涓虹┖";
+ throw new UserFriendlyException(errorMsg);
+ }
+
+ var oldWorkTask = await _workTaskRepository.FindByNameAsync(impItem.Son_TaskCode);
+ if (oldWorkTask != null)
+ {
+ oldWorkTask = ObjectMapper.Map(impItem, oldWorkTask); // 绛夋晥浜庢墜鍔ㄨ祴鍊兼墍鏈夊尮閰嶅瓧娈�
+ workTaskUpdateDtos.Add((impItem.RowIndex, oldWorkTask.Id, oldWorkTask));
+ }
+ else
+ {
+ var workTaskCreateDto = new WorkTaskCreateDto { };
+ workTaskCreateDto = ObjectMapper.Map(impItem, workTaskCreateDto); // 绛夋晥浜庢墜鍔ㄨ祴鍊兼墍鏈夊尮閰嶅瓧娈�
+ workTaskCreateDtos.Add((impItem.RowIndex, workTaskCreateDto));
+ }
+ }
+ }
+
// 鏂板
- foreach (var workTaskDto in workTaskCreateDtos)
- {
- try
- {
+ foreach (var workTaskDto in workTaskCreateDtos)
+ {
+ try
+ {
workTaskDto.Item.CreatorName = myCurrentUser.UserAccount;//鍒涘缓浜�
- await CreateAsync(workTaskDto.Item);
- }
- catch (Exception e)
- {
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊workTaskDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
- throw new UserFriendlyException(errorMsg);
- }
- }
-
+ await CreateAsync(workTaskDto.Item);
+ }
+ catch (Exception e)
+ {
+ var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊workTaskDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
+ throw new UserFriendlyException(errorMsg);
+ }
+ }
+
// 鏇存柊
- foreach (var workTaskDto in workTaskUpdateDtos)
- {
- try
- {
+ foreach (var workTaskDto in workTaskUpdateDtos)
+ {
+ try
+ {
workTaskDto.Item.LastModifierName = myCurrentUser.UserAccount;//淇敼浜�
- await UpdateAsync(workTaskDto.Id, workTaskDto.Item);
- }
- catch (Exception e)
- {
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊workTaskDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
- throw new UserFriendlyException(errorMsg);
- }
- }
- }
-
+ await _workTaskRepository.UpdateAsync(workTaskDto.Item);
+ }
+ catch (Exception e)
+ {
+ var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊workTaskDto.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(GetWorkTaskInput input)
- {
- Check.NotNull(input, nameof(input));
-
- if (input.Sorting.IsNullOrWhiteSpace())
- {
- input.Sorting = nameof(WorkTask.Sort);
- }
-
+ public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWorkTaskInput input)
+ {
+ Check.NotNull(input, nameof(input));
+
+ if (input.Sorting.IsNullOrWhiteSpace())
+ {
+ input.Sorting = nameof(WorkTask.Sort);
+ }
+
#region 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
-
+
//鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
- var whereConditions = DynamicGetQueryParams(input);
-
- #endregion
-
-
- var list = await _workTaskRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount, includeDetails: true);
- var result = ObjectMapper.Map<List<WorkTask>, List<WorkTaskDto>>(list);
-
- var sheets = new Dictionary<string, object>
- {
- ["閰嶇疆"] = ExportHelper.ConvertListToExportData(result),
- };
-
- var fileName = "浣滀笟浠诲姟";
- return (sheets, fileName);
- }
-
+ var whereConditions = DynamicGetQueryParams(input);
+
+ #endregion
+
+
+ var list = await _workTaskRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount, includeDetails: true);
+ var result = ObjectMapper.Map<List<WorkTask>, List<WorkTaskDto>>(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(WorkTaskCreateOrUpdateDtoBase input)
- {
- Check.NotNull(input, nameof(input));
- Check.NotNullOrWhiteSpace(input.Son_TaskCode, "瀛愪换鍔＄紪鐮�", 256);
+ protected Task CheckCreateOrUpdateDtoAsync(WorkTaskCreateOrUpdateDtoBase input)
+ {
+ Check.NotNull(input, nameof(input));
+ Check.NotNullOrWhiteSpace(input.Son_TaskCode, "瀛愪换鍔＄紪鐮�", 256);
Check.NotNullOrWhiteSpace(input.TaskCode, "浠诲姟缂栫爜", 256);
Check.NotNull(input.WorkPlanStatus, "璁″垝鐘舵��");
Check.NotNull(input.CallMaterialStatus, "鍙枡鐘舵��");
@@ -542,21 +421,21 @@
Check.NotNull(input.PipeWallThickness, "濂楃鐩村緞(mm)");
Check.NotNull(input.OuterDiameter, "澶栧緞(mm)");
Check.NotNull(input.Thickness, "澹佸帤(mm)");
-
- return Task.CompletedTask;
- }
-
- /// <summary>
+
+ return Task.CompletedTask;
+ }
+
+ /// <summary>
/// 鏍规嵁鏉′欢鑾峰彇浣滀笟浠诲姟琛ㄥ垪琛�
/// </summary>
/// <param name="whereConditions"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
- public async Task<List<WorkTask>> GetListByFilterAsync(Expression<Func<WorkTask, bool>> whereConditions, CancellationToken cancellationToken = default)
- {
- return await _workTaskRepository.GetListByFilterAsync(whereConditions);
- }
-
+ public async Task<List<WorkTask>> GetListByFilterAsync(Expression<Func<WorkTask, bool>> whereConditions, CancellationToken cancellationToken = default)
+ {
+ return await _workTaskRepository.GetListByFilterAsync(whereConditions);
+ }
+
/// <summary>
/// 鏍规嵁鏉′欢鑾峰彇鍗曚釜浣滀笟浠诲姟琛�
/// </summary>
@@ -565,59 +444,59 @@
/// <param name="cancellationToken"></param>
/// <returns></returns>
/// <exception cref="UserFriendlyException"></exception>
- public async Task<WorkTask> GetSingleByFilterAsync(Expression<Func<WorkTask, bool>> whereConditions, bool is鈥婱ultipleThrowException = false, CancellationToken cancellationToken = default)
- {
- return await _workTaskRepository.GetSingleByFilterAsync(whereConditions, is鈥婱ultipleThrowException);
- }
-
- /// <summary>
+ public async Task<WorkTask> GetSingleByFilterAsync(Expression<Func<WorkTask, bool>> whereConditions, bool is鈥婱ultipleThrowException = false, CancellationToken cancellationToken = default)
+ {
+ return await _workTaskRepository.GetSingleByFilterAsync(whereConditions, is鈥婱ultipleThrowException);
+ }
+
+ /// <summary>
/// 鏍规嵁鏉′欢鑾峰彇浣滀笟浠诲姟琛ㄥ垪琛�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- public virtual async Task<List<WorkTaskDto>> FindListByFilterAsync(GetWorkTaskInput input, CancellationToken cancellationToken = default)
- {
- Check.NotNull(input, nameof(input));
-
- if (input.Sorting.IsNullOrWhiteSpace())
- {
- input.Sorting = nameof(WorkTask.Sort);
- }
-
+ public virtual async Task<List<WorkTaskDto>> FindListByFilterAsync(GetWorkTaskInput input, CancellationToken cancellationToken = default)
+ {
+ Check.NotNull(input, nameof(input));
+
+ if (input.Sorting.IsNullOrWhiteSpace())
+ {
+ input.Sorting = nameof(WorkTask.Sort);
+ }
+
#region 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
-
+
//鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
- var whereConditions = DynamicGetQueryParams(input);
-
- #endregion
-
- var list = await _workTaskRepository.GetListByFilterAsync(whereConditions?.data);
-
- return new List<WorkTaskDto>(ObjectMapper.Map<List<WorkTask>, List<WorkTaskDto>>(list));
- }
+ var whereConditions = DynamicGetQueryParams(input);
+
+ #endregion
+
+ var list = await _workTaskRepository.GetListByFilterAsync(whereConditions?.data);
+
+ return new List<WorkTaskDto>(ObjectMapper.Map<List<WorkTask>, List<WorkTaskDto>>(list));
+ }
/// <summary>
/// 鏍规嵁鏉′欢鑾峰彇鍗曚釜浣滀笟浠诲姟琛�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- public virtual async Task<WorkTaskDto> FindSingleByFilterAsync(GetWorkTaskInput input, CancellationToken cancellationToken = default)
- {
- Check.NotNull(input, nameof(input));
-
- if (input.Sorting.IsNullOrWhiteSpace())
- {
- input.Sorting = nameof(WorkTask.Sort);
- }
-
+ public virtual async Task<WorkTaskDto> FindSingleByFilterAsync(GetWorkTaskInput input, CancellationToken cancellationToken = default)
+ {
+ Check.NotNull(input, nameof(input));
+
+ if (input.Sorting.IsNullOrWhiteSpace())
+ {
+ input.Sorting = nameof(WorkTask.Sort);
+ }
+
#region 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
-
+
//鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
- var whereConditions = DynamicGetQueryParams(input);
-
- #endregion
-
- var dataObj = await _workTaskRepository.GetSingleByFilterAsync(whereConditions?.data);
-
- return (ObjectMapper.Map<WorkTask, WorkTaskDto>(dataObj));
- }
-}
+ var whereConditions = DynamicGetQueryParams(input);
+
+ #endregion
+
+ var dataObj = await _workTaskRepository.GetSingleByFilterAsync(whereConditions?.data);
+
+ return (ObjectMapper.Map<WorkTask, WorkTaskDto>(dataObj));
+ }
+}
--
Gitblit v1.9.3