修复 模糊查询bug

schangxiang@126.com

2025-05-10 fdf4cdbf9723d9d05938fe56d2014769dd7ece4c

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

@@ -144,7 +144,19 @@
        input.MapExtraPropertiesTo(updateObj, MappingPropertyDefinitionChecks.None);

        updateObj.TaskCode = input.TaskCode;
        updateObj.OrgMaterialCode = input.OrgMaterialCode;
        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;
@@ -153,45 +165,18 @@
        updateObj.ProcessName = input.ProcessName;
        updateObj.PipeFittingCode = input.PipeFittingCode;
        updateObj.PreSerialNumber = input.PreSerialNumber;
        updateObj.DataIdentifier = input.DataIdentifier;
        updateObj.PipeSpecCode = input.PipeSpecCode;
        updateObj.PipeSectionName = input.PipeSectionName;
        updateObj.OuterDiameter = input.OuterDiameter;
        updateObj.Bevel = input.Bevel;
        updateObj.Thickness = input.Thickness;
        updateObj.Material = input.Material;
        updateObj.Length = input.Length;
        updateObj.DrillingPosition = input.DrillingPosition;
        updateObj.Intersecting = input.Intersecting;
        updateObj.InterfaceRequirement = input.InterfaceRequirement;
        updateObj.HasMainSignature = input.HasMainSignature;
        updateObj.Quantity = input.Quantity;
        updateObj.MarkingContent = input.MarkingContent;
        updateObj.CuttingFile = input.CuttingFile;
        updateObj.BranchOuterDiameter = input.BranchOuterDiameter;
        updateObj.BranchWallThickness = input.BranchWallThickness;
        updateObj.BranchMaterial = input.BranchMaterial;
        updateObj.BranchPortRadius = input.BranchPortRadius;
        updateObj.BranchPortAngle = input.BranchPortAngle;
        updateObj.BranchPortRequirement = input.BranchPortRequirement;
        updateObj.IntersectingLineType = input.IntersectingLineType;
        updateObj.IntersectingLineCategory = input.IntersectingLineCategory;
        updateObj.FinishedProductScale = input.FinishedProductScale;
        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.VRData = input.VRData;
        updateObj.ProcessRouteNumber = input.ProcessRouteNumber;
        updateObj.PlannedStartTime = input.PlannedStartTime;
        updateObj.PlannedEndTime = input.PlannedEndTime;
        updateObj.TimeInfo = input.TimeInfo;
        updateObj.RedundantField1 = input.RedundantField1;
        updateObj.RedundantField2 = input.RedundantField2;
        updateObj.RedundantField3 = input.RedundantField3;
        updateObj.TeamInfo = input.TeamInfo;
        updateObj.Timestamp = input.Timestamp;
        updateObj.Remark = input.Remark;
        updateObj.IsDisabled = input.IsDisabled;


        await workPlanRepository.UpdateAsync(updateObj);
@@ -348,7 +333,19 @@
                    var workPlanUpdateDto = new WorkPlanUpdateDto
                    {
                        TaskCode = impItem.TaskCode,
                        OrgMaterialCode = impItem.OrgMaterialCode,
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,
@@ -357,45 +354,18 @@
                        ProcessName = impItem.ProcessName,
                        PipeFittingCode = impItem.PipeFittingCode,
                        PreSerialNumber = impItem.PreSerialNumber,
                        DataIdentifier = impItem.DataIdentifier,
                        PipeSpecCode = impItem.PipeSpecCode,
                        PipeSectionName = impItem.PipeSectionName,
                        OuterDiameter = impItem.OuterDiameter,
                        Bevel = impItem.Bevel,
Thickness = impItem.Thickness,
                        Material = impItem.Material,
                        Length = impItem.Length,
                        DrillingPosition = impItem.DrillingPosition,
                        Intersecting = impItem.Intersecting,
                        InterfaceRequirement = impItem.InterfaceRequirement,
                        HasMainSignature = impItem.HasMainSignature,
                        Quantity = impItem.Quantity,
                        MarkingContent = impItem.MarkingContent,
                        CuttingFile = impItem.CuttingFile,
                        BranchOuterDiameter = impItem.BranchOuterDiameter,
                        BranchWallThickness = impItem.BranchWallThickness,
                        BranchMaterial = impItem.BranchMaterial,
                        BranchPortRadius = impItem.BranchPortRadius,
                        BranchPortAngle = impItem.BranchPortAngle,
                        BranchPortRequirement = impItem.BranchPortRequirement,
                        IntersectingLineType = impItem.IntersectingLineType,
                        IntersectingLineCategory = impItem.IntersectingLineCategory,
                        FinishedProductScale = impItem.FinishedProductScale,
                        FlangeThickness = impItem.FlangeThickness,
                        FlangeInnerDiameter = impItem.FlangeInnerDiameter,
                        WeldingHeatInput = impItem.WeldingHeatInput,
                        PipeAllowableStress = impItem.PipeAllowableStress,
                        PipeDiameter = impItem.PipeDiameter,
                        PipeWallThickness = impItem.PipeWallThickness,
                        VRData = impItem.VRData,
                        ProcessRouteNumber = impItem.ProcessRouteNumber,
                        PlannedStartTime = impItem.PlannedStartTime,
                        PlannedEndTime = impItem.PlannedEndTime,
                        TimeInfo = impItem.TimeInfo,
                        RedundantField1 = impItem.RedundantField1,
                        RedundantField2 = impItem.RedundantField2,
                        RedundantField3 = impItem.RedundantField3,
TeamInfo = impItem.TeamInfo,
Timestamp = impItem.Timestamp,
                        Remark = impItem.Remark,
                        IsDisabled = impItem.IsDisabled,

                    };

@@ -406,7 +376,19 @@
                    var workPlanCreateDto = new WorkPlanCreateDto
                    {
                        TaskCode = impItem.TaskCode,
                        OrgMaterialCode = impItem.OrgMaterialCode,
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,
@@ -415,45 +397,18 @@
                        ProcessName = impItem.ProcessName,
                        PipeFittingCode = impItem.PipeFittingCode,
                        PreSerialNumber = impItem.PreSerialNumber,
                        DataIdentifier = impItem.DataIdentifier,
                        PipeSpecCode = impItem.PipeSpecCode,
                        PipeSectionName = impItem.PipeSectionName,
                        OuterDiameter = impItem.OuterDiameter,
                        Bevel = impItem.Bevel,
Thickness = impItem.Thickness,
                        Material = impItem.Material,
                        Length = impItem.Length,
                        DrillingPosition = impItem.DrillingPosition,
                        Intersecting = impItem.Intersecting,
                        InterfaceRequirement = impItem.InterfaceRequirement,
                        HasMainSignature = impItem.HasMainSignature,
                        Quantity = impItem.Quantity,
                        MarkingContent = impItem.MarkingContent,
                        CuttingFile = impItem.CuttingFile,
                        BranchOuterDiameter = impItem.BranchOuterDiameter,
                        BranchWallThickness = impItem.BranchWallThickness,
                        BranchMaterial = impItem.BranchMaterial,
                        BranchPortRadius = impItem.BranchPortRadius,
                        BranchPortAngle = impItem.BranchPortAngle,
                        BranchPortRequirement = impItem.BranchPortRequirement,
                        IntersectingLineType = impItem.IntersectingLineType,
                        IntersectingLineCategory = impItem.IntersectingLineCategory,
                        FinishedProductScale = impItem.FinishedProductScale,
                        FlangeThickness = impItem.FlangeThickness,
                        FlangeInnerDiameter = impItem.FlangeInnerDiameter,
                        WeldingHeatInput = impItem.WeldingHeatInput,
                        PipeAllowableStress = impItem.PipeAllowableStress,
                        PipeDiameter = impItem.PipeDiameter,
                        PipeWallThickness = impItem.PipeWallThickness,
                        VRData = impItem.VRData,
                        ProcessRouteNumber = impItem.ProcessRouteNumber,
                        PlannedStartTime = impItem.PlannedStartTime,
                        PlannedEndTime = impItem.PlannedEndTime,
                        TimeInfo = impItem.TimeInfo,
                        RedundantField1 = impItem.RedundantField1,
                        RedundantField2 = impItem.RedundantField2,
                        RedundantField3 = impItem.RedundantField3,
TeamInfo = impItem.TeamInfo,
Timestamp = impItem.Timestamp,
                        Remark = impItem.Remark,
                        IsDisabled = impItem.IsDisabled,

                    };

@@ -521,7 +476,7 @@
            ["配置"] = ExportHelper.ConvertListToExportData(result),
        };

        var fileName = result.Count > 1 ? "作业计划表列表" : result.Count == 1 ? result[0]?.TaskCode : "WorkPlan模版";
        var fileName = "作业计划"; 
        return (sheets, fileName);
    }

@@ -533,10 +488,18 @@
    protected Task CheckCreateOrUpdateDtoAsync(WorkPlanCreateOrUpdateDtoBase input)
    {
        Check.NotNull(input, nameof(input));
        Check.NotNullOrWhiteSpace(input.TaskCode, "任务编码", 64);
        Check.NotNullOrWhiteSpace(input.OrgMaterialCode, "原料编号", 64);
        Check.NotNull(input.HasMainSignature, "是否有主签");
        Check.NotNull(input.Quantity, "包括数量");
                Check.NotNullOrWhiteSpace(input.TaskCode, "任务编码", 256);
        Check.NotNull(input.Length, "长度(mm)");
        Check.NotNull(input.MarkingPosition, "打码位置");
        Check.NotNull(input.CuttingPosition, "切割位置");
        Check.NotNull(input.Quantity, "管段数量");
        Check.NotNull(input.FlangeThickness, "法兰厚度(mm)");
        Check.NotNull(input.FlangeInnerDiameter, "法兰直径(mm)");
        Check.NotNull(input.PipeDiameter, "套管长度(mm)");
        Check.NotNull(input.PipeWallThickness, "套管直径(mm)");
        Check.NotNull(input.OuterDiameter, "外径(mm)");
        Check.NotNull(input.Thickness, "壁厚(mm)");
        Check.NotNull(input.HasMainSignature, "是否主支管");

        return Task.CompletedTask;
    }