diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index 0593f46..042dba6 100644 Binary files a/HJGL/.vs/HJGL/v17/.suo and b/HJGL/.vs/HJGL/v17/.suo differ diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx.cs index 2e5c037..9111d9c 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx.cs @@ -988,6 +988,12 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage var ptpDetailList = Funs.DB.PTP_PipelineList .Where(t => t.PipelineId == newPipelineInfo.PipelineId); + + var isExcelPipline = listData.Where(t => t.PipelineId == newPipelineInfo.PipelineId).Any(); + if (isExcelPipline) + { + errorMsg += "该管线已被使用 | "; + } //查询当前的管线是否被使用了 if (isALL == "是") { @@ -996,13 +1002,8 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { errorMsg += "该管线已被使用 | "; } - var isExcelPipline= listData.Where(t=>t.PipelineId== newPipelineInfo.PipelineId).Any(); - if (isExcelPipline) - { - errorMsg += "该管线已被使用 | "; - } } - + //查询当前的焊口是否被使用了 if (isALL == "否") {