diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 1d4f35f8..84bb1c21 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -49,6 +49,7 @@ prompt 4 false + 7.2 false diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs index 97621059..6a53ca01 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs @@ -893,17 +893,17 @@ namespace FineUIPro.Web.HJGL.WeldingManage result.Add("第" + (i + 1).ToString() + "行," + "探伤类型" + "," + "此项为必填项!" + "|"); } - string col7 = pds[i].H; + string col7 = Convert.ToString(pds[i].H); if (!string.IsNullOrEmpty(col7)) { pipeline.DesignTemperature = col7; } - string col8 = pds[i].I; + string col8 = Convert.ToString(pds[i].I); if (!string.IsNullOrEmpty(col8)) { pipeline.DesignPress = col8; } - string col9 = pds[i].J; + string col9 = Convert.ToString(pds[i].J); if (!string.IsNullOrEmpty(col9)) { var TestMedium = getTestMedium.FirstOrDefault(x => x.MediumName == col9); @@ -918,12 +918,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage pipeline.TestMediumName = col9; } } - string col10 = pds[i].K; + string col10 = Convert.ToString(pds[i].K); if (!string.IsNullOrEmpty(col10)) { pipeline.TestPressure = col10; } - string col11 = pds[i].L; + string col11 = Convert.ToString(pds[i].L); if (!string.IsNullOrEmpty(col11)) { var PressurePipingClass = getPressurePipingClass.FirstOrDefault(x => x.PressurePipingClassCode == col11); @@ -938,7 +938,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage pipeline.PressurePipingClassCode = col11; } } - string col12 = pds[i].M; + string col12 = Convert.ToString(pds[i].M); if (!string.IsNullOrEmpty(col12)) { try @@ -951,7 +951,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage result.Add("第" + (i + 1).ToString() + "行," + "管线长度(m)格式输入有误" + "|"); } } - string col13 = pds[i].N; + string col13 = Convert.ToString(pds[i].N); if (!string.IsNullOrEmpty(col13)) { var LeakMedium = getLeakMedium.FirstOrDefault(x => x.MediumName == col13); @@ -966,12 +966,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage pipeline.LeakMediumName = col13; } } - string col14 = pds[i].O; + string col14 = Convert.ToString(pds[i].O); if (!string.IsNullOrEmpty(col14)) { pipeline.LeakPressure = col14; } - string col15 = pds[i].P; + string col15 = Convert.ToString(pds[i].P); if (!string.IsNullOrEmpty(col15)) { var PurgeMethod = getPurgeMethod.FirstOrDefault(x => x.PurgeMethodCode == col15); @@ -987,12 +987,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage } } - string col16 = pds[i].Q; + string col16 = Convert.ToString(pds[i].Q); if (!string.IsNullOrEmpty(col16)) { pipeline.VacuumPressure = col16; } - string col17 = pds[i].R; + string col17 = Convert.ToString(pds[i].R); if (!string.IsNullOrEmpty(col17)) { var material = getMaterial.FirstOrDefault(x => x.MaterialCode == col17); @@ -1007,10 +1007,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage pipeline.PipeMaterialCode = col17; } } - pipeline.Remark = pds[i].S; + pipeline.Remark = Convert.ToString(pds[i].S); // 以下是焊口信息 - string col19 = pds[i].T; + string col19 = Convert.ToString(pds[i].T); if (string.IsNullOrEmpty(col19)) { result.Add("第" + (i + 1).ToString() + "行," + "焊口号" + "," + "此项为必填项!" + "|"); @@ -1079,7 +1079,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage result.Add("第" + (i + 1).ToString() + "行," + "材质2" + "," + "此项为必填项!" + "|"); } - string col22 = pds[i].W; + string col22 = Convert.ToString(pds[i].W); string col27 = ""; if (pds[i].AB!=null) { @@ -1125,7 +1125,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage } - var col23 = pds[i].X; + var col23 = Convert.ToString(pds[i].X); if (col23!=null) { try @@ -1143,7 +1143,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage result.Add("第" + (i + 1).ToString() + "行," + "达因" + "," + "此项为必填项!" + "|"); } - var col24 = pds[i].Y; + var col24 = Convert.ToString(pds[i].Y); if (col24!=null) { try @@ -1180,7 +1180,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage } - string col25 = pds[i].Z; + string col25 = Convert.ToString(pds[i].Z); if (!string.IsNullOrEmpty(col25)) { var weldType = getWeldType.FirstOrDefault(x => x.WeldTypeCode == col25); @@ -1238,7 +1238,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { result.Add("第" + (i + 1).ToString() + "行," + "焊缝类型" + "," + "此项为必填项!" + "|"); } - string col26 = pds[i].AA; + string col26 = Convert.ToString(pds[i].AA); if (!string.IsNullOrEmpty(col26)) { var JointAttribute = BLL.DropListService.HJGL_JointAttribute();