diff --git a/HJGL_DS/.vs/SGGL/v15/.suo b/HJGL_DS/.vs/SGGL/v15/.suo index d80fdb9..28ef9e2 100644 Binary files a/HJGL_DS/.vs/SGGL/v15/.suo and b/HJGL_DS/.vs/SGGL/v15/.suo differ diff --git a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide index 7513196..c61df44 100644 Binary files a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide and b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide differ diff --git a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-shm b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-shm index 19e1216..a591c26 100644 Binary files a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-shm and b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-shm differ diff --git a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal index a9c8384..26d16fd 100644 Binary files a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal and b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal differ diff --git a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs index 9260a9e..aa308d5 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs @@ -359,7 +359,18 @@ namespace FineUIPro.Web.HJGL.DataIn { if (string.IsNullOrEmpty(col0) || string.IsNullOrEmpty(col1) || string.IsNullOrEmpty(col2)) { - result += "第" + (i + 2).ToString() + "行," + "施工号、管线号、焊口号不能为空" + "\n"; + if (string.IsNullOrEmpty(col0)) + { + result += "第" + (i + 2).ToString() + "行," + "施工号不能为空" + "\n"; + } + if (string.IsNullOrEmpty(col1)) + { + result += "第" + (i + 2).ToString() + "行," + "管线号不能为空" + "\n"; + } + if (string.IsNullOrEmpty(col2)) + { + result += "第" + (i + 2).ToString() + "行," + "焊口号不能为空" + "\n"; + } } else {