From 471c39c1d9ba2f0eea8dcd122db0d24625bb2eea Mon Sep 17 00:00:00 2001 From: 10191 <506754232@qq.com> Date: Thu, 23 Apr 2026 18:24:16 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=BA=BF=E5=AF=B9=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HJGL/DataIn/PipelineGrid.aspx.cs | 48 ++++++++++++++++--- 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/PipelineGrid.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/PipelineGrid.aspx.cs index f70041f..347e2fc 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/PipelineGrid.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/PipelineGrid.aspx.cs @@ -269,7 +269,7 @@ namespace FineUIPro.Web.HJGL.DataIn ""热处理类型"", ""备注"" ], - ""extra_instructions"": ""管线号优先匹配管线代号，优先将含有 Main Fluid 的字段映射到 介质，有名称首先匹配名称，没有名称匹配代号，按匹配度从高低输出"" + ""extra_instructions"": ""管线号优先匹配管线代号，优先将含有 Main Fluid 的字段映射到 介质,优先匹配隔热工程代号到绝热类别，压力管道类别映射执行标准，有名称首先匹配名称，没有名称匹配代号，按匹配度从高低输出"" } "; string resHeaderCorrespondence = HeaderCorrespondence(urlHeaderCorrespondence, data, "POST", "application/json;charset=utf-8"); @@ -293,6 +293,7 @@ namespace FineUIPro.Web.HJGL.DataIn isoInfo.IsHot = "0"; foreach (DataColumn dataColumn in dtAfterProcess.Columns) { + if (headerCorrespondenceDic.ContainsKey(dataColumn.ColumnName)) switch (headerCorrespondenceDic[dataColumn.ColumnName]) { @@ -303,7 +304,14 @@ namespace FineUIPro.Web.HJGL.DataIn isoInfo.ISC_ID = isoClasss.Where(x=>x.ISC_IsoName==row[dataColumn.ColumnName].ToString()|| x.ISC_IsoCode == row[dataColumn.ColumnName].ToString()).Select(x=>x.ISC_ID).FirstOrDefault(); break; case "执行标准": - isoInfo.ISO_Executive = execStandards.Where(x=>x.ExecStandardName== row[dataColumn.ColumnName].ToString()).Select(x=>x.ExecStandardId).FirstOrDefault(); + if (!string.IsNullOrEmpty(row[dataColumn.ColumnName].ToString())) + { + isoInfo.ISO_Executive = execStandards.Where(x => x.ExecStandardName == "SH/T3501-2021").Select(x => x.ExecStandardId).FirstOrDefault(); + } + else + { + isoInfo.ISO_Executive = execStandards.Where(x => x.ExecStandardName == "GB 50517-2010").Select(x => x.ExecStandardId).FirstOrDefault(); + } break; case "材质": isoInfo.STE_ID = steels.Where(x => x.STE_Code == row[dataColumn.ColumnName].ToString()).Select(x => x.STE_ID).FirstOrDefault(); @@ -321,7 +329,15 @@ namespace FineUIPro.Web.HJGL.DataIn isoInfo.ISO_Paint = row[dataColumn.ColumnName].ToString(); break; case "绝热类别": - isoInfo.ISO_Insulator = row[dataColumn.ColumnName].ToString(); + if (!string.IsNullOrEmpty(row[dataColumn.ColumnName].ToString())) + { + isoInfo.ISO_Insulator = row[dataColumn.ColumnName].ToString(); + } + else + { + isoInfo.ISO_Insulator = "/"; + + } break; case "操作压力": isoInfo.OperatingPressure = row[dataColumn.ColumnName].ToString(); @@ -330,7 +346,10 @@ namespace FineUIPro.Web.HJGL.DataIn isoInfo.OperatingTemperature = row[dataColumn.ColumnName].ToString(); break; case "泄露性试验": - isoInfo.LeakageTest = row[dataColumn.ColumnName].ToString(); + if (isoInfo.ISO_DesignPress.HasValue) + { + isoInfo.LeakageTest = isoInfo.ISO_DesignPress.Value.ToString("##.##");// row[dataColumn.ColumnName].ToString(); + } break; case "设计压力": isoInfo.ISO_DesignPress = Funs.GetNewDecimal(row[dataColumn.ColumnName].ToString()); @@ -339,7 +358,10 @@ namespace FineUIPro.Web.HJGL.DataIn isoInfo.ISO_DesignTemperature = Funs.GetNewDecimal(row[dataColumn.ColumnName].ToString()); break; case "耐压试验": - isoInfo.ISO_TestPress = Funs.GetNewDecimal(row[dataColumn.ColumnName].ToString()); + if (isoInfo.ISO_DesignPress.HasValue) + { + isoInfo.ISO_TestPress = isoInfo.ISO_DesignPress.Value * 1.5m; + } break; case "外径": isoInfo.ISO_Dia = Funs.GetNewDecimal(row[dataColumn.ColumnName].ToString()); @@ -351,7 +373,7 @@ namespace FineUIPro.Web.HJGL.DataIn isoInfo.PipeLineLength = Funs.GetNewDecimal(row[dataColumn.ColumnName].ToString()); break; case "检测类别序号": - isoInfo.TestCategoryNum = row[dataColumn.ColumnName].ToString(); + isoInfo.TestCategoryNum = "/"; break; case "热处理类型": { @@ -366,6 +388,20 @@ namespace FineUIPro.Web.HJGL.DataIn isoInfo.ISO_Remark = row[dataColumn.ColumnName].ToString(); break; } + + if (row[dataColumn.ColumnName].ToString().Contains("漆")) + { + isoInfo.ISO_Paint = row[dataColumn.ColumnName].ToString(); + } + if (row[dataColumn.ColumnName].ToString().Contains("SH")) + { + isoInfo.ISC_ID = isoClasss.Where(x => x.ISC_IsoName == row[dataColumn.ColumnName].ToString() || x.ISC_IsoCode == row[dataColumn.ColumnName].ToString()).Select(x => x.ISC_ID).FirstOrDefault(); + } + if (row[dataColumn.ColumnName].ToString().Contains("焊后热处理")) + { + //isoInfo.IsHotType = row[dataColumn.ColumnName].ToString(); + isoInfo.IsHot = "1"; + } } isoList.Add(isoInfo); }