diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user index 5a61a34..84b1d2e 100644 --- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -2,7 +2,7 @@ true - Release|Any CPU + Debug|Any CPU diff --git a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs index 400fef4..cfbac69 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs @@ -495,17 +495,23 @@ namespace FineUIPro.Web.HJGL.DataIn result += "第" + (i + 2).ToString() + "行," + "该焊接方法不存在" + "\n"; } } - if (!string.IsNullOrEmpty(col13) && weldMat == null) + if (!string.IsNullOrEmpty(col13)) { - result += "第" + (i + 2).ToString() + "行," + "该焊条不存在" + "\n"; + if (weldMat == null) + { + result += "第" + (i + 2).ToString() + "行," + "该焊条不存在" + "\n"; + } } //else //{ // result += "第" + (i + 2).ToString() + "行," + "焊条不能为空" + "\n"; //} - if (!string.IsNullOrEmpty(col14) && weldSilk == null) + if (!string.IsNullOrEmpty(col14)) { - result += "第" + (i + 2).ToString() + "行," + "该焊丝不存在" + "\n"; + if (weldSilk == null) + { + result += "第" + (i + 2).ToString() + "行," + "该焊丝不存在" + "\n"; + } } else { diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config index e233efb..79594b6 100644 --- a/HJGL_DS/FineUIPro.Web/Web.config +++ b/HJGL_DS/FineUIPro.Web/Web.config @@ -67,7 +67,7 @@ - + diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user index 28be9c4..a48b337 100644 --- a/HJGL_DS/WebAPI/WebAPI.csproj.user +++ b/HJGL_DS/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU FolderProfile true