From c50fa2cee061f6e4e2da9e6fb271eb55937f0549 Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Tue, 24 Oct 2023 17:38:20 +0800 Subject: [PATCH] 2023-10-24 --- .../DataIn/PDMS输出(设计)数据模板.xlsx | Bin 10004 -> 10021 bytes .../WeldingManage/PipelineListPDMSIn.aspx.cs | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/PDMS输出(设计)数据模板.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/PDMS输出(设计)数据模板.xlsx index c27db7a7ebaa39dad647a4c3a8f049f4f5b2dfa9..d4711140f99ce9ae31c056c0a93eff9f0d313a79 100644 GIT binary patch delta 3777 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 OzbYt5t_S%i;Qs)_V-Fnw delta 3759 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 diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs index 026aa13c..5e74f7e2 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs @@ -258,11 +258,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage string col3 = pds[i].D; if (string.IsNullOrEmpty(col3)) { - result.Add("第" + (i + 1).ToString() + "行," + "介质名称" + "," + "此项为必填项!" + "|"); + result.Add("第" + (i + 1).ToString() + "行," + "介质代号" + "," + "此项为必填项!" + "|"); } else { - var Medium = getMedium.FirstOrDefault(x => x.MediumName == col3); + var Medium = getMedium.FirstOrDefault(x => x.MediumCode == col3); if (Medium == null) { // result += "第" + (i + 1).ToString() + "行," + "该介质不存在!" + "|";