22

schangxiang@126.com

2025-05-16 cfc40ec33d286b9bf6106d32f20ee3e9533ed026

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

@@ -10,6 +10,8 @@
using Volo.Abp.Data;
using Volo.Abp.ObjectExtending;
using Volo.Abp.ObjectMapping;
using Volo.Abp.Users;
using CmsQueryExtensions.Entitys;

namespace CMS.Plugin.PipeLineLems.Application.Implements;

@@ -18,16 +20,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;
    }
@@ -39,19 +41,9 @@
    /// <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> 
    /// 按照 原料标记 查找作业计划表 
    /// </summary> 
    /// <param name="name"></param> 
    /// <param name="cancellationToken"></param> 
    /// <returns></returns> 
    public virtual async Task<List<WorkPlan>> FindByDataIdentifierAsync(string dataIdentifier)
    {
        return await workPlanRepository.FindByDataIdentifierAsync(dataIdentifier);
    }

    /// <summary> 
    /// 分页获取作业计划表 
@@ -74,8 +66,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));
    }
@@ -113,13 +105,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);
@@ -127,7 +119,7 @@
        insertObj.CreatorName = "SuperAdmin";
        input.MapExtraPropertiesTo(insertObj, MappingPropertyDefinitionChecks.None);

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

        //if (input.Sort.HasValue && insertObj.Sort != maxSort) 
        //{ 
@@ -148,8 +140,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]);
@@ -178,7 +170,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;
@@ -195,7 +187,7 @@
        updateObj.Remark = input.Remark;


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

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

    /// <summary> 
@@ -271,7 +263,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;
@@ -298,7 +290,7 @@
            }
        }

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

    /// <summary> 
@@ -307,13 +299,13 @@
    /// <param name="input"></param> 
    /// <returns></returns> 
    /// <exception cref="UserFriendlyException"></exception> 
    public async Task ImportAsync(WorkPlansImportModel input)
    public async Task ImportAsync(WorkPlansImportModel input, MyCurrentUser myCurrentUser)
    {
        //转换数据
        var result = ObjectMapper.Map<List<WorkPlansImportModel.WorkPlanImportModel>, List<WorkPlanInput>>(input.WorkPlans);

        //await CreatebyApsAsync(result);
        await _sharedService.CommonCreatebyApsAsync(result, _serviceProvider, this);
        await _sharedService.CommonCreatebyApsAsync(result, _serviceProvider, this, myCurrentUser.UserId, myCurrentUser.UserAccount);
        //        Check.NotNull(input, nameof(input)); 

        //        var workPlanCreateDtos = new List<(int RowIndex, WorkPlanCreateDto Item)>(); 
@@ -491,7 +483,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>
@@ -527,4 +519,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);
    }
}