From 4b842ede06736ba8c36a32b215f50e386e8a44c7 Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Fri, 18 Nov 2022 18:04:38 +0800 Subject: [PATCH] 2022-11-18-002 --- .../WeldingManage/PipelineListPDMSIn.aspx.cs | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs index 3ea1fcc8..e999f736 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs @@ -778,7 +778,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage pipeline.UnitId = unitWork.UnitId; } - string col0 = pds[i].A.ToString(); + string col0 = pds[i].A; string pipeLineId = string.Empty; if (string.IsNullOrEmpty(col0)) { @@ -789,10 +789,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage pipeline.PipelineCode = col0; } - pipeline.SingleNumber = pds[i].B.ToString(); - pipeline.SingleName = pds[i].C.ToString(); + pipeline.SingleNumber = pds[i].B; + pipeline.SingleName = pds[i].C; - string col3 = pds[i].D.ToString(); + string col3 = pds[i].D; if (string.IsNullOrEmpty(col3)) { result += "第" + (i + 1).ToString() + "行," + "介质名称" + "," + "此项为必填项！" + "|"; @@ -810,7 +810,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage pipeline.MediumName = col3; } } - string col4 = pds[i].E.ToString(); + string col4 = pds[i].E; if (string.IsNullOrEmpty(col4)) { result += "第" + (i + 1).ToString() + "行," + "管道等级" + "," + "此项为必填项！" + "|"; @@ -828,7 +828,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage pipeline.PipingClassCode = col4; } } - string col5 = pds[i].F.ToString(); + string col5 = pds[i].F; if (!string.IsNullOrEmpty(col5)) { var DetectionRate = getDetectionRate.FirstOrDefault(x => x.DetectionRateValue.ToString() == col5.Replace("%", "") || x.DetectionRateCode == col5); @@ -847,7 +847,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage result += "第" + (i + 1).ToString() + "行," + "探伤比例" + "," + "此项为必填项！" + "|"; } - string col6 = pds[i].G.ToString(); + string col6 = pds[i].G; if (!string.IsNullOrEmpty(col6)) { string[] types = col6.ToString().Split(','); @@ -875,17 +875,17 @@ namespace FineUIPro.Web.HJGL.WeldingManage result += "第" + (i + 1).ToString() + "行," + "探伤类型" + "," + "此项为必填项！" + "|"; } - string col7 = pds[i].H.ToString(); + string col7 = pds[i].H; if (!string.IsNullOrEmpty(col7)) { pipeline.DesignTemperature = col7; } - string col8 = pds[i].I.ToString(); + string col8 = pds[i].I; if (!string.IsNullOrEmpty(col8)) { pipeline.DesignPress = col8; } - string col9 = pds[i].J.ToString(); + string col9 = pds[i].J; if (!string.IsNullOrEmpty(col9)) { var TestMedium = getTestMedium.FirstOrDefault(x => x.MediumName == col9); @@ -899,12 +899,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage pipeline.TestMediumName = col9; } } - string col10 = pds[i].K.ToString(); + string col10 = pds[i].K; if (!string.IsNullOrEmpty(col10)) { pipeline.TestPressure = col10; } - string col11 = pds[i].L.ToString(); + string col11 = pds[i].L; if (!string.IsNullOrEmpty(col11)) { var PressurePipingClass = getPressurePipingClass.FirstOrDefault(x => x.PressurePipingClassCode == col11); @@ -918,7 +918,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage pipeline.PressurePipingClassCode = col11; } } - string col12 = pds[i].M.ToString(); + string col12 = pds[i].M; if (!string.IsNullOrEmpty(col12)) { try @@ -931,7 +931,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage result += "第" + (i + 1).ToString() + "行," + "管线长度(m)格式输入有误" + "|"; } } - string col13 = pds[i].N.ToString(); + string col13 = pds[i].N; if (!string.IsNullOrEmpty(col13)) { var LeakMedium = getLeakMedium.FirstOrDefault(x => x.MediumName == col13); @@ -945,12 +945,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage pipeline.LeakMediumName = col13; } } - string col14 = pds[i].O.ToString(); + string col14 = pds[i].O; if (!string.IsNullOrEmpty(col14)) { pipeline.LeakPressure = col14; } - string col15 = pds[i].P.ToString(); + string col15 = pds[i].P; if (!string.IsNullOrEmpty(col15)) { var PurgeMethod = getPurgeMethod.FirstOrDefault(x => x.PurgeMethodCode == col15); @@ -965,12 +965,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage } } - string col16 = pds[i].Q.ToString(); + string col16 = pds[i].Q; if (!string.IsNullOrEmpty(col16)) { pipeline.VacuumPressure = col16; } - string col17 = pds[i].R.ToString(); + string col17 = pds[i].R; if (!string.IsNullOrEmpty(col17)) { var material = getMaterial.FirstOrDefault(x => x.MaterialCode == col17); @@ -984,10 +984,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage pipeline.PipeMaterialCode = col17; } } - pipeline.Remark = pds[i].S.ToString(); + pipeline.Remark = pds[i].S; // 以下是焊口信息 - string col19 = pds[i].T.ToString(); + string col19 = pds[i].T; if (string.IsNullOrEmpty(col19)) { result += "第" + (i + 1).ToString() + "行," + "焊口号" + "," + "此项为必填项！" + "|"; @@ -1006,7 +1006,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage pipeline.WeldJointCode = col19; } - string col20 = pds[i].U.ToString(); + string col20 = pds[i].U; if (!string.IsNullOrEmpty(col20)) { var material = getMaterial.FirstOrDefault(x => x.MaterialCode == col20); @@ -1025,7 +1025,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage result += "第" + (i + 1).ToString() + "行," + "材质1" + "," + "此项为必填项！" + "|"; } - string col21 = pds[i].V.ToString(); + string col21 = pds[i].V; if (!string.IsNullOrEmpty(col21)) { var material = getMaterial.FirstOrDefault(x => x.MaterialCode == col21); @@ -1044,15 +1044,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage result += "第" + (i + 1).ToString() + "行," + "材质2" + "," + "此项为必填项！" + "|"; } - string col22 = pds[i].W.ToString(); - string col27 = pds[i].AB.ToString().Replace("Φ", ""); + string col22 = pds[i].W; + string col27 = pds[i].AB; if (rbDiaType.SelectedValue == "1") { if (!string.IsNullOrEmpty(col27)) { try { - decimal Dia = Convert.ToDecimal(col27); + decimal Dia = Convert.ToDecimal(col27.Replace("Φ", "")); pipeline.Dia = Dia; //var inch = BLL.Base_DNCompareService.GetSizeByDia(Dia); @@ -1086,7 +1086,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage } - string col23 = pds[i].X.ToString(); + string col23 = pds[i].X; if (!string.IsNullOrEmpty(col23)) { try @@ -1104,7 +1104,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage result += "第" + (i + 1).ToString() + "行," + "达因" + "," + "此项为必填项！" + "|"; } - string col24 = pds[i].Y.ToString(); + string col24 = pds[i].Y; if (!string.IsNullOrEmpty(col24)) { try @@ -1141,7 +1141,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage } - string col25 = pds[i].Z.ToString(); + string col25 = pds[i].Z; if (!string.IsNullOrEmpty(col25)) { var weldType = getWeldType.FirstOrDefault(x => x.WeldTypeCode == col25); @@ -1198,7 +1198,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { result += "第" + (i + 1).ToString() + "行," + "焊缝类型" + "," + "此项为必填项！" + "|"; } - string col26 = pds[i].AA.ToString(); + string col26 = pds[i].AA; if (!string.IsNullOrEmpty(col26)) { var JointAttribute = BLL.DropListService.HJGL_JointAttribute();