diff --git a/HJGL_DS/FineUIPro.Web/File/Excel/HJGL_DataIn/焊口信息导入模板.xls b/HJGL_DS/FineUIPro.Web/File/Excel/HJGL_DataIn/焊口信息导入模板.xls index 6ba8a79..c47159a 100644 Binary files a/HJGL_DS/FineUIPro.Web/File/Excel/HJGL_DataIn/焊口信息导入模板.xls and b/HJGL_DS/FineUIPro.Web/File/Excel/HJGL_DataIn/焊口信息导入模板.xls differ diff --git a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/JointIn.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/JointIn.aspx.cs index d58e176..5ae0a42 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/JointIn.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/JointIn.aspx.cs @@ -295,7 +295,8 @@ namespace FineUIPro.Web.HJGL.DataIn string col27 = pds.Rows[i][27].ToString().Trim();//合格等级 string col28 = pds.Rows[i][28].ToString().Trim();//硬度合格标准 string col29 = pds.Rows[i][29].ToString().Trim();//非常焊缝 - string col30 = pds.Rows[i][30].ToString().Trim();//备注 + string col30 = pds.Rows[i][30].ToString().Trim();//是否黄金口 + string col31 = pds.Rows[i][31].ToString().Trim();//备注 Model.HJGL_PW_IsoInfo NewIsoInfo = new Model.HJGL_PW_IsoInfo(); var getProject = projects.FirstOrDefault(x => x.ProjectCode == col0);//项目号 Model.HJGL_PW_IsoInfo getPWisInfo = null; @@ -583,6 +584,13 @@ namespace FineUIPro.Web.HJGL.DataIn result += "第" + (i + 2).ToString() + "行," + "非常焊缝格式输入有误" + "\n"; } } + if (!string.IsNullOrEmpty(col30)) + { + if (col30 != "是" && col30 != "否" && col30 != "") + { + result += "第" + (i + 2).ToString() + "行," + "是否黄金口格式输入有误" + "\n"; + } + } if (string.IsNullOrEmpty(result)) { if (getProject != null && getPWisInfo != null) @@ -702,7 +710,8 @@ namespace FineUIPro.Web.HJGL.DataIn string col27 = pds.Rows[i][27].ToString().Trim();//合格等级 string col28 = pds.Rows[i][28].ToString().Trim();//硬度合格标准 string col29 = pds.Rows[i][29].ToString().Trim();//非常焊缝 - string col30 = pds.Rows[i][30].ToString().Trim();//备注 + string col30 = pds.Rows[i][30].ToString().Trim();//是否黄金口 + string col31 = pds.Rows[i][31].ToString().Trim();//备注 Model.HJGL_PW_IsoInfo NewIsoInfo = new Model.HJGL_PW_IsoInfo(); var getProject = projects.FirstOrDefault(x => x.ProjectCode == col0);//项目号 Model.HJGL_PW_IsoInfo getPWisInfo = null; @@ -845,7 +854,15 @@ namespace FineUIPro.Web.HJGL.DataIn { newJointInfo.IS_Proess = "0"; } - newJointInfo.JOT_Remark = col30; + if (col30 == "是") + { + newJointInfo.IsGold = true; + } + else + { + newJointInfo.IsGold = false; + } + newJointInfo.JOT_Remark = col31; newJointInfo.InstallationId = getInstallation.InstallationId; if (getNDTRate != null) {