22

schangxiang@126.com

2025-05-15 9a83dbb67b223e94a946e1bf7db59336e7fb2f28

 PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs

@@ -19,16 +19,16 @@
/// </summary> 
public class WorkPlanAppService : CMSPluginAppService, IWorkPlanAppService
{
    private readonly IWorkPlanRepository workPlanRepository;
    private readonly IWorkPlanRepository _workPlanRepository;
    private readonly SharedService _sharedService;
    private readonly IServiceProvider _serviceProvider;
    /// <summary> 
    /// Initializes a new instance of the <see cref="WorkPlanAppService"/> class. 
    /// </summary> 
    /// <param name="WorkPlanRepository">The task job repository.</param> 
    public WorkPlanAppService(IWorkPlanRepository _WorkPlanRepository, SharedService sharedService, IServiceProvider serviceProvider)
    public WorkPlanAppService(IWorkPlanRepository workPlanRepository, SharedService sharedService, IServiceProvider serviceProvider)
    {
        workPlanRepository = _WorkPlanRepository;
        _workPlanRepository = workPlanRepository;
        _sharedService = sharedService;
        _serviceProvider = serviceProvider;
    }
@@ -40,7 +40,7 @@
    /// <returns></returns> 
    public virtual async Task<WorkPlanDto> GetAsync(Guid id)
    {
        return ObjectMapper.Map<WorkPlan, WorkPlanDto>(await workPlanRepository.GetAsync(id));
        return ObjectMapper.Map<WorkPlan, WorkPlanDto>(await _workPlanRepository.GetAsync(id));
    }

    /// <summary> 
@@ -51,7 +51,7 @@
    /// <returns></returns> 
    public virtual async Task<List<WorkPlan>> FindByDataIdentifierAsync(string dataIdentifier)
    {
        return await workPlanRepository.FindByDataIdentifierAsync(dataIdentifier);
        return await _workPlanRepository.FindByDataIdentifierAsync(dataIdentifier);
    }

    /// <summary> 
@@ -75,8 +75,8 @@

        #endregion

        var count = await workPlanRepository.GetCountAsync(whereConditions);
        var list = await workPlanRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount);
        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));
    }
@@ -114,13 +114,13 @@
    {
        await CheckCreateOrUpdateDtoAsync(input);

        var exist = await workPlanRepository.NameExistAsync(input.TaskCode);
        var exist = await _workPlanRepository.NameExistAsync(input.TaskCode);
        if (exist)
        {
            throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.TaskCode]);
        }

        var maxSort = await workPlanRepository.GetMaxSortAsync();
        var maxSort = await _workPlanRepository.GetMaxSortAsync();
        var sort = input.Sort ?? maxSort;

        var insertObj = ObjectMapper.Map<WorkPlanCreateDto, WorkPlan>(input);
@@ -128,7 +128,7 @@
        insertObj.CreatorName = "SuperAdmin";
        input.MapExtraPropertiesTo(insertObj, MappingPropertyDefinitionChecks.None);

        await workPlanRepository.InsertAsync(insertObj);
        await _workPlanRepository.InsertAsync(insertObj);

        //if (input.Sort.HasValue && insertObj.Sort != maxSort) 
        //{ 
@@ -149,8 +149,8 @@
    {
        await CheckCreateOrUpdateDtoAsync(input);

        var updateObj = await workPlanRepository.GetAsync(id);
        var exist = await workPlanRepository.NameExistAsync(input.TaskCode, updateObj.Id);
        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]);
@@ -179,7 +179,7 @@
        updateObj.ProductCode = input.ProductCode;
        updateObj.WorkstationCode = input.WorkstationCode;
        updateObj.EquipmentCode = input.EquipmentCode;
        updateObj.WorkpieceName = input.WorkpieceName;
     
        updateObj.ProcessName = input.ProcessName;
        updateObj.PipeFittingCode = input.PipeFittingCode;
        updateObj.PreSerialNumber = input.PreSerialNumber;
@@ -196,7 +196,7 @@
        updateObj.Remark = input.Remark;


        await workPlanRepository.UpdateAsync(updateObj);
        await _workPlanRepository.UpdateAsync(updateObj);

        return ObjectMapper.Map<WorkPlan, WorkPlanDto>(updateObj);
    }
@@ -248,7 +248,7 @@
    /// <returns></returns> 
    public virtual Task DeleteAsync(Guid id)
    {
        return workPlanRepository.DeleteAsync(id);
        return _workPlanRepository.DeleteAsync(id);
    }

    /// <summary> 
@@ -272,7 +272,7 @@
    /// <returns></returns> 
    public virtual async Task AdjustSortAsync(Guid id, int sort)
    {
        var list = await workPlanRepository.GetListAsync(null, nameof(WorkPlan.Sort));
        var list = await _workPlanRepository.GetListAsync(null, nameof(WorkPlan.Sort));
        if (list != null && list.Any())
        {
            var initSort = 1;
@@ -299,7 +299,7 @@
            }
        }

        await workPlanRepository.UpdateManyAsync(list);
        await _workPlanRepository.UpdateManyAsync(list);
    }

    /// <summary> 
@@ -308,7 +308,7 @@
    /// <param name="input"></param> 
    /// <returns></returns> 
    /// <exception cref="UserFriendlyException"></exception> 
    public async Task ImportAsync(WorkPlansImportModel input, string userId,string userAccount)
    public async Task ImportAsync(WorkPlansImportModel input, string userId, string userAccount)
    {
        //转换数据
        var result = ObjectMapper.Map<List<WorkPlansImportModel.WorkPlanImportModel>, List<WorkPlanInput>>(input.WorkPlans);
@@ -492,7 +492,7 @@
        #endregion


        var list = await workPlanRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount, includeDetails: true);
        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>
@@ -528,4 +528,28 @@

        return Task.CompletedTask;
    }

    /// <summary> 
    /// 根据条件获取作业计划表列表 
    /// </summary> 
    /// <param name="whereConditions"></param> 
    /// <param name="cancellationToken"></param> 
    /// <returns></returns> 
    public async Task<List<WorkPlan>> GetListByFilterAsync(Expression<Func<WorkPlan, bool>> whereConditions, CancellationToken cancellationToken = default)
    {
        return await _workPlanRepository.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<WorkPlan> GetSingleByFilterAsync(Expression<Func<WorkPlan, bool>> whereConditions, bool is​MultipleThrowException = false, CancellationToken cancellationToken = default)
    {
        return await _workPlanRepository.GetSingleByFilterAsync(whereConditions, is​MultipleThrowException);
    }
}