222

schangxiang@126.com

2025-05-20 6fe443c4d26f0ec5cbcc2864a0dd9ab781c59761

222

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

@@ -145,44 +145,48 @@
        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;

        // æ‰¹é‡èµ‹å€¼æ‰€æœ‰å¯æ˜ å°„字段（通过匿名对象）
        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;//修改人 
@@ -326,7 +330,7 @@
        Check.NotNull(input, nameof(input));

        var workTaskCreateDtos = new List<(int RowIndex, WorkTaskCreateDto Item)>();
        var workTaskUpdateDtos = new List<(int RowIndex, Guid Id, WorkTaskUpdateDto Item)>();
        var workTaskUpdateDtos = new List<(int RowIndex, Guid Id, WorkTask Item)>();
        var importItems = input.WorkTasks;

        if (importItems != null && importItems.Any())
@@ -360,95 +364,99 @@
                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,
                    //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, workTaskUpdateDto));
                    workTaskUpdateDtos.Add((impItem.RowIndex, oldWorkTask.Id, oldWorkTask));
                }
                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,
                    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));
                }
@@ -471,16 +479,16 @@
        }

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

 PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/MapperProfiles/WorkPlanAutoMapperProfile.cs

@@ -2,6 +2,7 @@
using CMS.Plugin.PipeLineLems.Application.Contracts.Dtos.WorkPlan; 
using CMS.Plugin.PipeLineLems.Domain.WorkPlan; 
using Volo.Abp.ObjectExtending; 
using static CMS.Plugin.PipeLineLems.Application.Contracts.Dtos.WorkPlan.WorkPlansImportModel;
 
namespace CMS.Plugin.PipeLineLems.Application.MapperProfiles; 
 
@@ -22,5 +23,8 @@
        CreateMap<WorkPlan, WorkPlanDto>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None); 
        CreateMap<WorkPlanCreateDto, WorkPlan>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None); 
        CreateMap<GetWorkPlanInput, WorkPlan>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None); 

        CreateMap<WorkPlanImportModel, WorkPlanCreateDto>(MemberList.None);
        CreateMap<WorkPlanImportModel, WorkPlanUpdateDto>(MemberList.None);
    } 
} 

 PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/MapperProfiles/WorkTaskAutoMapperProfile.cs

@@ -3,6 +3,7 @@
using CMS.Plugin.PipeLineLems.Application.Contracts.Dtos.WorkTask;
using CMS.Plugin.PipeLineLems.Domain.WorkTask;
using Volo.Abp.ObjectExtending;
using static CMS.Plugin.PipeLineLems.Application.Contracts.Dtos.WorkTask.WorkTasksImportModel;

namespace CMS.Plugin.PipeLineLems.Application.MapperProfiles;

@@ -25,5 +26,11 @@
        CreateMap<GetWorkTaskInput, WorkTask>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);

        CreateMap<WorkPlanCreateDto, WorkTaskCreateDto>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);

        CreateMap<WorkTaskUpdateDto, WorkTask>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);

        CreateMap<WorkTaskImportModel, WorkTaskCreateDto>(MemberList.None);
        CreateMap<WorkTaskImportModel, WorkTaskUpdateDto>(MemberList.None);
        CreateMap<WorkTaskImportModel, WorkTask>(MemberList.None);
    }
}

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Generate/AppService/AppService_Generate.cs

@@ -22,11 +22,13 @@

            string attrString = "";
            List<ColumnModel> newColumnNameList = ListHelper.RemoveAttrForUpdateMode(param.ColumnNameList);
            for (int i = 0; i < newColumnNameList.Count; ++i)
            {
                attrString += StructStrHelper.GenerateAttributeForUpdateModel(newColumnNameList[i], param);
            }
            str = str.Replace("$UpdateAttributes$", attrString);

            //优化，这个地方不用了
            //for (int i = 0; i < newColumnNameList.Count; ++i)
            //{
            //    attrString += StructStrHelper.GenerateAttributeForUpdateModel(newColumnNameList[i], param);
            //}
            //str = str.Replace("$UpdateAttributes$", attrString);

            attrString = "";
            for (int i = 0; i < newColumnNameList.Count; ++i)

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Templete/AppService/AppServiceÄ£°å.txt

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

        $UpdateAttributes$
        // æ‰¹é‡èµ‹å€¼æ‰€æœ‰å¯æ˜ å°„字段（通过匿名对象）
        updateObj = ObjectMapper.Map(input, updateObj); // ç­‰æ•ˆäºŽæ‰‹åŠ¨èµ‹å€¼æ‰€æœ‰åŒ¹é…å­—段

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


 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Templete/Application/MapperProfiles/AutoMapperProfileÄ£°å.txt

@@ -22,5 +22,10 @@
        CreateMap<$EntityName$, $EntityName$Dto>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
        CreateMap<$EntityName$CreateDto, $EntityName$>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
        CreateMap<Get$EntityName$Input, $EntityName$>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);
        CreateMap<$EntityName$UpdateDto, $EntityName$>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None);

        CreateMap<$EntityName$ImportModel, $EntityName$CreateDto>(MemberList.None);
        CreateMap<$EntityName$ImportModel, $EntityName$UpdateDto>(MemberList.None);
        CreateMap<$EntityName$ImportModel, $EntityName$>(MemberList.None);
    }
}