From 4209c8ff313ce8bac44bc9fe0b2260111a3fb388 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 10 5月 2025 15:22:13 +0800
Subject: [PATCH] 优化接口
---
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs | 738 +++++++++++++++++++++++++++++---------------------------
1 files changed, 386 insertions(+), 352 deletions(-)
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs
index a9bb3be..0b1715d 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs
@@ -1,127 +1,137 @@
-using CMS.Plugin.PipeLineLems.Application.Contracts.Dtos.WorkPlan;
-using CMS.Plugin.PipeLineLems.Application.Contracts.Services;
-using CMS.Plugin.PipeLineLems.Domain.Shared;
-using CmsQueryExtensions;
-using CMS.Plugin.PipeLineLems.Domain.WorkPlan;
-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.WorkPlan;
+using CMS.Plugin.PipeLineLems.Application.Contracts.Services;
+using CMS.Plugin.PipeLineLems.Domain.Shared;
+using CmsQueryExtensions;
+using CMS.Plugin.PipeLineLems.Domain.WorkPlan;
+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 CMS.Plugin.FormulaManagement.Abstractions;
+using CMS.Plugin.OrderManagement.Abstractions.Enums;
+using CMS.Plugin.OrderManagement.Abstractions.Models;
+using CMS.Plugin.OrderManagement.Abstractions;
+using CMS.Plugin.ProductManagement.Abstractions;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace CMS.Plugin.PipeLineLems.Application.Implements;
+
/// <summary>
/// 浣滀笟璁″垝琛ㄥ簲鐢ㄦ湇鍔�
/// </summary>
-public class WorkPlanAppService : CMSPluginAppService, IWorkPlanAppService
-{
- private readonly IWorkPlanRepository workPlanRepository;
-
+public class WorkPlanAppService : CMSPluginAppService, IWorkPlanAppService
+{
+ private readonly IWorkPlanRepository workPlanRepository;
+ private readonly IServiceProvider _serviceProvider;
+ private readonly SharedService _sharedService;
+
/// <summary>
/// Initializes a new instance of the <see cref="WorkPlanAppService"/> class.
/// </summary>
/// <param name="WorkPlanRepository">The task job repository.</param>
- public WorkPlanAppService(IWorkPlanRepository _WorkPlanRepository)
- {
- workPlanRepository = _WorkPlanRepository;
- }
-
+ public WorkPlanAppService(IWorkPlanRepository _WorkPlanRepository, IServiceProvider serviceProvider, SharedService sharedService)
+ {
+ workPlanRepository = _WorkPlanRepository;
+ _serviceProvider = serviceProvider;
+ _sharedService = sharedService;
+ }
+
/// <summary>
/// 鑾峰彇鎸囧畾浣滀笟璁″垝琛�
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- public virtual async Task<WorkPlanDto> GetAsync(Guid id)
- {
- return ObjectMapper.Map<WorkPlan, WorkPlanDto>(await workPlanRepository.GetAsync(id));
- }
-
+ public virtual async Task<WorkPlanDto> GetAsync(Guid id)
+ {
+ return ObjectMapper.Map<WorkPlan, WorkPlanDto>(await workPlanRepository.GetAsync(id));
+ }
+
/// <summary>
/// 鍒嗛〉鑾峰彇浣滀笟璁″垝琛�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- public virtual async Task<PagedResultDto<WorkPlanDto>> GetListAsync(GetWorkPlanInput input)
- {
- Check.NotNull(input, nameof(input));
-
- if (input.Sorting.IsNullOrWhiteSpace())
- {
- input.Sorting = nameof(WorkPlan.Sort);
- }
-
+ public virtual async Task<PagedResultDto<WorkPlanDto>> GetListAsync(GetWorkPlanInput input)
+ {
+ Check.NotNull(input, nameof(input));
+
+ if (input.Sorting.IsNullOrWhiteSpace())
+ {
+ input.Sorting = nameof(WorkPlan.Sort);
+ }
+
#region 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
-
+
//鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
- var whereConditions = DynamicGetQueryParams(input);
-
- #endregion
-
- var count = await workPlanRepository.GetCountAsync(whereConditions);
- var list = await workPlanRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount);
-
- return new PagedResultDto<WorkPlanDto>(count, ObjectMapper.Map<List<WorkPlan>, List<WorkPlanDto>>(list));
- }
-
+ var whereConditions = DynamicGetQueryParams(input);
+
+ #endregion
+
+ var count = await workPlanRepository.GetCountAsync(whereConditions);
+ var list = await workPlanRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount);
+
+ return new PagedResultDto<WorkPlanDto>(count, ObjectMapper.Map<List<WorkPlan>, List<WorkPlanDto>>(list));
+ }
+
/// <summary>
/// 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
/// </summary>
/// <param name="input">杈撳叆鍙傛暟</param>
/// <returns></returns>
- private FunReturnResultModel<Expression<Func<WorkPlan, bool>>> DynamicGetQueryParams(GetWorkPlanInput input)
- {
+ private FunReturnResultModel<Expression<Func<WorkPlan, bool>>> DynamicGetQueryParams(GetWorkPlanInput input)
+ {
//鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
- var whereConditions = WhereConditionsExtensions.GetWhereConditions<WorkPlan, GetWorkPlanInput>(input);
- if (!whereConditions.IsSuccess)
- {
- throw new Exception("鍔ㄦ�佹瀯閫犳煡璇㈡潯浠跺け璐�:" + whereConditions.ErrMsg);
- }
-
+ var whereConditions = WhereConditionsExtensions.GetWhereConditions<WorkPlan, GetWorkPlanInput>(input);
+ if (!whereConditions.IsSuccess)
+ {
+ throw new Exception("鍔ㄦ�佹瀯閫犳煡璇㈡潯浠跺け璐�:" + whereConditions.ErrMsg);
+ }
+
//涔熷彲鍐嶆鑷畾涔夋瀯寤烘煡璇㈡潯浠�
- Expression<Func<WorkPlan, bool>> extendExpression = a => a.IsDeleted == false;
+ Expression<Func<WorkPlan, bool>> extendExpression = a => a.IsDeleted == false;
// 浣跨敤 System.Linq.PredicateBuilder 鐨� And
- var pres = (System.Linq.Expressions.Expression<Func<WorkPlan, bool>>)(whereConditions.data);
- whereConditions.data = System.Linq.PredicateBuilder.And(pres, extendExpression);
-
- return whereConditions;
- }
-
+ var pres = (System.Linq.Expressions.Expression<Func<WorkPlan, 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<WorkPlanDto> CreateAsync(WorkPlanCreateDto input)
- {
- await CheckCreateOrUpdateDtoAsync(input);
-
- var exist = await workPlanRepository.NameExistAsync(input.TaskCode);
- if (exist)
- {
- throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.TaskCode]);
- }
-
- var maxSort = await workPlanRepository.GetMaxSortAsync();
- var sort = input.Sort ?? maxSort;
-
- var insertObj = ObjectMapper.Map<WorkPlanCreateDto, WorkPlan>(input);
- insertObj.Sort = sort;
- input.MapExtraPropertiesTo(insertObj, MappingPropertyDefinitionChecks.None);
-
- await workPlanRepository.InsertAsync(insertObj);
-
+ public virtual async Task<WorkPlanDto> CreateAsync(WorkPlanCreateDto input)
+ {
+ await CheckCreateOrUpdateDtoAsync(input);
+
+ var exist = await workPlanRepository.NameExistAsync(input.TaskCode);
+ if (exist)
+ {
+ throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.TaskCode]);
+ }
+
+ var maxSort = await workPlanRepository.GetMaxSortAsync();
+ var sort = input.Sort ?? maxSort;
+
+ var insertObj = ObjectMapper.Map<WorkPlanCreateDto, WorkPlan>(input);
+ insertObj.Sort = sort;
+ input.MapExtraPropertiesTo(insertObj, MappingPropertyDefinitionChecks.None);
+
+ await workPlanRepository.InsertAsync(insertObj);
+
//if (input.Sort.HasValue && insertObj.Sort != maxSort)
//{
// await AdjustSortAsync(insertObj.Id, insertObj.Sort);
//}
-
- return ObjectMapper.Map<WorkPlan, WorkPlanDto>(insertObj);
- }
-
+
+ return ObjectMapper.Map<WorkPlan, WorkPlanDto>(insertObj);
+ }
+
/// <summary>
/// 鏇存柊浣滀笟璁″垝琛�
/// </summary>
@@ -129,21 +139,21 @@
/// <param name="input"></param>
/// <returns></returns>
/// <exception cref="UserFriendlyException"></exception>
- public virtual async Task<WorkPlanDto> UpdateAsync(Guid id, WorkPlanUpdateDto input)
- {
- await CheckCreateOrUpdateDtoAsync(input);
-
- var updateObj = await workPlanRepository.GetAsync(id);
- var exist = await workPlanRepository.NameExistAsync(input.TaskCode, updateObj.Id);
- if (exist)
- {
- throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.TaskCode]);
- }
-
- updateObj.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
- input.MapExtraPropertiesTo(updateObj, MappingPropertyDefinitionChecks.None);
-
- updateObj.TaskCode = input.TaskCode;
+ public virtual async Task<WorkPlanDto> UpdateAsync(Guid id, WorkPlanUpdateDto input)
+ {
+ await CheckCreateOrUpdateDtoAsync(input);
+
+ var updateObj = await workPlanRepository.GetAsync(id);
+ var exist = await workPlanRepository.NameExistAsync(input.TaskCode, updateObj.Id);
+ if (exist)
+ {
+ throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.TaskCode]);
+ }
+
+ updateObj.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
+ input.MapExtraPropertiesTo(updateObj, MappingPropertyDefinitionChecks.None);
+
+ updateObj.TaskCode = input.TaskCode;
updateObj.DataIdentifier = input.DataIdentifier;
updateObj.MaterialMode = input.MaterialMode;
updateObj.Length = input.Length;
@@ -177,20 +187,20 @@
updateObj.TeamInfo = input.TeamInfo;
updateObj.Timestamp = input.Timestamp;
updateObj.Remark = input.Remark;
-
-
- await workPlanRepository.UpdateAsync(updateObj);
-
- return ObjectMapper.Map<WorkPlan, WorkPlanDto>(updateObj);
- }
-
+
+
+ await workPlanRepository.UpdateAsync(updateObj);
+
+ return ObjectMapper.Map<WorkPlan, WorkPlanDto>(updateObj);
+ }
+
/// <summary>
/// 鍏嬮殕浣滀笟璁″垝琛�
/// </summary>
/// <param name="ids"></param>
/// <returns></returns>
- public async Task<List<WorkPlanDto>> CloneAsync(IEnumerable<Guid> ids)
- {
+ public async Task<List<WorkPlanDto>> CloneAsync(IEnumerable<Guid> ids)
+ {
//var workPlans = new List<WorkPlan>();
//if (ids != null)
//{
@@ -210,285 +220,309 @@
// name += WorkPlanConsts.CloneTag;
// continue;
// }
-
+
// notExist = true;
// }
-
+
// //WorkPlan = await workPlanRepository.InsertAsync(WorkPlan.Clone(GuidGenerator.Create(), name, sort++));
// workPlans.Add(WorkPlan);
// }
// }
//}
-
+
//return ObjectMapper.Map<List<WorkPlan>, List<WorkPlanDto>>(workPlans);
- return new List<WorkPlanDto>();
- }
-
+ return new List<WorkPlanDto>();
+ }
+
/// <summary>
/// 鍒犻櫎鍗曚釜浣滀笟璁″垝琛�
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- public virtual Task DeleteAsync(Guid id)
- {
- return workPlanRepository.DeleteAsync(id);
- }
-
+ public virtual Task DeleteAsync(Guid id)
+ {
+ return workPlanRepository.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)
+ {
+ foreach (var id in ids)
+ {
+ await DeleteAsync(id);
+ }
+ }
+
/// <summary>
/// 璋冩暣鎺掑簭浣滀笟璁″垝琛�
/// </summary>
/// <param name="id"></param>
/// <param name="sort"></param>
/// <returns></returns>
- public virtual async Task AdjustSortAsync(Guid id, int sort)
- {
- var list = await workPlanRepository.GetListAsync(null, nameof(WorkPlan.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 workPlanRepository.UpdateManyAsync(list);
- }
-
+ public virtual async Task AdjustSortAsync(Guid id, int sort)
+ {
+ var list = await workPlanRepository.GetListAsync(null, nameof(WorkPlan.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 workPlanRepository.UpdateManyAsync(list);
+ }
+
/// <summary>
/// 瀵煎叆浣滀笟璁″垝琛�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
/// <exception cref="UserFriendlyException"></exception>
- public async Task ImportAsync(WorkPlansImportModel input)
- {
- Check.NotNull(input, nameof(input));
-
- var workPlanCreateDtos = new List<(int RowIndex, WorkPlanCreateDto Item)>();
- var workPlanUpdateDtos = new List<(int RowIndex, Guid Id, WorkPlanUpdateDto Item)>();
- var importItems = input.WorkPlans;
-
- if (importItems != null && importItems.Any())
- {
- #region 瀵煎叆鏍￠獙
-
- // 鍒ゆ柇鍚嶇О鏄惁閲嶅锛屽苟杈撳嚭绗嚑琛岄噸澶�
- var duplicateWorkPlans = importItems.GroupBy(x => x.TaskCode).Where(x => x.Count() > 1).ToList();
- if (duplicateWorkPlans?.Any() == true)
- {
- var duplicateWorkPlanMsgs = duplicateWorkPlans.Select(x => $"绗� {string.Join(",", x.Select(x => x.RowIndex))} 琛岋細{x.Key} 鍚嶇О閲嶅");
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝 {string.Join(",", duplicateWorkPlanMsgs)}锛岀粓姝㈠鍏�";
- throw new UserFriendlyException(errorMsg);
- }
-
- #endregion
-
- foreach (var impItem in importItems)
- {
- if (impItem.TaskCode.IsNullOrWhiteSpace())
- {
- continue;
- }
-
- if (impItem.TaskCode.IsNullOrWhiteSpace())
- {
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊impItem.RowIndex}琛岋細WorkPlan鍚嶇О涓嶈兘涓虹┖";
- throw new UserFriendlyException(errorMsg);
- }
-
- var oldWorkPlan = await workPlanRepository.FindByNameAsync(impItem.TaskCode);
- if (oldWorkPlan != null)
- {
- var workPlanUpdateDto = new WorkPlanUpdateDto
- {
- TaskCode = impItem.TaskCode,
-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,
-WorkpieceName = impItem.WorkpieceName,
-ProcessName = impItem.ProcessName,
-PipeFittingCode = impItem.PipeFittingCode,
-PreSerialNumber = impItem.PreSerialNumber,
-PipeSpecCode = impItem.PipeSpecCode,
-PipeSectionName = impItem.PipeSectionName,
-OuterDiameter = impItem.OuterDiameter,
-Thickness = impItem.Thickness,
-Material = impItem.Material,
-HasMainSignature = impItem.HasMainSignature,
-ProcessRouteNumber = impItem.ProcessRouteNumber,
-PlannedStartTime = impItem.PlannedStartTime,
-PlannedEndTime = impItem.PlannedEndTime,
-TeamInfo = impItem.TeamInfo,
-Timestamp = impItem.Timestamp,
-Remark = impItem.Remark,
-
- };
-
- workPlanUpdateDtos.Add((impItem.RowIndex, oldWorkPlan.Id, workPlanUpdateDto));
- }
- else
- {
- var workPlanCreateDto = new WorkPlanCreateDto
- {
- TaskCode = impItem.TaskCode,
-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,
-WorkpieceName = impItem.WorkpieceName,
-ProcessName = impItem.ProcessName,
-PipeFittingCode = impItem.PipeFittingCode,
-PreSerialNumber = impItem.PreSerialNumber,
-PipeSpecCode = impItem.PipeSpecCode,
-PipeSectionName = impItem.PipeSectionName,
-OuterDiameter = impItem.OuterDiameter,
-Thickness = impItem.Thickness,
-Material = impItem.Material,
-HasMainSignature = impItem.HasMainSignature,
-ProcessRouteNumber = impItem.ProcessRouteNumber,
-PlannedStartTime = impItem.PlannedStartTime,
-PlannedEndTime = impItem.PlannedEndTime,
-TeamInfo = impItem.TeamInfo,
-Timestamp = impItem.Timestamp,
-Remark = impItem.Remark,
-
- };
-
- workPlanCreateDtos.Add((impItem.RowIndex, workPlanCreateDto));
- }
- }
- }
-
- // 鏂板
- foreach (var workPlanDto in workPlanCreateDtos)
- {
- try
- {
- await CreateAsync(workPlanDto.Item);
- }
- catch (Exception e)
- {
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊workPlanDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
- throw new UserFriendlyException(errorMsg);
- }
- }
-
- // 鏇存柊
- foreach (var workPlanDto in workPlanUpdateDtos)
- {
- try
- {
- await UpdateAsync(workPlanDto.Id, workPlanDto.Item);
- }
- catch (Exception e)
- {
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊workPlanDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
- throw new UserFriendlyException(errorMsg);
- }
- }
- }
-
+ public async Task ImportAsync(WorkPlansImportModel input)
+ {
+
+ //杞崲鏁版嵁
+ var result = ObjectMapper.Map<List<WorkPlansImportModel.WorkPlanImportModel>, List<WorkPlanInput>>(input.WorkPlans);
+
+ //await CreatebyApsAsync(result);
+ await _sharedService.CommonCreatebyApsAsync(result, _serviceProvider, this);
+ }
+
+
+ public async Task<MesOrderResponse> CreatebyApsAsync(List<WorkPlanInput> input)
+ {
+ var response=await _sharedService.CommonCreatebyApsAsync(input, _serviceProvider, this);
+
+ return response;
+ }
+
+ ///// <summary>
+ ///// 瀵煎叆浣滀笟璁″垝琛�
+ ///// </summary>
+ ///// <param name="input"></param>
+ ///// <returns></returns>
+ ///// <exception cref="UserFriendlyException"></exception>
+ //public async Task ImportAsync(WorkPlansImportModel input)
+ //{
+ // Check.NotNull(input, nameof(input));
+
+ // var workPlanCreateDtos = new List<(int RowIndex, WorkPlanCreateDto Item)>();
+ // var workPlanUpdateDtos = new List<(int RowIndex, Guid Id, WorkPlanUpdateDto Item)>();
+ // var importItems = input.WorkPlans;
+
+ // if (importItems != null && importItems.Any())
+ // {
+ // #region 瀵煎叆鏍￠獙
+
+ // // 鍒ゆ柇鍚嶇О鏄惁閲嶅锛屽苟杈撳嚭绗嚑琛岄噸澶�
+ // var duplicateWorkPlans = importItems.GroupBy(x => x.TaskCode).Where(x => x.Count() > 1).ToList();
+ // if (duplicateWorkPlans?.Any() == true)
+ // {
+ // var duplicateWorkPlanMsgs = duplicateWorkPlans.Select(x => $"绗� {string.Join(",", x.Select(x => x.RowIndex))} 琛岋細{x.Key} 鍚嶇О閲嶅");
+ // var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝 {string.Join(",", duplicateWorkPlanMsgs)}锛岀粓姝㈠鍏�";
+ // throw new UserFriendlyException(errorMsg);
+ // }
+
+ // #endregion
+
+ // foreach (var impItem in importItems)
+ // {
+ // if (impItem.TaskCode.IsNullOrWhiteSpace())
+ // {
+ // continue;
+ // }
+
+ // if (impItem.TaskCode.IsNullOrWhiteSpace())
+ // {
+ // var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊impItem.RowIndex}琛岋細WorkPlan鍚嶇О涓嶈兘涓虹┖";
+ // throw new UserFriendlyException(errorMsg);
+ // }
+
+ // var oldWorkPlan = await workPlanRepository.FindByNameAsync(impItem.TaskCode);
+ // if (oldWorkPlan != null)
+ // {
+ // var workPlanUpdateDto = new WorkPlanUpdateDto
+ // {
+ // TaskCode = impItem.TaskCode,
+ // 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,
+ // WorkpieceName = impItem.WorkpieceName,
+ // ProcessName = impItem.ProcessName,
+ // PipeFittingCode = impItem.PipeFittingCode,
+ // PreSerialNumber = impItem.PreSerialNumber,
+ // PipeSpecCode = impItem.PipeSpecCode,
+ // PipeSectionName = impItem.PipeSectionName,
+ // OuterDiameter = impItem.OuterDiameter,
+ // Thickness = impItem.Thickness,
+ // Material = impItem.Material,
+ // HasMainSignature = impItem.HasMainSignature,
+ // ProcessRouteNumber = impItem.ProcessRouteNumber,
+ // PlannedStartTime = impItem.PlannedStartTime,
+ // PlannedEndTime = impItem.PlannedEndTime,
+ // TeamInfo = impItem.TeamInfo,
+ // Timestamp = impItem.Timestamp,
+ // Remark = impItem.Remark,
+
+ // };
+
+ // workPlanUpdateDtos.Add((impItem.RowIndex, oldWorkPlan.Id, workPlanUpdateDto));
+ // }
+ // else
+ // {
+ // var workPlanCreateDto = new WorkPlanCreateDto
+ // {
+ // TaskCode = impItem.TaskCode,
+ // 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,
+ // WorkpieceName = impItem.WorkpieceName,
+ // ProcessName = impItem.ProcessName,
+ // PipeFittingCode = impItem.PipeFittingCode,
+ // PreSerialNumber = impItem.PreSerialNumber,
+ // PipeSpecCode = impItem.PipeSpecCode,
+ // PipeSectionName = impItem.PipeSectionName,
+ // OuterDiameter = impItem.OuterDiameter,
+ // Thickness = impItem.Thickness,
+ // Material = impItem.Material,
+ // HasMainSignature = impItem.HasMainSignature,
+ // ProcessRouteNumber = impItem.ProcessRouteNumber,
+ // PlannedStartTime = impItem.PlannedStartTime,
+ // PlannedEndTime = impItem.PlannedEndTime,
+ // TeamInfo = impItem.TeamInfo,
+ // Timestamp = impItem.Timestamp,
+ // Remark = impItem.Remark,
+
+ // };
+
+ // workPlanCreateDtos.Add((impItem.RowIndex, workPlanCreateDto));
+ // }
+ // }
+ // }
+
+ // // 鏂板
+ // foreach (var workPlanDto in workPlanCreateDtos)
+ // {
+ // try
+ // {
+ // await CreateAsync(workPlanDto.Item);
+ // }
+ // catch (Exception e)
+ // {
+ // var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊workPlanDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
+ // throw new UserFriendlyException(errorMsg);
+ // }
+ // }
+
+ // // 鏇存柊
+ // foreach (var workPlanDto in workPlanUpdateDtos)
+ // {
+ // try
+ // {
+ // await UpdateAsync(workPlanDto.Id, workPlanDto.Item);
+ // }
+ // catch (Exception e)
+ // {
+ // var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊workPlanDto.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(GetWorkPlanInput input)
- {
- Check.NotNull(input, nameof(input));
-
- if (input.Sorting.IsNullOrWhiteSpace())
- {
- input.Sorting = nameof(WorkPlan.Sort);
- }
-
+ public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWorkPlanInput input)
+ {
+ Check.NotNull(input, nameof(input));
+
+ if (input.Sorting.IsNullOrWhiteSpace())
+ {
+ input.Sorting = nameof(WorkPlan.Sort);
+ }
+
#region 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
-
+
//鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
- var whereConditions = DynamicGetQueryParams(input);
-
- #endregion
-
-
- var list = await workPlanRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount, includeDetails: true);
- var result = ObjectMapper.Map<List<WorkPlan>, List<WorkPlanDto>>(list);
-
- var sheets = new Dictionary<string, object>
- {
- ["閰嶇疆"] = ExportHelper.ConvertListToExportData(result),
- };
-
- var fileName = "浣滀笟璁″垝";
- return (sheets, fileName);
- }
-
+ var whereConditions = DynamicGetQueryParams(input);
+
+ #endregion
+
+
+ var list = await workPlanRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount, includeDetails: true);
+ var result = ObjectMapper.Map<List<WorkPlan>, List<WorkPlanDto>>(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(WorkPlanCreateOrUpdateDtoBase input)
- {
- Check.NotNull(input, nameof(input));
- Check.NotNullOrWhiteSpace(input.TaskCode, "浠诲姟缂栫爜", 256);
+ protected Task CheckCreateOrUpdateDtoAsync(WorkPlanCreateOrUpdateDtoBase input)
+ {
+ Check.NotNull(input, nameof(input));
+ Check.NotNullOrWhiteSpace(input.TaskCode, "浠诲姟缂栫爜", 256);
Check.NotNull(input.Length, "闀垮害(mm)");
Check.NotNull(input.MarkingPosition, "鎵撶爜浣嶇疆");
Check.NotNull(input.CuttingPosition, "鍒囧壊浣嶇疆");
@@ -500,7 +534,7 @@
Check.NotNull(input.OuterDiameter, "澶栧緞(mm)");
Check.NotNull(input.Thickness, "澹佸帤(mm)");
Check.NotNull(input.HasMainSignature, "鏄惁涓绘敮绠�");
-
- return Task.CompletedTask;
- }
-}
+
+ return Task.CompletedTask;
+ }
+}
--
Gitblit v1.9.3