优化

schangxiang@126.com

2025-05-20 726693db8c69f3dad6e44e7e3755acfabb005292

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

@@ -145,49 +145,8 @@
        updateObj.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
        input.MapExtraPropertiesTo(updateObj, MappingPropertyDefinitionChecks.None);


        // 批量赋值所有可映射字段（通过匿名对象）
        updateObj = ObjectMapper.Map(input, updateObj); // 等效于手动赋值所有匹配字段
        //updateObj.Id = id;
        //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;


        updateObj.LastModifierName = input.LastModifierName;//修改人 

@@ -289,34 +248,34 @@
    /// <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)); 
        //        } 
        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); 
        //    } 
        //} 
                entity.AdjustSort(sort); 
            } 
        } 

        //await _workTaskRepository.UpdateManyAsync(list); 
        await _workTaskRepository.UpdateManyAsync(list); 
    }

    /// <summary> 
@@ -364,100 +323,13 @@
                var oldWorkTask = await _workTaskRepository.FindByNameAsync(impItem.Son_TaskCode);
                if (oldWorkTask != null)
                {
                    //var workTaskUpdateDto = new WorkTaskUpdateDto { };
                    oldWorkTask = ObjectMapper.Map(impItem, oldWorkTask); // 等效于手动赋值所有匹配字段
                    //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, oldWorkTask));
                }
                else
                {
                    var workTaskCreateDto = new WorkTaskCreateDto { };
                    workTaskCreateDto = ObjectMapper.Map(impItem, workTaskCreateDto); // 等效于手动赋值所有匹配字段
                    //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));
                }
            }
@@ -479,16 +351,16 @@
        }

        // 更新 
        foreach (var oldWorkObj in workTaskUpdateDtos)
        foreach (var workTaskDto in workTaskUpdateDtos) 
        {
            try
            {
                oldWorkObj.Item.LastModifierName = myCurrentUser.UserAccount;//修改人 
                await _workTaskRepository.UpdateAsync(oldWorkObj.Item);
                workTaskDto.Item.LastModifierName = myCurrentUser.UserAccount;//修改人 
                await _workTaskRepository.UpdateAsync(workTaskDto.Item); 
            }
            catch (Exception e)
            {
                var errorMsg = $"导入失败！配置，第{oldWorkObj.RowIndex}行：{e.Message}，终止导入";
                var errorMsg = $"导入失败！配置，第{workTaskDto.RowIndex}行：{e.Message}，终止导入"; 
                throw new UserFriendlyException(errorMsg);
            }
        }